Added ApplicationVersion comparison

BUTR · Oct 9, 2023 · 6483e6a · 6483e6a
1 parent 52e097b
commit 6483e6a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/src/Bannerlord.ModuleManager.DotNetJS/Program.cs b/src/Bannerlord.ModuleManager.DotNetJS/Program.cs
@@ -18,8 +18,6 @@ static Program()
             JS.Runtime.ConfigureJson(options => options.Converters.Add(new JsonStringEnumConverter()));
         }
 
-        private static readonly ApplicationVersionComparer _applicationVersionComparer = new();
-
         public static void Main() { }
 
         [JSInvokable]
@@ -92,7 +90,7 @@ public static void DisableModule(ModuleInfoExtended[] modules, ModuleInfoExtende
         }
 
         [JSInvokable]
-        public static int CompareVersions(ApplicationVersion x, ApplicationVersion y) => _applicationVersionComparer.Compare(x, y);
+        public static int CompareVersions(ApplicationVersion x, ApplicationVersion y) => ApplicationVersionComparer.CompareStandard(x, y);
 
         [JSInvokable]
         public static DependentModuleMetadata[] GetDependenciesAll(ModuleInfoExtended module) => module.DependenciesAllDistinct().ToArray();

diff --git a/src/Bannerlord.ModuleManager.Native/Bindings.cs b/src/Bannerlord.ModuleManager.Native/Bindings.cs
@@ -21,8 +21,6 @@ public static unsafe partial class Bindings
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate return_value_void* N_SetDisabled(param_ptr* p_owner, param_string* p_module_id, param_bool value);
 
