More update version check fixes + optimisations

Sparronator9999 · Jan 24, 2025 · 52adc15 · 52adc15
1 parent b216841
commit 52adc15
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 23 deletions.
diff --git a/YAMDCC.Common/YAMDCC.Common.csproj b/YAMDCC.Common/YAMDCC.Common.csproj
@@ -13,7 +13,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC common code library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Config/YAMDCC.Config.csproj b/YAMDCC.Config/YAMDCC.Config.csproj
@@ -13,7 +13,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC config library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj b/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj
@@ -21,7 +21,7 @@
         <Title>YAMDCC configuration utility</Title>
         <UseWindowsForms>true</UseWindowsForms>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj b/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj
@@ -14,7 +14,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC EC access library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj b/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj
@@ -19,7 +19,7 @@
         <Title>YAMDCC EC inspector</Title>
         <UseWindowsForms>true</UseWindowsForms>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Logs/YAMDCC.Logs.csproj b/YAMDCC.Logs/YAMDCC.Logs.csproj
@@ -13,7 +13,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC logging library</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Service/YAMDCC.Service.csproj b/YAMDCC.Service/YAMDCC.Service.csproj
@@ -16,7 +16,7 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC helper service</Title>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Updater/Updater.cs b/YAMDCC.Updater/Updater.cs
@@ -45,38 +45,39 @@ public static bool IsDevVersion(Release release)
     public static bool IsUpdateAvailable(Release release)
     {
         string tag = release.TagName.Remove(0, 1),
-                latestSuffix = Utils.GetCurrentVerSuffix(),
-                currentSuffix = Utils.GetVerSuffix(tag);
+            currentSuffix = Utils.GetCurrentVerSuffix(),
+            latestSuffix = Utils.GetVerSuffix(tag);
 
-        Version current = Utils.GetCurrentVersion(),
-                latest = Utils.GetVersion(tag);
+        Version currentVer = Utils.GetCurrentVersion(),
+            latestVer = Utils.GetVersion(tag);
 
-        // check if version suffixes are different
+        // check if version suffixes are different,
         // if they are, we probably need to update
-        if (latestSuffix != currentSuffix)
+        if (latestSuffix != string.Empty && latestSuffix != currentSuffix ||
+            latestSuffix == string.Empty && currentSuffix != "release")
         {
             return true;
         }
 
-        if (current == latest)
+        if (currentVer == latestVer)
         {
             // check if pre-release version is out of date
-            int latestSuffixVer = Utils.GetSuffixVer(tag),
-                currentSuffixVer = Utils.GetCurrentSuffixVer(),
-                i = 0;
-
-            while (currentSuffixVer != -1 || latestSuffixVer != -1)
+            int i = 0, currentSuffixVer, latestSuffixVer;
+            do
             {
+                currentSuffixVer = Utils.GetCurrentSuffixVer(i);
+                latestSuffixVer = Utils.GetSuffixVer(tag, i);
+
                 // this works even if current version
                 // doesn't have extra suffixes :)
                 if (currentSuffixVer < latestSuffixVer)
                 {
                     return true;
                 }
-                i++;
-                latestSuffixVer = Utils.GetSuffixVer(tag, i);
-                currentSuffixVer = Utils.GetCurrentSuffixVer(i);
             }
+            while (currentSuffixVer != -1 || latestSuffixVer != -1);
+
+            // YAMDCC is up to date if we pass all these checks
             return false;
         }
         return true;

diff --git a/YAMDCC.Updater/YAMDCC.Updater.csproj b/YAMDCC.Updater/YAMDCC.Updater.csproj
@@ -18,7 +18,7 @@
         <Title>YAMDCC configuration utility</Title>
         <UseWindowsForms>true</UseWindowsForms>
         <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>rc.1</VersionSuffix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>