diff --git a/README-ZH_CN.md b/README-ZH_CN.md index 9fd18d0..ce93c40 100644 --- a/README-ZH_CN.md +++ b/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) diff --git a/README.md b/README.md index 55e7090..a4ed29c 100644 --- a/README.md +++ b/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) diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md index 0a5964c..b89911b 100644 --- a/UPDATE_LOG.md +++ b/UPDATE_LOG.md @@ -1,6 +1,6 @@ # UPDATE LOG -## v0.6.5 +## v0.6.6 fix: unable to synchronize diff --git a/src-tauri/src/app/cmd.rs b/src-tauri/src/app/cmd.rs index d5f624e..1da751b 100644 --- a/src-tauri/src/app/cmd.rs +++ b/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, diff --git a/src-tauri/src/app/setup.rs b/src-tauri/src/app/setup.rs index dffaeef..7d342a4 100644 --- a/src-tauri/src/app/setup.rs +++ b/src-tauri/src/app/setup.rs @@ -5,11 +5,11 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box 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")] diff --git a/src-tauri/src/app/window.rs b/src-tauri/src/app/window.rs index 68aeae1..0ec5a81 100644 --- a/src-tauri/src/app/window.rs +++ b/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) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 860fd87..899cb73 100644 --- a/src-tauri/tauri.conf.json +++ b/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/*" ] } }, diff --git a/src/main.scss b/src/main.scss index 4e5b8c6..96ebea4 100644 --- a/src/main.scss +++ b/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;