Skip to content

Commit 1f5d73a

Browse files
committed
Adapt codebase to new Version struct
1 parent 9ddaf4c commit 1f5d73a

5 files changed

Lines changed: 15 additions & 13 deletions

File tree

src/UniGetUI.Core.Tools/Tools.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,8 @@ public static async Task<long> GetFileSizeAsyncAsLong(Uri? url)
318318

319319
public struct Version: IComparable<Version>, IEquatable<Version>
320320
{
321+
public static readonly Version Null = new(-1, -1, -1, -1);
322+
321323
public readonly int Major;
322324
public readonly int Minor;
323325
public readonly int Patch;
@@ -407,9 +409,8 @@ public static Version VersionStringToStruct(string Version)
407409
}
408410
catch
409411
{
410-
throw;
411412
Logger.Warn($"Failed to parse version {Version} to float");
412-
return new(-1, -1, -1, -1);
413+
return CoreTools.Version.Null;
413414
}
414415
}
415416

src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.ComponentModel;
2+
using UniGetUI.Core.Tools;
23
using UniGetUI.Interface.Enums;
34
using UniGetUI.PackageEngine.Classes.Serializable;
45
using UniGetUI.PackageEngine.Structs;
@@ -13,8 +14,8 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
1314
public string Name { get; }
1415
public string Id { get; }
1516
public string Version { get; }
16-
public double VersionAsFloat { get; }
17-
public double NewVersionAsFloat { get; }
17+
public CoreTools.Version VersionAsFloat { get; }
18+
public CoreTools.Version NewVersionAsFloat { get; }
1819
public IManagerSource Source { get; }
1920
public IPackageManager Manager { get; }
2021
public string NewVersion { get; }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public sealed override void Initialize()
3434
private struct SearchResult
3535
{
3636
public string version;
37-
public double version_float;
37+
public CoreTools.Version version_float;
3838
public string id;
3939
}
4040

@@ -82,7 +82,7 @@ protected sealed override IReadOnlyList<Package> FindPackages_UnSafe(string quer
8282

8383
string id = Regex.Match(match.Value, "Id='([^<>']+)'").Groups[1].Value;
8484
string version = Regex.Match(match.Value, "Version='([^<>']+)'").Groups[1].Value;
85-
double float_version = CoreTools.GetVersionStringAsFloat(version);
85+
var float_version = CoreTools.VersionStringToStruct(version);
8686
// Match title = Regex.Match(match.Value, "<title[ \\\"\\=A-Za-z0-9]+>([^<>]+)<\\/title>");
8787

8888
if (AlreadyProcessedPackages.TryGetValue(id, out var value) && value.version_float >= float_version)

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/InvalidImportedPackage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public bool IsChecked
3535

3636
public string Version { get; }
3737

38-
public double VersionAsFloat { get; }
38+
public CoreTools.Version VersionAsFloat { get; }
3939

40-
public double NewVersionAsFloat { get => .0F; }
40+
public CoreTools.Version NewVersionAsFloat { get => CoreTools.Version.Null; }
4141

4242
public IManagerSource Source { get; }
4343

@@ -60,7 +60,7 @@ public InvalidImportedPackage(SerializableIncompatiblePackage_v1 data, IManagerS
6060
Name = data.Name;
6161
Id = data.Id.Split('\\')[^1];
6262
Version = data.Version;
63-
VersionAsFloat = CoreTools.GetVersionStringAsFloat(data.Version);
63+
VersionAsFloat = CoreTools.VersionStringToStruct(data.Version);
6464
SourceAsString = data.Source;
6565
AutomationName = data.Name;
6666
Manager = source.Manager;

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public bool IsChecked
5252
public string AutomationName { get; }
5353
public string Id { get; }
5454
public virtual string Version { get; }
55-
public double VersionAsFloat { get; }
56-
public double NewVersionAsFloat { get; }
55+
public CoreTools.Version VersionAsFloat { get; }
56+
public CoreTools.Version NewVersionAsFloat { get; }
5757
public bool IsPopulated { get; set; }
5858
public IManagerSource Source { get; }
5959

@@ -78,7 +78,7 @@ public Package(
7878
Name = name;
7979
Id = id;
8080
Version = version;
81-
VersionAsFloat = CoreTools.GetVersionStringAsFloat(version);
81+
VersionAsFloat = CoreTools.VersionStringToStruct(version);
8282
Source = source;
8383
Manager = manager;
8484

@@ -126,7 +126,7 @@ public Package(
126126
{
127127
IsUpgradable = true;
128128
NewVersion = new_version;
129-
NewVersionAsFloat = CoreTools.GetVersionStringAsFloat(new_version);
129+
NewVersionAsFloat = CoreTools.VersionStringToStruct(new_version);
130130
}
131131

132132
public long GetHash()

0 commit comments

Comments
 (0)