From 5d5879711e991e53be82e98b0041c8f1333e5de8 Mon Sep 17 00:00:00 2001
From: mozzie <himozzie@foxmail.com>
Date: Wed, 14 Aug 2024 13:18:16 +0800
Subject: [PATCH] feat: update

---
 electron-builder.yml     |  2 +-
 package.json             |  7 ++++---
 pnpm-lock.yaml           | 14 +++++++++++---
 src/main/index.ts        |  1 -
 src/main/updater.ts      |  5 ++---
 src/renderer/src/App.tsx | 20 +++-----------------
 6 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/electron-builder.yml b/electron-builder.yml
index 6d73e94..5c9bf37 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -1,4 +1,4 @@
-appId: com.electron.app
+appId: com.tavi.app
 productName: cvpilot-desktop
 directories:
   buildResources: build
diff --git a/package.json b/package.json
index c5812ae..b1a5197 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvpilot-desktop",
-  "version": "1.0.6",
+  "version": "1.0.5",
   "description": "An Electron application with React and TypeScript",
   "main": "./out/main/index.js",
   "author": "example.com",
@@ -24,8 +24,7 @@
     "@electron-toolkit/preload": "^3.0.1",
     "@electron-toolkit/utils": "^3.0.0",
     "electron-updater": "^6.1.7",
-    "knex": "^3.1.0",
-    "sqlite3": "^5.1.7"
+    "knex": "^3.1.0"
   },
   "devDependencies": {
     "@electron-toolkit/eslint-config-prettier": "^2.0.0",
@@ -43,6 +42,8 @@
     "prettier": "^3.3.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "sqlite": "^5.1.1",
+    "sqlite3": "^5.1.7",
     "typescript": "^5.5.2",
     "vite": "^5.3.1"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7b66c3f..3444a31 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,9 +20,6 @@ importers:
       knex:
         specifier: ^3.1.0
         version: 3.1.0(sqlite3@5.1.7)
-      sqlite3:
-        specifier: ^5.1.7
-        version: 5.1.7
     devDependencies:
       '@electron-toolkit/eslint-config-prettier':
         specifier: ^2.0.0
@@ -69,6 +66,12 @@ importers:
       react-dom:
         specifier: ^18.3.1
         version: 18.3.1(react@18.3.1)
+      sqlite:
+        specifier: ^5.1.1
+        version: 5.1.1
+      sqlite3:
+        specifier: ^5.1.7
+        version: 5.1.7
       typescript:
         specifier: ^5.5.2
         version: 5.5.4
@@ -2338,6 +2341,9 @@ packages:
   sqlite3@5.1.7:
     resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
 
+  sqlite@5.1.1:
+    resolution: {integrity: sha512-oBkezXa2hnkfuJwUo44Hl9hS3er+YFtueifoajrgidvqsJRQFpc5fKoAkAor1O5ZnLoa28GBScfHXs8j0K358Q==}
+
   ssri@8.0.1:
     resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}
     engines: {node: '>= 8'}
@@ -5268,6 +5274,8 @@ snapshots:
       - bluebird
       - supports-color
 
+  sqlite@5.1.1: {}
+
   ssri@8.0.1:
     dependencies:
       minipass: 3.3.6
diff --git a/src/main/index.ts b/src/main/index.ts
index bc5b689..f7f40c1 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -3,7 +3,6 @@ import { join } from 'path'
 import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 import icon from '../../resources/icon.png?asset'
 import { setupIpcHandle } from './ipc'
-// import './sqlite3'
 import { setupAutoUpdater } from './updater'
 
 function createWindow(): void {
diff --git a/src/main/updater.ts b/src/main/updater.ts
index 0c0b34a..14e7303 100644
--- a/src/main/updater.ts
+++ b/src/main/updater.ts
@@ -36,9 +36,8 @@ export const setupAutoUpdater = (win: BrowserWindow) => {
 
   autoUpdater.on('download-progress', (progress) => {
     console.log('下载进度download-progress')
-    const { bytesPerSecond, percent, transferred, total } = progress
-    console.log(bytesPerSecond, transferred, total)
-    win.webContents.send('update-progress', percent)
+    console.log(progress)
+    win.webContents.send('update-progress', progress)
   })
 
   autoUpdater.on('error', (error) => {
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 791de6e..5718104 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -6,14 +6,6 @@ function App(): JSX.Element {
   const updateHandle = () => window.api.checkUpdate()
   const [percent, setPercent] = useState()
 
-  useEffect(() => {
-    window.electron.ipcRenderer.on('update-ready', (e, data) => {
-      console.log(data)
-      const response = confirm('新版本已下载，是否重启应用来安装更新？')
-      if (response) window.api.quitInstall()
-    })
-  }, [])
-
   useEffect(() => {
     window.electron.ipcRenderer.on('update-error', (e, data) => {
       // console.log(e)
@@ -21,23 +13,17 @@ function App(): JSX.Element {
     })
   }, [])
 
-  useEffect(() => {
-    window.electron.ipcRenderer.on('update-not-available', (e, data) => {
-      console.log(data)
-    })
-  }, [])
-
   useEffect(() => {
     window.electron.ipcRenderer.on('update-progress', (e, data) => {
-      setPercent(percent)
+      setPercent(data.percent)
     })
   }, [])
 
   return (
     <>
       <img alt="logo" className="logo" src={electronLogo} />
-      <button onClick={updateHandle}>更新1.0.6</button>
-      <div className="creator">{percent}</div>
+      <button onClick={updateHandle}>更新1.0.5</button>
+      <div className="creator">进度{percent}</div>
       <div className="text">
         Build an Electron app with <span className="react">React</span>
         &nbsp;and <span className="ts">TypeScript</span>