refactor: better version checks

ShokoAnime · Aug 18, 2024 · fa2d93f · fa2d93f
1 parent 56e30c4
commit fa2d93f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Shokofin/API/Models/ComponentVersion.cs b/Shokofin/API/Models/ComponentVersion.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Text.Json.Serialization;
 
@@ -17,7 +18,8 @@ public class ComponentVersion
     /// <summary>
     /// Version number.
     /// </summary>
-    public string Version { get; set; } = string.Empty;
+    [DefaultValue("1.0.0.0")]
+    public Version Version { get; set; } = new("1.0.0.0");
 
     /// <summary>
     /// Commit SHA.

diff --git a/Shokofin/API/Models/Image.cs b/Shokofin/API/Models/Image.cs
@@ -58,7 +58,7 @@ public class Image
     /// </summary>
     [JsonIgnore]
     public virtual bool IsAvailable
-        => !string.IsNullOrEmpty(LocalPath) || (Plugin.Instance.Configuration.ServerVersion?.Version is {} version && version is not "4.2.2.0");
+        => !string.IsNullOrEmpty(LocalPath) || (Plugin.Instance.Configuration.ServerVersion?.Version is {} version && version > new Version("4.2.2.0"));
 
     /// <summary>
     /// Get an URL to both download the image on the backend and preview it for

diff --git a/Shokofin/API/ShokoAPIClient.cs b/Shokofin/API/ShokoAPIClient.cs
@@ -28,15 +28,15 @@ public class ShokoAPIClient : IDisposable
     private static readonly DateTime StableCutOffDate = DateTime.Parse("2023-12-16T00:00:00.000Z");
 
     private static bool UseOlderSeriesAndFileEndpoints =>
-        ServerVersion != null && ((ServerVersion.ReleaseChannel == ReleaseChannel.Stable && ServerVersion.Version == "4.2.2.0") || (ServerVersion.ReleaseDate.HasValue && ServerVersion.ReleaseDate.Value < StableCutOffDate));
+        ServerVersion != null && ((ServerVersion.ReleaseChannel == ReleaseChannel.Stable && ServerVersion.Version == new Version("4.2.2.0")) || (ServerVersion.ReleaseDate.HasValue && ServerVersion.ReleaseDate.Value < StableCutOffDate));
 
     private static readonly DateTime ImportFolderCutOffDate = DateTime.Parse("2024-03-28T00:00:00.000Z");
 
     private static bool UseOlderImportFolderFileEndpoints =>
-        ServerVersion != null && ((ServerVersion.ReleaseChannel == ReleaseChannel.Stable && ServerVersion.Version == "4.2.2.0") || (ServerVersion.ReleaseDate.HasValue && ServerVersion.ReleaseDate.Value < ImportFolderCutOffDate));
+        ServerVersion != null && ((ServerVersion.ReleaseChannel == ReleaseChannel.Stable && ServerVersion.Version == new Version("4.2.2.0")) || (ServerVersion.ReleaseDate.HasValue && ServerVersion.ReleaseDate.Value < ImportFolderCutOffDate));
 
     public static bool AllowEpisodeImages =>
-        ServerVersion is { } serverVersion && serverVersion.Version[0..6] is not "4.2.2." && serverVersion.Version.Split('.').Last() is not "0";
+        ServerVersion is { } serverVersion && serverVersion.Version > new Version("4.2.2.0");
 
     private readonly GuardedMemoryCache _cache;
 

diff --git a/Shokofin/SignalR/SignalRConnectionManager.cs b/Shokofin/SignalR/SignalRConnectionManager.cs
@@ -22,7 +22,7 @@ public class SignalRConnectionManager
     private static readonly DateTime EventChangedDate = DateTime.Parse("2024-04-01T04:04:00.000Z");
 
     private static bool UseOlderEvents =>
-        ServerVersion != null && ((ServerVersion.ReleaseChannel == ReleaseChannel.Stable && ServerVersion.Version == "4.2.2.0") || (ServerVersion.ReleaseDate.HasValue && ServerVersion.ReleaseDate.Value < EventChangedDate));
+        ServerVersion != null && ((ServerVersion.ReleaseChannel == ReleaseChannel.Stable && ServerVersion.Version == new Version("4.2.2.0")) || (ServerVersion.ReleaseDate.HasValue && ServerVersion.ReleaseDate.Value < EventChangedDate));
 
     private const string HubUrl = "/signalr/aggregate?feeds=shoko";