From 3143362d83b0f6753e48b50fa7e06735756b2361 Mon Sep 17 00:00:00 2001
From: Ryan Kistner <azuisleet@gmail.com>
Date: Sat, 20 Aug 2022 11:11:47 -0600
Subject: [PATCH] 2.4.7 - Don't use depotfromapp to request depot key or
 manifest request code

---
 DepotDownloader/ContentDownloader.cs   | 23 ++---------------------
 DepotDownloader/DepotDownloader.csproj |  2 +-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/DepotDownloader/ContentDownloader.cs b/DepotDownloader/ContentDownloader.cs
index cbc1b2f9..7cee83f7 100644
--- a/DepotDownloader/ContentDownloader.cs
+++ b/DepotDownloader/ContentDownloader.cs
@@ -211,20 +211,6 @@ static uint GetSteam3AppBuildNumber(uint appId, string branch)
             return uint.Parse(buildid.Value);
         }
 
-        static uint GetSteam3DepotProxyAppId(uint depotId, uint appId)
-        {
-            var depots = GetSteam3AppSection(appId, EAppInfoSection.Depots);
-            var depotChild = depots[depotId.ToString()];
-
-            if (depotChild == KeyValue.Invalid)
-                return INVALID_APP_ID;
-
-            if (depotChild["depotfromapp"] == KeyValue.Invalid)
-                return INVALID_APP_ID;
-
-            return depotChild["depotfromapp"].AsUnsignedInteger();
-        }
-
         static ulong GetSteam3DepotManifest(uint depotId, uint appId, string branch)
         {
             var depots = GetSteam3AppSection(appId, EAppInfoSection.Depots);
@@ -649,12 +635,7 @@ static DepotDownloadInfo GetDepotInfo(uint depotId, uint appId, ulong manifestId
                 }
             }
 
-            // For depots that are proxied through depotfromapp, we still need to resolve the proxy app id
-            var containingAppId = appId;
-            var proxyAppId = GetSteam3DepotProxyAppId(depotId, appId);
-            if (proxyAppId != INVALID_APP_ID) containingAppId = proxyAppId;
-
-            steam3.RequestDepotKey(depotId, containingAppId);
+            steam3.RequestDepotKey(depotId, appId);
             if (!steam3.DepotKeys.ContainsKey(depotId))
             {
                 Console.WriteLine("No valid depot key for {0}, unable to download.", depotId);
@@ -672,7 +653,7 @@ static DepotDownloadInfo GetDepotInfo(uint depotId, uint appId, ulong manifestId
 
             var depotKey = steam3.DepotKeys[depotId];
 
-            return new DepotDownloadInfo(depotId, containingAppId, manifestId, branch, installDir, contentName, depotKey);
+            return new DepotDownloadInfo(depotId, appId, manifestId, branch, installDir, contentName, depotKey);
         }
 
         private class ChunkMatch
diff --git a/DepotDownloader/DepotDownloader.csproj b/DepotDownloader/DepotDownloader.csproj
index 3dbbeed6..c9fbf234 100644
--- a/DepotDownloader/DepotDownloader.csproj
+++ b/DepotDownloader/DepotDownloader.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <RollForward>LatestMajor</RollForward>
-    <Version>2.4.6</Version>
+    <Version>2.4.7</Version>
     <Description>Steam Downloading Utility</Description>
     <Authors>SteamRE Team</Authors>
     <Copyright>Copyright © SteamRE Team 2021</Copyright>