chore: Modify manual detection update logic

1943time · Jan 12, 2024 · ae542cf · ae542cf
1 parent 9be4bc3
commit ae542cf
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/main/appMenus.ts b/src/main/appMenus.ts
@@ -30,7 +30,6 @@ const getSystemMenus = () => {
     {
       label: zh ? '检查更新' : 'Check for Updates',
       click: () => {
-        ipcMain.emit('check-updated')
         BrowserWindow.getFocusedWindow()?.webContents.send('check-updated')
       }
     }

diff --git a/src/main/update.ts b/src/main/update.ts
@@ -14,17 +14,11 @@ autoUpdater.autoInstallOnAppQuit = true
 
 export class AppUpdate {
   cancelToken?: CancellationToken
-  manual = false
   get win() {
     return BrowserWindow.getFocusedWindow()
   }
   constructor() {
-    // setTimeout(() => {
-    //   autoUpdater.checkForUpdatesAndNotify()
-    // }, 3000)
-
     ipcMain.handle('check-updated', () => {
-      this.manual = true
       autoUpdater.checkForUpdatesAndNotify()
       return new Promise((resolve, reject) => {
         autoUpdater.once('update-available', resolve)
@@ -51,7 +45,7 @@ export class AppUpdate {
     })
 
     autoUpdater.on('update-not-available', (info) => {
-      this.win?.webContents.send('update-not-available', this.manual)
+      this.win?.webContents.send('update-not-available')
     })
 
     autoUpdater.on('error', (e, message) => {

diff --git a/src/renderer/src/components/Update.tsx b/src/renderer/src/components/Update.tsx
@@ -1,7 +1,7 @@
 import {observer} from 'mobx-react-lite'
 import {Button, Checkbox, Modal, notification, Progress, Space} from 'antd'
 import {useLocalState} from '../hooks/useLocalState'
-import {useCallback, useEffect} from 'react'
+import {useCallback, useEffect, useRef} from 'react'
 import {message$} from '../utils'
 import {configStore} from '../store/config'
 import {openConfirmDialog$} from './ConfirmDialog'
@@ -23,6 +23,7 @@ export const Update = observer(() => {
       zhInfo: [] as string[]
     }
   })
+  const checkTimer = useRef(0)
   const downLoad = useCallback(() => {
     window.open(`https://github.com/1943time/bluestone/releases/latest`)
   }, [])
@@ -49,28 +50,40 @@ export const Update = observer(() => {
       })
       runInAction(() => configStore.enableUpgrade = true)
     } else {
-      setTimeout(check, 60 * 1000 * 60)
+      checkTimer.current = window.setTimeout(check, 60 * 1000 * 60)
     }
+    return !!res.github
   }, [])
 
   const [api, contextHolder] = notification.useNotification()
   useEffect(() => {
     check()
     ipcRenderer.on('check-updated', e => {
       setState({manual: true})
+      clearTimeout(checkTimer.current)
+      check().then((updated) => {
+        if (updated) {
+          runInAction(() => configStore.openUpdateDialog = true)
+        } else {
+          message$.next({
+            type: 'info',
+            content: configStore.zh ? '没有可用的更新' : 'No updates are available'
+          })
+        }
+      })
     })
     ipcRenderer.on('update-progress', (e, data) => {
       const percent = (data.percent as number || 0).toFixed(1)
       setState({percent: +percent})
     })
 
-    ipcRenderer.on('update-not-available', (e, manual) => {
-      if (!manual) return
-      message$.next({
-        type: 'info',
-        content: configStore.zh ? '没有可用的更新' : 'No updates are available'
-      })
-    })
+    // ipcRenderer.on('update-not-available', (e, manual) => {
+    //   if (!manual) return
+    //   message$.next({
+    //     type: 'info',
+    //     content: configStore.zh ? '没有可用的更新' : 'No updates are available'
+    //   })
+    // })
 
     ipcRenderer.on('update-error', (e, err) => {
       console.error('update-error', err)