-        private static readonly ApplicationVersionComparer _applicationVersionComparer = new();
-
         [UnmanagedCallersOnly(EntryPoint = "bmm_sort", CallConvs = new[] { typeof(CallConvCdecl) }), IsNotConst<IsPtrConst>]
         public static return_value_json* Sort([IsConst<IsPtrConst>] param_json* p_source)
         {
@@ -414,7 +412,7 @@ public static unsafe partial class Bindings
                 var x = Utils.DeserializeJson(p_x, CustomSourceGenerationContext.ApplicationVersion);
                 var y = Utils.DeserializeJson(p_y, CustomSourceGenerationContext.ApplicationVersion);
 
-                var result = _applicationVersionComparer.Compare(x, y);
+                var result = ApplicationVersionComparer.CompareStandard(x, y);
 
                 Logger.LogOutput(result);
                 return return_value_int32.AsValue(result, false);

diff --git a/src/Bannerlord.ModuleManager.WASM/Program.cs b/src/Bannerlord.ModuleManager.WASM/Program.cs
@@ -13,7 +13,6 @@ namespace Bannerlord.ModuleManager.WASM
 {
     public static partial class Program
     {
-        private static readonly ApplicationVersionComparer _applicationVersionComparer = new();
         private static readonly JsonSerializerOptions _options = new()
         {
             DefaultIgnoreCondition = JsonIgnoreCondition.Never,
@@ -127,6 +126,6 @@ public static string GetSubModuleInfo([JSMarshalAs<JSType.String>] string xmlCon
         [JSExport]
         [return: JSMarshalAs<JSType.Number>]
         public static int CompareVersions([JSMarshalAs<JSType.String>] string x, [JSMarshalAs<JSType.String>] string y) =>
-            _applicationVersionComparer.Compare(AsApplicationVersion(x), AsApplicationVersion(y));
+            ApplicationVersionComparer.CompareStandard(AsApplicationVersion(x), AsApplicationVersion(y));
     }
 }
diff --git a/src/Bannerlord.ModuleManager/ApplicationVersion.cs b/src/Bannerlord.ModuleManager/ApplicationVersion.cs
@@ -43,12 +43,14 @@
 
 namespace Bannerlord.ModuleManager
 {
+    using global::System;
+
 #if !BANNERLORDBUTRMODULEMANAGER_PUBLIC
     internal
 #else
     public
 # endif
-        record ApplicationVersion
+        record ApplicationVersion : IComparable<ApplicationVersion>
     {
         public static ApplicationVersion Empty { get; } = new();
 
@@ -76,6 +78,13 @@ public bool IsSameWithChangeSet(ApplicationVersion? other) =>
 
         public override string ToString() => $"{GetPrefix(ApplicationVersionType)}{Major}.{Minor}.{Revision}.{ChangeSet}";
 
+        public int CompareTo(ApplicationVersion? other) => ApplicationVersionComparer.CompareStandard(this, other);
+
+        public static bool operator <(ApplicationVersion left, ApplicationVersion right) => left.CompareTo(right) < 0;
+        public static bool operator >(ApplicationVersion left, ApplicationVersion right) => left.CompareTo(right) > 0;
+        public static bool operator <=(ApplicationVersion left, ApplicationVersion right) => left.CompareTo(right) <= 0;
+        public static bool operator >=(ApplicationVersion left, ApplicationVersion right) => left.CompareTo(right) >= 0;
+
         public static char GetPrefix(ApplicationVersionType applicationVersionType) => applicationVersionType switch
         {
             ApplicationVersionType.Alpha => 'a',

diff --git a/src/Bannerlord.ModuleManager/ApplicationVersionComparer.cs b/src/Bannerlord.ModuleManager/ApplicationVersionComparer.cs
@@ -57,7 +57,9 @@ class ApplicationVersionComparer : IComparer<ApplicationVersion?>, IComparer
         public int Compare(object? x, object? y) => Compare(x as ApplicationVersion, y as ApplicationVersion);
 
         /// <inheritdoc/>
-        public virtual int Compare(ApplicationVersion? x, ApplicationVersion? y)
+        public virtual int Compare(ApplicationVersion? x, ApplicationVersion? y) => CompareStandard(x, y);
+
+        public static int CompareStandard(ApplicationVersion? x, ApplicationVersion? y)
         {
             if (x is null && y is null)
                 return 0;

diff --git a/src/Bannerlord.ModuleManager/ModuleUtilities.cs b/src/Bannerlord.ModuleManager/ModuleUtilities.cs
@@ -375,7 +375,6 @@ public static IEnumerable<ModuleIssue> ValidateModuleDependencies(IReadOnlyList<
             }
 
             // Check that the dependencies have the minimum required version set by DependedModuleMetadatas
-            var comparer = new ApplicationVersionComparer();
             foreach (var metadata in targetModule.DependenciesToLoadDistinct())
             {
                 // Ignore the check for empty versions
@@ -387,7 +386,7 @@ public static IEnumerable<ModuleIssue> ValidateModuleDependencies(IReadOnlyList<
                 if (metadata.Version != ApplicationVersion.Empty)
                 {
                     // dependedModuleMetadata.Version > dependedModule.Version
-                    if (!metadata.IsOptional && (comparer.Compare(metadata.Version, metadataModule.Version) > 0))
+                    if (!metadata.IsOptional && (ApplicationVersionComparer.CompareStandard(metadata.Version, metadataModule.Version) > 0))
                     {
                         yield return new ModuleIssue(targetModule, metadataModule.Id, ModuleIssueType.VersionMismatchLessThanOrEqual)
                         {
@@ -403,7 +402,7 @@ public static IEnumerable<ModuleIssue> ValidateModuleDependencies(IReadOnlyList<
                     // dependedModuleMetadata.Version < dependedModule.VersionRange.Max
                     if (!metadata.IsOptional)
                     {
-                        if (comparer.Compare(metadata.VersionRange.Min, metadataModule.Version) > 0)
+                        if (ApplicationVersionComparer.CompareStandard(metadata.VersionRange.Min, metadataModule.Version) > 0)
                         {
                             yield return new ModuleIssue(targetModule, metadataModule.Id, ModuleIssueType.VersionMismatchLessThan)
                             {
@@ -412,7 +411,7 @@ public static IEnumerable<ModuleIssue> ValidateModuleDependencies(IReadOnlyList<
                             };
                             continue;
                         }
-                        if (comparer.Compare(metadata.VersionRange.Max, metadataModule.Version) < 0)
+                        if (ApplicationVersionComparer.CompareStandard(metadata.VersionRange.Max, metadataModule.Version) < 0)
                         {
                             yield return new ModuleIssue(targetModule, metadataModule.Id, ModuleIssueType.VersionMismatchGreaterThan)
                             {