feat: copy app & system info (#101)

Synaptrix · Mar 26, 2023 · 000994a · 000994a
1 parent 788d420
commit 000994a
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 21 deletions.
diff --git a/.env b/.env
@@ -1,2 +1 @@
-VITE_CONFIG_PATH=com.ChatGPT-Desktop
-VITE_APP_NAME=ChatGPT
+VITE_CONFIG_PATH=com.ChatGPT-Desktop
diff --git a/index.html b/index.html
@@ -1,14 +1,16 @@
 <!DOCTYPE html>
 <html lang="zh">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>ChatGPT</title>
-  </head>
 
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>ChatGPT-Desktop</title>
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="module" src="/src/main.ts"></script>
+</body>
+
+</html>
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
     "withGlobalTauri": false
   },
   "package": {
-    "productName": "ChatGPT",
+    "productName": "ChatGPT-Desktop",
     "version": "../package.json"
   },
   "tauri": {

diff --git a/src/components/Settings/components/About.vue b/src/components/Settings/components/About.vue
@@ -1,12 +1,37 @@
 <script setup lang="ts">
-import { getVersion } from '@tauri-apps/api/app'
+import { getVersion, getName, getTauriVersion } from '@tauri-apps/api/app'
+import { type, arch, platform, version } from '@tauri-apps/api/os'
+import { writeText } from '@tauri-apps/api/clipboard'
 
-const version = ref('')
+const appInfo = reactive({
+  appName: '',
+  appVersion: '',
+  tauriVersion: '',
+  platform: '',
+  os: '',
+  osVersion: '',
+  arch: ''
+})
 
 const contributors = ref<any[]>([])
 
+const copyInfo = async () => {
+  const info = {
+    ...appInfo,
+    userAgent: navigator.userAgent
+  }
+
+  await writeText(JSON.stringify(info))
+}
+
 onMounted(async () => {
-  version.value = await getVersion()
+  appInfo.appName = await getName()
+  appInfo.appVersion = await getVersion()
+  appInfo.tauriVersion = await getTauriVersion()
+  appInfo.platform = await platform()
+  appInfo.os = await type()
+  appInfo.osVersion = await version()
+  appInfo.arch = await arch()
 
   contributors.value = (await getContributorsApi()) || []
 })
@@ -22,9 +47,9 @@ onMounted(async () => {
           alt="logo"
         />
       </div>
-      <span>ChatGPT-Desktop</span>
-      <span>v{{ version }}</span>
-      <a class="cursor-pointer">复制电脑信息</a>
+      <span>{{ appInfo.appName }}</span>
+      <span>v{{ appInfo.appVersion }}</span>
+      <a class="cursor-pointer" @click="copyInfo">复制电脑信息</a>
       <a href="https://github.com/ChatGPT-Desktop/ChatGPT-Desktop/issues/new">
         BUG 反馈
       </a>

diff --git a/src/utils/saveImage.ts b/src/utils/saveImage.ts
@@ -1,3 +1,4 @@
+import { getName } from '@tauri-apps/api/app'
 import { writeBinaryFile, BaseDirectory } from '@tauri-apps/api/fs'
 import html2canvas from 'html2canvas'
 
@@ -32,10 +33,11 @@ export const saveImage = async (nodeId: string) => {
     const response = await fetch(canvas.toDataURL('image/png'))
     const uint8Array = new Uint8Array(await response.arrayBuffer())
 
+    const appName = await getName()
     // 下载图片到 download 文件夹
     await writeBinaryFile(
       {
-        path: `ChatGPT-Desktop-${Date.now()}.png`,
+        path: `${appName}-${Date.now()}.png`,
         contents: uint8Array
       },
       { dir: BaseDirectory.Download }