From e397e2c4c45cf0627ff08e9ecdd374380cfac14e Mon Sep 17 00:00:00 2001
From: tiny-craft <137850705+tiny-craft@users.noreply.github.com>
Date: Sun, 17 Sep 2023 01:15:55 +0800
Subject: [PATCH] fix: corrected update-checking logic

---
 .gitignore                              |  1 +
 backend/services/preferences_service.go | 14 ++++++--------
 frontend/src/AppContent.vue             |  2 +-
 frontend/src/langs/en.json              |  2 +-
 frontend/src/langs/zh-cn.json           |  2 +-
 frontend/src/stores/preferences.js      |  7 ++++---
 frontend/src/styles/style.scss          |  7 ++++++-
 main.go                                 |  1 +
 8 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index a870df5..f44b591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@ build/bin
 node_modules
 frontend/dist
 frontend/wailsjs
+design/
 .vscode
 .idea
diff --git a/backend/services/preferences_service.go b/backend/services/preferences_service.go
index 70ce3b6..0ef74d5 100644
--- a/backend/services/preferences_service.go
+++ b/backend/services/preferences_service.go
@@ -3,7 +3,6 @@ package services
 import (
 	"encoding/json"
 	"github.com/adrg/sysfont"
-	"io"
 	"net/http"
 	"sort"
 	"strings"
@@ -87,7 +86,11 @@ func (p *preferencesService) GetFontList() (resp types.JSResp) {
 }
 
 func (p *preferencesService) SetClientVersion(ver string) {
-	p.clientVersion = ver
+	if !strings.HasPrefix(ver, "v") {
+		p.clientVersion = "v" + ver
+	} else {
+		p.clientVersion = ver
+	}
 }
 
 type latestRelease struct {
@@ -105,13 +108,8 @@ func (p *preferencesService) CheckForUpdate() (resp types.JSResp) {
 		return
 	}
 
-	body, err := io.ReadAll(res.Body)
-	if err != nil {
-		resp.Msg = "invalid content"
-		return
-	}
 	var respObj latestRelease
-	err = json.Unmarshal(body, &respObj)
+	err = json.NewDecoder(res.Body).Decode(&respObj)
 	if err != nil {
 		resp.Msg = "invalid content"
 		return
diff --git a/frontend/src/AppContent.vue b/frontend/src/AppContent.vue
index 7e9652d..676e197 100644
--- a/frontend/src/AppContent.vue
+++ b/frontend/src/AppContent.vue
@@ -81,7 +81,7 @@ watch(
     <n-spin
         :show="props.loading"
         :theme-overrides="{ opacitySpinning: 0 }"
-        style="--wails-draggable: drag; border-radius: 10px"
+        style="border-radius: 10px"
         :style="{ backgroundColor: themeVars.bodyColor }">
         <div
             id="app-content-wrapper"
diff --git a/frontend/src/langs/en.json b/frontend/src/langs/en.json
index 335c877..4caf30c 100644
--- a/frontend/src/langs/en.json
+++ b/frontend/src/langs/en.json
@@ -175,7 +175,7 @@
       "title": "Set Key TTL"
     },
     "upgrade": {
-      "new_version_tip": "A new version is available. Download now?",
+      "new_version_tip": "A new version({ver}) is available. Download now?",
       "no_update": "You're update to date"
     }
   },
diff --git a/frontend/src/langs/zh-cn.json b/frontend/src/langs/zh-cn.json
index 575e4fd..beddec3 100644
--- a/frontend/src/langs/zh-cn.json
+++ b/frontend/src/langs/zh-cn.json
@@ -176,7 +176,7 @@
       "title": "设置键存活时间"
     },
     "upgrade":{
-      "new_version_tip": "有可用的新版本，是否立即下载",
+      "new_version_tip": "有可用的新版本（{ver}），是否立即下载",
       "no_update": "当前已是最新版"
     }
   },
diff --git a/frontend/src/stores/preferences.js b/frontend/src/stores/preferences.js
index a29c4a4..2e19e64 100644
--- a/frontend/src/stores/preferences.js
+++ b/frontend/src/stores/preferences.js
@@ -250,9 +250,10 @@ const usePreferencesStore = defineStore('preferences', {
             try {
                 const { success, data = {} } = await CheckForUpdate()
                 if (success) {
-                    const { version, latest, pageUrl } = data
-                    if (latest > version) {
-                        $dialog.warning(i18nGlobal.t('dialogue.upgrade.new_version_tip'), () => {
+                    const { version = 'v1.0.0', latest, page_url: pageUrl } = data
+                    if (latest > version && !isEmpty(pageUrl)) {
+                        const tip = i18nGlobal.t('dialogue.upgrade.new_version_tip', { ver: version })
+                        $dialog.warning(tip, () => {
                             BrowserOpenURL(pageUrl)
                         })
                         return
diff --git a/frontend/src/styles/style.scss b/frontend/src/styles/style.scss
index 43c4356..cc3abfc 100644
--- a/frontend/src/styles/style.scss
+++ b/frontend/src/styles/style.scss
@@ -21,7 +21,8 @@ body {
   padding: 0;
   background-color: #0000;
   line-height: 1.5;
-  font-family: v-sans, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"
+  font-family: v-sans, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  --wails-draggable: drag;
 }
 
 #app {
@@ -118,3 +119,7 @@ body {
     //border-top: v-bind('themeVars.borderColor') 1px solid;
   }
 }
+
+.n-dialog {
+  --wails-draggable: drag;
+}
diff --git a/main.go b/main.go
index a4204a1..2f25343 100644
--- a/main.go
+++ b/main.go
@@ -27,6 +27,7 @@ func main() {
 	app := NewApp()
 	connSvc := services.Connection()
 	prefSvc := services.Preferences()
+	prefSvc.SetClientVersion(version)
 
 	// menu
 	appMenu := menu.NewMenu()