diff --git a/SabreTools.RedumpLib/Web/RedumpClient.cs b/SabreTools.RedumpLib/Web/RedumpClient.cs index 1520fde..cd9680c 100644 --- a/SabreTools.RedumpLib/Web/RedumpClient.cs +++ b/SabreTools.RedumpLib/Web/RedumpClient.cs @@ -566,27 +566,6 @@ namespace SabreTools.RedumpLib.Web #region Download Helpers - /// - /// Download a single pack - /// - /// Base URL to download using - /// System to download packs for - /// Byte array containing the downloaded pack, null on error - public async Task DownloadSinglePack(string url, RedumpSystem? system) - { - try - { - if (Debug) Console.WriteLine($"DEBUG: DownloadSinglePack(\"{url}\", {system})"); - string packUri = string.Format(url, system.ShortName()); - return await DownloadData(packUri); - } - catch (Exception ex) - { - Console.Error.WriteLine($"An exception has occurred: {ex}"); - return null; - } - } - /// /// Download a single pack /// @@ -617,41 +596,6 @@ namespace SabreTools.RedumpLib.Web } } - /// - /// Download a single pack - /// - /// Base URL to download using - /// System to download packs for - /// Output directory to save data to - /// Named subfolder for the pack, used optionally - public async Task DownloadSinglePack(string url, RedumpSystem? system, string? outDir, string? subfolder) - { - try - { - if (Debug) Console.WriteLine($"DEBUG: DownloadSinglePack(\"{url}\", {system}, \"{outDir}\", \"{subfolder}\")"); - - // If no output directory is defined, use the current directory instead - if (string.IsNullOrEmpty(outDir)) - outDir = Environment.CurrentDirectory; - - string tempfile = Path.Combine(outDir, "tmp" + Guid.NewGuid().ToString()); - string packUri = string.Format(url, system.ShortName()); - - // Make the call to get the pack - string? remoteFileName = await DownloadFile(packUri, tempfile); - if (remoteFileName is null) - return false; - - MoveOrDelete(tempfile, remoteFileName, outDir!, subfolder); - return true; - } - catch (Exception ex) - { - Console.Error.WriteLine($"An exception has occurred: {ex}"); - return false; - } - } - /// /// Download a single pack /// @@ -1145,7 +1089,7 @@ namespace SabreTools.RedumpLib.Web else Console.Write($"\r{longName}{new string(' ', Console.BufferWidth - longName!.Length - 1)}"); - byte[]? pack = await DownloadSinglePack(baseUrl, system); + byte[]? pack = await DownloadSinglePack(packType, system); if (pack is not null) packsDictionary.Add(system, pack); } @@ -1213,7 +1157,7 @@ namespace SabreTools.RedumpLib.Web else Console.Write($"\r{longName}{new string(' ', Console.BufferWidth - longName!.Length - 1)}"); - await DownloadSinglePack(baseUrl, system, outDir, subfolder); + await DownloadSinglePack(packType, system, outDir, subfolder); } if (Debug)