Merge pull request Devolutions#3333 from marticliment/float-versions-to-structs

Author: marticliment

src/UniGetUI.Core.IconStore/IconCacheEngine.cs

@@ -318,7 +318,7 @@ private static bool ValidateByVersion(CacheableIcon icon, string versionPath)
         {
             try
             {
-                return File.Exists(versionPath) && CoreTools.GetVersionStringAsFloat(File.ReadAllText(versionPath)) >= CoreTools.GetVersionStringAsFloat(icon.Version);
+                return File.Exists(versionPath) && CoreTools.VersionStringToStruct(File.ReadAllText(versionPath)) >= CoreTools.VersionStringToStruct(icon.Version);
             }
             catch (Exception e)
             {

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

@@ -114,19 +114,24 @@ public async Task TestFileSizeLoader(string uri, long expectedSize)
         }
 
         [Theory]
-        [InlineData("1000.0", 1000.0, 0.0)]
-        [InlineData("2.4", 2.4, 0.001)]
-        [InlineData("33a.12-beta", 33.12, 0.0)]
-        [InlineData("0", 0.0, 0.0)]
-        [InlineData("", -1, 0.0)]
-        [InlineData("dfgfdsgdfg", -1, 0.0)]
-        [InlineData("-12", 12.0, 0.0)]
-        [InlineData("4.0.0.1.0", 4.001, 0.01)]
-        [InlineData("2024.30.04.1223", 2024.30041223, 0.0)]
-        [InlineData("0.0", 0.0, 0.0)]
-        public void TestGetVersionStringAsFloat(string version, double expected, double tolerance)
+        [InlineData("1000.0", 1000, 0, 0, 0)]
+        [InlineData("2.4", 2, 4, 0, 0)]
+        [InlineData("33a.12-beta5", 33, 12, 5, 0)]
+        [InlineData("0", 0,0,0,0)]
+        [InlineData("", 0,0,0,0)]
+        [InlineData("dfgfdsgdfg", 0,0,0,0)]
+        [InlineData("-12", 12,0,0,0)]
+        [InlineData("4.0.0.1.0", 4,0,0,10)]
+        [InlineData("4.0.0.1.05", 4,0,0,105)]
+        [InlineData("2024.30.04.1223", 2024, 30, 4, 1223)]
+        [InlineData("0.0", 0,0,0,0)]
+        public void TestGetVersionStringAsFloat(string version, int i1, int i2, int i3, int i4)
         {
-            Assert.Equal(expected, CoreTools.GetVersionStringAsFloat(version), tolerance);
+            CoreTools.Version v = CoreTools.VersionStringToStruct(version);
+            Assert.Equal(i1, v.Major);
+            Assert.Equal(i2, v.Minor);
+            Assert.Equal(i3, v.Patch);
+            Assert.Equal(i4, v.Remainder);
         }
 
         [Theory]

src/UniGetUI.Core.Tools/Tools.cs

@@ -315,53 +315,104 @@ public static async Task<long> GetFileSizeAsyncAsLong(Uri? url)
             return 0;
         }
 
+
+        public struct Version: IComparable
+        {
+            public static readonly Version Null = new(-1, -1, -1, -1);
+
+            public readonly int Major;
+            public readonly int Minor;
+            public readonly int Patch;
+            public readonly int Remainder;
+
+            public Version(int major, int minor = 0, int patch = 0, int remainder = 0)
+            {
+                Major = major;
+                Minor = minor;
+                Patch = patch;
+                Remainder = remainder;
+            }
+
+            public int CompareTo(object? other_)
+            {
+                if (other_ is not Version other) return 0;
+
+                int major = Major.CompareTo(other.Major);
+                if (major != 0) return major;
+
+                int minor = Minor.CompareTo(other.Minor);
+                if (minor != 0) return minor;
+
+                int patch = Patch.CompareTo(other.Patch);
+                if (patch != 0) return patch;
+
+                return Remainder.CompareTo(other.Remainder);
+            }
+
+            public static bool operator ==(Version left, Version right)
+                => left.CompareTo(right) == 0;
+
+            public static bool operator !=(Version left, Version right)
+                => left.CompareTo(right) != 0;
+
+            public static bool operator >=(Version left, Version right)
+                => left.CompareTo(right) >= 0;
+
+            public static bool operator <=(Version left, Version right)
+                => left.CompareTo(right) <= 0;
+
+            public static bool operator >(Version left, Version right)
+                => left.CompareTo(right) > 0;
+
+            public static bool operator <(Version left, Version right)
+                => left.CompareTo(right) < 0;
+
+            public bool Equals(Version other)
+                => Major == other.Major && Minor == other.Minor && Patch == other.Patch && Remainder == other.Remainder;
+
+            public override bool Equals(object? obj)
+                => obj is Version other && Equals(other);
+
+            public override int GetHashCode()
+                => HashCode.Combine(Major, Minor, Patch, Remainder);
+        }
+
         /// <summary>
         /// Converts a string into a double floating-point number.
         /// </summary>
         /// <param name="Version">Any string</param>
         /// <returns>The best approximation of the string as a Version</returns>
