From b94f6b9dca4d6b3305f15e70262740c9a1690658 Mon Sep 17 00:00:00 2001
From: xljiulang <366193849@qq.com>
Date: Sun, 20 Jun 2021 16:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=89=88=E6=9C=AC=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E6=AF=94=E8=BE=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FastGithub/FastGithub.csproj       |  2 +-
 FastGithub/VersionHostedService.cs | 80 ++++++++++++++++++++++++------
 2 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/FastGithub/FastGithub.csproj b/FastGithub/FastGithub.csproj
index 90c518d..336d209 100644
--- a/FastGithub/FastGithub.csproj
+++ b/FastGithub/FastGithub.csproj
@@ -4,7 +4,7 @@
 		<OutputType>Exe</OutputType>
 		<Nullable>enable</Nullable>
 		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
-		<Version>1.0.0-rc1</Version>
+		<Version>1.0.0-rc2</Version>
 		<Description>github定制版的dns服务，解析github最优的ip</Description>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<Copyright>https://github.com/xljiulang/FastGithub</Copyright>
diff --git a/FastGithub/VersionHostedService.cs b/FastGithub/VersionHostedService.cs
index 1d2cb81..f303f86 100644
--- a/FastGithub/VersionHostedService.cs
+++ b/FastGithub/VersionHostedService.cs
@@ -6,6 +6,8 @@ using System.Net.Http;
 using System.Net.Http.Json;
 using System.Reflection;
 using System.Text;
+using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -17,6 +19,8 @@ namespace FastGithub
     sealed class VersionHostedService : IHostedService
     {
         private readonly ILogger<VersionHostedService> logger;
+        private const string DownloadPage = "https://gitee.com/jiulang/fast-github/releases";
+        private const string ReleasesUri = "https://gitee.com/api/v5/repos/jiulang/fast-github/releases?page=1&per_page=1&direction=desc";
 
         public VersionHostedService(ILogger<VersionHostedService> logger)
         {
@@ -42,25 +46,28 @@ namespace FastGithub
         {
             try
             {
-                var version = Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+                var version = Assembly
+                    .GetEntryAssembly()?
+                    .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
+                    .InformationalVersion;
+
                 if (version == null)
                 {
                     return;
                 }
 
                 using var httpClient = new HttpClient();
-                var uri = "https://gitee.com/api/v5/repos/jiulang/fast-github/releases?page=1&per_page=1&direction=desc";
-                var results = await httpClient.GetFromJsonAsync<Release[]>(uri, cancellationToken);
-                var release = results?.FirstOrDefault();
-                if (release == null)
+                var releases = await httpClient.GetFromJsonAsync<Release[]>(ReleasesUri, cancellationToken);
+                var lastRelease = releases?.FirstOrDefault();
+                if (lastRelease == null)
                 {
                     return;
                 }
 
-                if (string.Equals(release.tag_name, version.ToString(), StringComparison.OrdinalIgnoreCase) == false)
+                if (VersionCompare(lastRelease.TagName, version) > 0)
                 {
-                    this.logger.LogInformation($"您正在使用{version}版本{Environment.NewLine}请前往https://gitee.com/jiulang/fast-github/releases下载新版本");
-                    this.logger.LogInformation(release.ToString());
+                    this.logger.LogInformation($"您正在使用{version}版本{Environment.NewLine}请前往{DownloadPage}下载新版本");
+                    this.logger.LogInformation(lastRelease.ToString());
                 }
             }
             catch (Exception ex)
@@ -69,24 +76,69 @@ namespace FastGithub
             }
         }
 
+        /// <summary>
+        /// 版本比较
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        private static int VersionCompare(string x, string y)
+        {
+            const string VERSION = @"^\d+\.(\d+.){0,2}\d+";
+            var xVersion = Regex.Match(x, VERSION).Value;
+            var yVersion = Regex.Match(y, VERSION).Value;
+
+            var xSubVersion = x[xVersion.Length..];
+            var ySubVersion = y[yVersion.Length..];
+
+            var value = Version.Parse(xVersion).CompareTo(Version.Parse(yVersion));
+            if (value == 0)
+            {
+                value = SubCompare(xSubVersion, ySubVersion);
+            }
+            return value;
+
+            static int SubCompare(string subX, string subY)
+            {
+                if (subX.Length == 0 && subY.Length == 0)
+                {
+                    return 0;
+                }
+                if (subX.Length == 0)
+                {
+                    return 1;
+                }
+                if (subY.Length == 0)
+                {
+                    return -1;
+                }
+
+                return StringComparer.OrdinalIgnoreCase.Compare(subX, subY);
+            }
+        }
 
         /// <summary>
         /// 发行记录
         /// </summary>
         private class Release
         {
-            public string tag_name { get; set; } = string.Empty;
+            [JsonPropertyName("tag_name")]
+            public string TagName { get; set; } = string.Empty;
 
-            public string body { get; set; } = string.Empty;
 
-            public DateTime created_at { get; set; }
+            [JsonPropertyName("body")]
+            public string Body { get; set; } = string.Empty;
+
+
+            [JsonPropertyName("created_at")]
+            public DateTime CreatedAt { get; set; }
 
             public override string ToString()
             {
                 return new StringBuilder()
-                    .Append("最新版本：").AppendLine(this.tag_name)
-                    .Append("发布时间：").AppendLine(this.created_at.ToString())
-                    .AppendLine("更新内容：").AppendLine(this.body)
+                    .Append("最新版本：").AppendLine(this.TagName)
+                    .Append("发布时间：").AppendLine(this.CreatedAt.ToString())
+                    .AppendLine("更新内容：").AppendLine(this.Body)
                     .ToString();
             }
         }