Merge pull request #71 from lencx/dev

README-ZH_CN.md

@@ -22,9 +22,9 @@
 
 **最新版:**
 
-- `Mac`: [ChatGPT_0.6.5_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.6.5/ChatGPT_0.6.5_x64.dmg)
-- `Linux`: [chat-gpt_0.6.5_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.6.5/chat-gpt_0.6.5_amd64.deb)
-- `Windows`: [ChatGPT_0.6.5_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.6.5/ChatGPT_0.6.5_x64_en-US.msi)
+- `Mac`: [ChatGPT_0.6.6_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.6.6/ChatGPT_0.6.6_x64.dmg)
+- `Linux`: [chat-gpt_0.6.6_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.6.6/chat-gpt_0.6.6_amd64.deb)
+- `Windows`: [ChatGPT_0.6.6_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.6.6/ChatGPT_0.6.6_x64_en-US.msi)
 
 [其他版本...](https://github.com/lencx/ChatGPT/releases)
 

README.md

@@ -24,9 +24,9 @@
 
 **Latest:**
 
-- `Mac`: [ChatGPT_0.6.5_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.6.5/ChatGPT_0.6.5_x64.dmg)
-- `Linux`: [chat-gpt_0.6.5_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.6.5/chat-gpt_0.6.5_amd64.deb)
-- `Windows`: [ChatGPT_0.6.5_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.6.5/ChatGPT_0.6.5_x64_en-US.msi)
+- `Mac`: [ChatGPT_0.6.6_x64.dmg](https://github.com/lencx/ChatGPT/releases/download/v0.6.6/ChatGPT_0.6.6_x64.dmg)
+- `Linux`: [chat-gpt_0.6.6_amd64.deb](https://github.com/lencx/ChatGPT/releases/download/v0.6.6/chat-gpt_0.6.6_amd64.deb)
+- `Windows`: [ChatGPT_0.6.6_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.6.6/ChatGPT_0.6.6_x64_en-US.msi)
 
 [Other version...](https://github.com/lencx/ChatGPT/releases)
 

UPDATE_LOG.md

@@ -1,6 +1,6 @@
 # UPDATE LOG
 
-## v0.6.5
+## v0.6.6
 
 fix: unable to synchronize
 

src-tauri/src/app/cmd.rs

@@ -1,4 +1,4 @@
-use crate::{conf::ChatConfJson, utils};
+use crate::{conf::ChatConfJson, utils::{self, exists}};
 use std::{collections::HashMap, fs, path::PathBuf};
 use tauri::{api, command, AppHandle, Manager};
 
@@ -151,6 +151,13 @@ pub fn sync_prompts(app: AppHandle, data: String, time: u64) {
     let model_cmd = chat_root().join("chat.model.cmd.json");
     let chatgpt_prompts = chat_root().join("cache_model").join("chatgpt_prompts.json");
 
+    if !exists(&model) {
+        fs::write(&model, serde_json::json!({
+            "name": "ChatGPT Model",
+            "link": "https://github.com/lencx/ChatGPT"
+        }).to_string()).unwrap();
+    }
+
     // chatgpt_prompts.json
     fs::write(
         chatgpt_prompts,

src-tauri/src/app/setup.rs

@@ -5,11 +5,11 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
     let chat_conf = ChatConfJson::get_chat_conf();
     let url = chat_conf.origin.to_string();
     let theme = ChatConfJson::theme();
-    // let handle = app.app_handle();
+    let handle = app.app_handle();
 
-    // std::thread::spawn(move || {
-    //     window::tray_window(&handle);
-    // });
+    std::thread::spawn(move || {
+        window::tray_window(&handle);
+    });
 
     if chat_conf.hide_dock_icon {
         #[cfg(target_os = "macos")]

src-tauri/src/app/window.rs

@@ -34,7 +34,7 @@ pub fn control_window(handle: &tauri::AppHandle) {
     std::thread::spawn(move || {
         WindowBuilder::new(&app, "main", WindowUrl::App("index.html".into()))
             .title("ChatGPT")
-            .resizable(false)
+            .resizable(true)
             .fullscreen(false)
             .inner_size(800.0, 600.0)
             .min_inner_size(800.0, 600.0)

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "ChatGPT",
-    "version": "0.6.5"
+    "version": "0.6.6"
   },
   "tauri": {
     "allowlist": {
@@ -22,7 +22,9 @@
       "fs": {
         "all": true,
         "scope": [
-          "*"
+          "*",
+          "$HOME/.chatgpt/*",
+          "$HOME/.chatgpt/cache_sync/*"
         ]
       }
     },

src/main.scss

@@ -45,6 +45,12 @@ html, body {
   }
 }
 
+.chat-table-tip {
+  > span {
+    line-height: 16px;
+  }
+}
+
 .chat-sync-path {
   font-size: 12px;
   font-weight: 500;
@@ -52,6 +58,14 @@ html, body {
   margin-bottom: 5px;
   line-height: 16px;
 
+  > div {
+    max-width: 400px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #2a2a2a;
+  }
+
   span {
     display: inline-block;
     // background-color: #d8d8d8;