-        public static double GetVersionStringAsFloat(string Version)
+        public static Version VersionStringToStruct(string Version)
         {
             try
             {
-                string _ver = "";
-                bool _dotAdded = false;
-                foreach (char _char in Version)
+                char[] separators = ['.', '-', '/', '#'];
+                string[] versionItems = ["", "", "", ""];
+
+                int dotCount = 0;
+                bool first = true;
+
+                foreach (char c in Version)
                 {
-                    if (char.IsDigit(_char))
-                    {
-                        _ver += _char;
-                    }
-                    else if (_char == '.')
-                    {
-                        if (!_dotAdded)
-                        {
-                            _ver += _char;
-                            _dotAdded = true;
-                        }
-                    }
+                    if (char.IsDigit(c)) versionItems[dotCount] += c;
+                    else if (!first && separators.Contains(c)) if (dotCount < 3) dotCount++;
+                    first = false;
                 }
 
-                double res = -1;
-                if (_ver is not "" and not ".")
+                int[] numbers = { 0, 0, 0, 0 };
+                for (int i = 0; i < 4; i++)
                 {
-                    try
-                    {
-                        double val = double.Parse(_ver, CultureInfo.InvariantCulture);
-                        return val;
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
+                    if (int.TryParse(versionItems[i], out int val))
+                        numbers[i] = val;
                 }
 
-                return res;
+                var ver = new Version(numbers[0], numbers[1], numbers[2], numbers[3]);
+                return ver;
             }
             catch
             {
                 Logger.Warn($"Failed to parse version {Version} to float");
-                return -1;
+                return CoreTools.Version.Null;
             }
         }
 

src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs

@@ -201,7 +201,7 @@ public void BuildV1WidgetsApi()
                         continue; // Do not show already processed packages on queue
 
                     string icon = $"http://localhost:7058/widgets/v2/get_icon_for_package?packageId={HttpUtility.UrlEncode(package.Id)}&packageSource={HttpUtility.UrlEncode(package.Source.Name)}&token={ApiTokenHolder.Token}";
-                    packages.Append($"{package.Name.Replace('|', '-')}|{package.Id}|{package.Version}|{package.NewVersion}|{package.Source.AsString_DisplayName}|{package.Manager.Name}|{icon}&&");
+                    packages.Append($"{package.Name.Replace('|', '-')}|{package.Id}|{package.VersionString}|{package.NewVersionString}|{package.Source.AsString_DisplayName}|{package.Manager.Name}|{icon}&&");
                 }
 
                 string pkgs_ = packages.ToString();

src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using UniGetUI.Core.Tools;
 using UniGetUI.Interface.Enums;
 using UniGetUI.PackageEngine.Classes.Serializable;
 using UniGetUI.PackageEngine.Structs;
@@ -12,12 +13,12 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
         public bool IsChecked { get; set; }
         public string Name { get; }
         public string Id { get; }
-        public string Version { get; }
-        public double VersionAsFloat { get; }
-        public double NewVersionAsFloat { get; }
+        public string VersionString { get; }
+        public CoreTools.Version NormalizedVersion { get; }
+        public CoreTools.Version NormalizedNewVersion { get; }
         public IManagerSource Source { get; }
         public IPackageManager Manager { get; }
-        public string NewVersion { get; }
+        public string NewVersionString { get; }
         public bool IsUpgradable { get; }
         public ref OverridenInstallationOptions OverridenOptions { get; }
         public string AutomationName { get; }

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

@@ -103,7 +103,7 @@ protected override IReadOnlyList<Package> FindPackages_UnSafe(string query)
             var package = Packages[i];
             try
             {
-                var versionInfo = CratesIOClient.GetManifestVersion(package.Id, package.Version);
+                var versionInfo = CratesIOClient.GetManifestVersion(package.Id, package.VersionString);
                 if (versionInfo.bin_names?.Length > 0)
                 {
                     BinPackages.Add(package);

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

@@ -38,7 +38,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details)
         var categories = manifest.categories?.Select(c => c.category);
         details.Tags = [.. keywords, .. categories];
 
-        var versionData = manifest.versions.Where((v) => v.num == details.Package.Version).First();
+        var versionData = manifest.versions.Where((v) => v.num == details.Package.VersionString).First();
 
         details.Author = versionData.published_by?.name;
         details.License = versionData.license;

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

@@ -8,7 +8,7 @@ internal sealed class CargoPkgOperationHelper(Cargo cargo) : PackagePkgOperation
 {
     protected override IReadOnlyList<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
-        var version = options.Version == string.Empty ? package.Version : options.Version;
+        var version = options.Version == string.Empty ? package.VersionString : options.Version;
         List<string> parameters = operation switch
         {
             OperationType.Install => [Manager.Properties.InstallVerb, "--version", version, package.Id],

src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs

@@ -19,7 +19,7 @@ namespace UniGetUI.PackageEngine.Managers.ChocolateyManager
     public class Chocolatey : BaseNuGet
     {
         public static new string[] FALSE_PACKAGE_IDS = ["Directory", "", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "Output is package name ", "operable", "Invalid"];
-        public static new string[] FALSE_PACKAGE_VERSIONS = ["", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "packages", "current version", "installed version", "is", "program", "validations", "argument", "no"];
+        public static new string[] FALSE_PACKAGE_VERSIONS = ["", "of", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "packages", "current version", "installed version", "is", "program", "validations", "argument", "no"];
 
         public Chocolatey()
         {

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

@@ -34,7 +34,7 @@ public sealed override void Initialize()
         private struct SearchResult
         {
             public string version;
-            public double version_float;
+            public CoreTools.Version version_float;
             public string id;
         }
 
@@ -82,7 +82,7 @@ protected sealed override IReadOnlyList<Package> FindPackages_UnSafe(string quer
 
                     string id = Regex.Match(match.Value, "Id='([^<>']+)'").Groups[1].Value;
                     string version = Regex.Match(match.Value, "Version='([^<>']+)'").Groups[1].Value;
-                    double float_version = CoreTools.GetVersionStringAsFloat(version);
+                    var float_version = CoreTools.VersionStringToStruct(version);
                     // Match title = Regex.Match(match.Value, "<title[ \\\"\\=A-Za-z0-9]+>([^<>]+)<\\/title>");
 
                     if (AlreadyProcessedPackages.TryGetValue(id, out var value) && value.version_float >= float_version)