fix: #716

VShawn · VShawn · commit 220fbe767f08 · 2024-09-19T18:38:29.000+08:00
diff --git a/Ui/AppVersion.cs b/Ui/AppVersion.cs
@@ -6,10 +6,10 @@ public static class AppVersion
     {
         public const uint Major = 1;
         public const uint Minor = 0;
-        public const uint Patch = 0;
+        public const uint Patch = 1;
         public const uint Build = 0;
         public const string BuildDate = "";
-        public const string PreRelease = ""; // e.g. "alpha" "beta.2"
+        public const string PreRelease = "alpha"; // e.g. "alpha" "beta.2"
 
         public static readonly Version VersionData = new Version(Major, Minor, Patch, Build, PreRelease);
         public static string Version => VersionData.ToString();
diff --git a/Ui/Ui.csproj b/Ui/Ui.csproj
@@ -73,7 +73,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<AssemblyVersion>1.0.0.40905</AssemblyVersion>
+		<AssemblyVersion>1.0.0.40919</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<Authors>Shawn</Authors>
diff --git a/Ui/View/AboutPageViewModel.cs b/Ui/View/AboutPageViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security.Policy;
 using System.Text.RegularExpressions;
@@ -43,21 +44,27 @@ private static VersionHelper.CheckUpdateResult CustomCheckMethod(string html, st
             if (ret.NewerPublished)
                 return ret;
 
-            var mc = Regex.Matches(html, @".?1remote-([\d|\.]*.*)-net6", RegexOptions.IgnoreCase);
-            if (mc.Count > 0)
+            var patterns = new List<string>()
             {
-                var versionString = mc[mc.Count - 1].Groups[1].Value;
-                var releasedVersion = VersionHelper.Version.FromString(versionString);
-                if (ignoreVersion is not null)
-                {
-                    if (releasedVersion <= ignoreVersion)
-                    {
-                        return VersionHelper.CheckUpdateResult.False();
-                    }
-                }
-                if (releasedVersion > currentVersion)
-                    return new VersionHelper.CheckUpdateResult(true, versionString, publishUrl, versionString.FirstOrDefault() == '!' || versionString.LastOrDefault() == '!');
-            }
+	            @".?1remote-([\d|\.]*.*)-net",
+	            @".?latest\sversion:\s*([\d|.]*)",
+            };
+            foreach (var pattern in patterns)
+			{
+				var mc = Regex.Matches(html, pattern, RegexOptions.IgnoreCase);
+				if (mc.Count <= 0) continue;
+				var versionString = mc[^1].Groups[1].Value;
+				var releasedVersion = VersionHelper.Version.FromString(versionString);
+				if (ignoreVersion is not null)
+				{
+					if (releasedVersion <= ignoreVersion)
+					{
+						return VersionHelper.CheckUpdateResult.False();
+					}
+				}
+				if (releasedVersion > currentVersion)
+					return new VersionHelper.CheckUpdateResult(true, versionString, publishUrl, versionString.FirstOrDefault() == '!' || versionString.LastOrDefault() == '!');
+			}
             return VersionHelper.CheckUpdateResult.False();
         }
 
diff --git a/Ui/View/Editor/Forms/SshFormView.xaml.cs b/Ui/View/Editor/Forms/SshFormView.xaml.cs
@@ -19,18 +19,24 @@ public SshFormView() : base()
             {
                 if (DataContext is SshFormViewModel { New: var ssh })
                 {
-                    CbUsePrivateKey.IsChecked = false;
+	                bool? privateKey = false;
                     if (ssh.PrivateKey == ssh.ServerEditorDifferentOptions)
                     {
                         CbUsePrivateKey.IsChecked = null;
+                        privateKey = null;
+
                     }
 
                     if (!string.IsNullOrEmpty(ssh.PrivateKey))
                     {
                         CbUsePrivateKey.IsChecked = true;
+                        privateKey = true;
+
                     }
+
+                    CbUsePrivateKey.IsChecked = privateKey;
                 }
-            };
+			};
         }
 
         private void ButtonOpenPrivateKey_OnClick(object sender, RoutedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,24 @@ public SshFormView() : base()`
`19`	`19`	`{`
`20`	`20`	`if (DataContext is SshFormViewModel { New: var ssh })`
`21`	`21`	`{`
`22`		`- CbUsePrivateKey.IsChecked = false;`
	`22`	`+ bool? privateKey = false;`
`23`	`23`	`if (ssh.PrivateKey == ssh.ServerEditorDifferentOptions)`
`24`	`24`	`{`
`25`	`25`	`CbUsePrivateKey.IsChecked = null;`
	`26`	`+ privateKey = null;`
	`27`	`+`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`if (!string.IsNullOrEmpty(ssh.PrivateKey))`
`29`	`31`	`{`
`30`	`32`	`CbUsePrivateKey.IsChecked = true;`
	`33`	`+ privateKey = true;`
	`34`	`+`
`31`	`35`	`}`
	`36`	`+`
	`37`	`+ CbUsePrivateKey.IsChecked = privateKey;`
`32`	`38`	`}`
`33`		`- };`
	`39`	`+ };`
`34`	`40`	`}`
`35`	`41`
`36`	`42`	`private void ButtonOpenPrivateKey_OnClick(object sender, RoutedEventArgs e)`