Migrate PackageDetails.InstallerSize from double to long, allow downloading cargo crates

Author: marticliment

src/UniGetUI.Core.Tools.Tests/ToolsTests.cs

@@ -109,8 +109,8 @@ public void TestRandomStringGenerator(int length)
         [InlineData("https://www.marticliment.com/unigetui/wingetui_size_test.txt", 460)]
         public async Task TestFileSizeLoader(string uri, long expectedSize)
         {
-            double size = await CoreTools.GetFileSizeAsync(uri != "" ? new Uri(uri) : null);
-            Assert.Equal(expectedSize / 1048576, size);
+            long size = await CoreTools.GetFileSizeAsLongAsync(uri != "" ? new Uri(uri) : null);
+            Assert.Equal(expectedSize, size);
         }
 
         [Theory]

src/UniGetUI.Core.Tools/Tools.cs

@@ -244,34 +244,18 @@ public static bool IsAdministrator()
             }
         }
 
-        /// <summary>
-        /// Returns the size (in MB) of the file at the given URL
-        /// </summary>
-        /// <param name="url">a valid Uri object containing a URL to a file</param>
-        /// <returns>a double representing the size in MBs, 0 if the process fails</returns>
-        public static async Task<double> GetFileSizeAsync(Uri? url)
-        {
-            return await GetFileSizeAsyncAsLong(url) / 1048576d;
-        }
+        public static Task<long> GetFileSizeAsLongAsync(Uri? url)
+            => Task.Run(() => GetFileSizeAsLong(url));
 
-        /// <summary>
-        /// Returns the size (in MB) of the file at the given URL
-        /// </summary>
-        /// <param name="url">a valid Uri object containing a URL to a file</param>
-        /// <returns>a double representing the size in MBs, 0 if the process fails</returns>
-        public static double GetFileSize(Uri? url)
-        {
-            return GetFileSizeAsyncAsLong(url).GetAwaiter().GetResult() / 1048576d;
-        }
 
-        public static async Task<long> GetFileSizeAsyncAsLong(Uri? url)
+        public static long GetFileSizeAsLong(Uri? url)
         {
             if (url is null) return 0;
 
             try
             {
                 using HttpClient client = new(CoreTools.GenericHttpClientParameters);
-                HttpResponseMessage response = await client.SendAsync(new HttpRequestMessage(HttpMethod.Head, url));
+                HttpResponseMessage response = client.Send(new HttpRequestMessage(HttpMethod.Head, url));
                 return response.Content.Headers.ContentLength ?? 0;
             }
             catch (Exception e)

src/UniGetUI.PAckageEngine.Interfaces/IPackageDetails.cs

@@ -59,9 +59,9 @@ public interface IPackageDetails
         public string? InstallerType { get; set; }
 
         /// <summary>
-        /// The size, in **MEGABYTES**, of the installer
+        /// The size, in **BYTES**, of the installer
         /// </summary>
-        public double InstallerSize { get; set; }
+        public long InstallerSize { get; set; }
 
         /// <summary>
         /// A URL pointing to the Manifest File of the package

src/UniGetUI.PackageEngine.Managers.Cargo/Cargo.cs

@@ -49,6 +49,7 @@ public Cargo()
             CanSkipIntegrityChecks = true,
             SupportsCustomVersions = true,
             SupportsCustomLocations = true,
+            CanDownloadInstaller = true,
             SupportsProxy = ProxySupport.Partially,
             SupportsProxyAuth = true
         };

src/UniGetUI.PackageEngine.Managers.Cargo/CratesIOClient.cs

@@ -38,7 +38,7 @@ internal record CargoManifestVersion
 {
     public string[]? bin_names { get; init; }
     public required string checksum { get; init; }
-    public double? crate_size { get; init; }
+    public long? crate_size { get; init; }
     public string? created_at { get; init; }
     public required string dl_path { get; init; }
     public string? license { get; init; }

src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgDetailsHelper.cs

@@ -42,7 +42,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
 
         details.Author = versionData.published_by?.name;
         details.License = versionData.license;
-        details.InstallerUrl = new Uri(CratesIOClient.ApiUrl + versionData.dl_path);
+        details.InstallerUrl = new Uri((CratesIOClient.ApiUrl + versionData.dl_path).Replace("/api/v1/api/v1", "/api/v1"));
         details.InstallerSize = versionData.crate_size ?? 0;
         details.InstallerHash = versionData.checksum;
         details.Publisher = versionData.published_by?.name;

src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsHelper.cs

@@ -49,7 +49,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
                 {
                     try
                     {
-                        details.InstallerSize = long.Parse(match.Groups[3].Value) / 1000000.0;
+                        details.InstallerSize = long.Parse(match.Groups[3].Value);
                         break;
                     }
                     catch (Exception ex)

src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgDetailsHelper.cs

@@ -57,7 +57,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
                     details.InstallerUrl = installerUrl;
 
                 if (int.TryParse(contents?["dist"]?["unpackedSize"]?.ToString() ?? "", NumberStyles.Any, CultureInfo.InvariantCulture, out int installerSize))
-                    details.InstallerSize = installerSize / 1048576d;
+                    details.InstallerSize = installerSize;
 
                 details.InstallerHash = contents?["dist"]?["integrity"]?.ToString();
 

src/UniGetUI.PackageEngine.Managers.Pip/Helpers/PipPkgDetailsHelper.cs

@@ -69,7 +69,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
                 {
                     details.InstallerType = url["url"]?.ToString().Split('.')[^1].Replace("whl", "Wheel");
                     details.InstallerUrl = installerUrl;
-                    details.InstallerSize = CoreTools.GetFileSize(installerUrl);
+                    details.InstallerSize = CoreTools.GetFileSizeAsLong(installerUrl);
                 }
 
                 details.UpdateDate = url["upload_time"]?.ToString();

src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgDetailsHelper.cs

@@ -150,7 +150,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
             }
 
             if (details.InstallerUrl is not null)
-                details.InstallerSize = CoreTools.GetFileSize(details.InstallerUrl);
+                details.InstallerSize = CoreTools.GetFileSizeAsLong(details.InstallerUrl);
 
             // Load release notes URL
             if (contents?["checkver"] is JsonObject checkver && Uri.TryCreate(checkver["url"]?.ToString(), UriKind.RelativeOrAbsolute,