improve version comparison

josStorer · Dec 13, 2024 · 068a70b · 068a70b
1 parent c22e4c5
commit 068a70b
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 2 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -16,6 +16,7 @@
     "abcjs": "^6.2.3",
     "chart.js": "^4.3.0",
     "classnames": "^2.3.2",
+    "compare-versions": "^6.1.1",
     "file-saver": "^2.0.5",
     "html-midi-player": "^1.5.0",
     "i18next": "^22.4.15",

diff --git a/frontend/src/startup.ts b/frontend/src/startup.ts
@@ -1,3 +1,4 @@
+import { compare } from 'compare-versions'
 import { t } from 'i18next'
 import { throttle } from 'lodash-es'
 import { toast } from 'react-toastify'
@@ -72,7 +73,7 @@ async function initRemoteText() {
   )
     .then((r) => r.json())
     .then((data) => {
-      if (data.version >= manifest.version) {
+      if (compare(data.version, manifest.version, '>=')) {
         if (data.introduction) commonStore.setIntroduction(data.introduction)
         if (data.about) commonStore.setAbout(data.about)
       }

diff --git a/frontend/src/utils/index.tsx b/frontend/src/utils/index.tsx
@@ -1,4 +1,5 @@
 import { Button } from '@fluentui/react-components'
+import { compare } from 'compare-versions'
 import { t } from 'i18next'
 import { findLastIndex, throttle } from 'lodash-es'
 import { NavigateFunction } from 'react-router'
@@ -468,7 +469,7 @@ export async function checkUpdate(notifyEvenLatest: boolean = false) {
         r.json().then((data) => {
           if (data.tag_name) {
             const versionTag = data.tag_name
-            if (versionTag.replace('v', '') > manifest.version) {
+            if (compare(versionTag.replace('v', ''), manifest.version, '>')) {
               const verifyUrl = !commonStore.settings.giteeUpdatesSource
                 ? `https://api.github.com/repos/josstorer/RWKV-Runner/releases/tags/${versionTag}`
                 : `https://gitee.com/api/v5/repos/josc146/RWKV-Runner/releases/tags/${versionTag}`

diff --git a/frontend/wailsjs/runtime/runtime.d.ts b/frontend/wailsjs/runtime/runtime.d.ts
diff --git a/frontend/wailsjs/runtime/runtime.js b/frontend/wailsjs/runtime/runtime.js