Case-insensitive comparison of `public` branch

Fixes #429
Fixes #428
pull/534/head
Pavel Djundik 3 years ago
parent 0e8b662715
commit cc5da551f9

@ -21,7 +21,7 @@ namespace DepotDownloader
public const uint INVALID_APP_ID = uint.MaxValue; public const uint INVALID_APP_ID = uint.MaxValue;
public const uint INVALID_DEPOT_ID = uint.MaxValue; public const uint INVALID_DEPOT_ID = uint.MaxValue;
public const ulong INVALID_MANIFEST_ID = ulong.MaxValue; public const ulong INVALID_MANIFEST_ID = ulong.MaxValue;
public const string DEFAULT_BRANCH = "Public"; public const string DEFAULT_BRANCH = "public";
public static DownloadConfig Config = new DownloadConfig(); public static DownloadConfig Config = new DownloadConfig();
@ -243,7 +243,7 @@ namespace DepotDownloader
var node = manifests[branch].Children.Count > 0 ? manifests[branch]["gid"] : manifests[branch]; var node = manifests[branch].Children.Count > 0 ? manifests[branch]["gid"] : manifests[branch];
if (branch != "Public" && node == KeyValue.Invalid) if (node == KeyValue.Invalid && !string.Equals(branch, DEFAULT_BRANCH, StringComparison.OrdinalIgnoreCase))
{ {
var node_encrypted = manifests_encrypted[branch]; var node_encrypted = manifests_encrypted[branch];
if (node_encrypted != KeyValue.Invalid) if (node_encrypted != KeyValue.Invalid)
@ -589,10 +589,10 @@ namespace DepotDownloader
if (manifestId == INVALID_MANIFEST_ID) if (manifestId == INVALID_MANIFEST_ID)
{ {
manifestId = GetSteam3DepotManifest(depotId, appId, branch); manifestId = GetSteam3DepotManifest(depotId, appId, branch);
if (manifestId == INVALID_MANIFEST_ID && branch != "public") if (manifestId == INVALID_MANIFEST_ID && !string.Equals(branch, DEFAULT_BRANCH, StringComparison.OrdinalIgnoreCase))
{ {
Console.WriteLine("Warning: Depot {0} does not have branch named \"{1}\". Trying public branch.", depotId, branch); Console.WriteLine("Warning: Depot {0} does not have branch named \"{1}\". Trying {2} branch.", depotId, branch, DEFAULT_BRANCH);
branch = "public"; branch = DEFAULT_BRANCH;
manifestId = GetSteam3DepotManifest(depotId, appId, branch); manifestId = GetSteam3DepotManifest(depotId, appId, branch);
} }

@ -376,7 +376,7 @@ namespace DepotDownloader
Console.WriteLine("\t-app <#>\t\t\t\t- the AppID to download."); Console.WriteLine("\t-app <#>\t\t\t\t- the AppID to download.");
Console.WriteLine("\t-depot <#>\t\t\t\t- the DepotID to download."); Console.WriteLine("\t-depot <#>\t\t\t\t- the DepotID to download.");
Console.WriteLine("\t-manifest <id>\t\t\t- manifest id of content to download (requires -depot, default: current for branch)."); Console.WriteLine("\t-manifest <id>\t\t\t- manifest id of content to download (requires -depot, default: current for branch).");
Console.WriteLine("\t-beta <branchname>\t\t\t- download from specified branch if available (default: Public)."); Console.WriteLine($"\t-beta <branchname>\t\t\t- download from specified branch if available (default: {ContentDownloader.DEFAULT_BRANCH}).");
Console.WriteLine("\t-betapassword <pass>\t\t- branch password if applicable."); Console.WriteLine("\t-betapassword <pass>\t\t- branch password if applicable.");
Console.WriteLine("\t-all-platforms\t\t\t- downloads all platform-specific depots when -app is used."); Console.WriteLine("\t-all-platforms\t\t\t- downloads all platform-specific depots when -app is used.");
Console.WriteLine("\t-os <os>\t\t\t\t- the operating system for which to download the game (windows, macos or linux, default: OS the program is currently running on)"); Console.WriteLine("\t-os <os>\t\t\t\t- the operating system for which to download the game (windows, macos or linux, default: OS the program is currently running on)");

Loading…
Cancel
Save