Add 'Auto Check Update' config to control whether to check for updates on start

This commit is contained in:
tk103331
2023-01-04 13:10:46 +08:00
parent c19698bc41
commit a7cd73b314
6 changed files with 38 additions and 13 deletions

View File

@@ -194,15 +194,7 @@ pub fn menu_handler(event: WindowMenuEvent<tauri::Wry>) {
);
}
"check_update" => {
tauri::async_runtime::spawn(async move {
let result = app.updater().check().await;
let update_resp = result.unwrap();
if update_resp.is_update_available() {
tauri::async_runtime::spawn(async move {
utils::prompt_for_install(app, update_resp).await.unwrap();
});
}
});
utils::run_check_update(app).unwrap();
}
// Preferences
"control_center" => window::control_window(&app),

View File

@@ -1,6 +1,7 @@
use std::borrow::Borrow;
use crate::{app::window, conf::ChatConfJson, utils};
use log::info;
use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager};
use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, GlobalShortcutManager, Manager, AppHandle, Wry};
use wry::application::accelerator::Accelerator;
pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>> {
@@ -89,6 +90,11 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box<dyn std::error::Error>
.unwrap();
});
}
// auto_check_update
if chat_conf.auto_check_update {
let app = app.handle();
utils::run_check_update(app).unwrap();
}
Ok(())
}

View File

@@ -18,6 +18,7 @@ pub const GITHUB_PROMPTS_CSV_URL: &str =
"https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv";
pub const DEFAULT_CHAT_CONF: &str = r#"{
"stay_on_top": false,
"auto_check_update": true,
"theme": "Light",
"titlebar": true,
"global_shortcut": "",
@@ -29,6 +30,7 @@ pub const DEFAULT_CHAT_CONF: &str = r#"{
}"#;
pub const DEFAULT_CHAT_CONF_MAC: &str = r#"{
"stay_on_top": false,
"auto_check_update": true,
"theme": "Light",
"titlebar": false,
"global_shortcut": "",
@@ -60,6 +62,7 @@ pub struct ChatConfJson {
// macOS and Windows
pub theme: String,
pub auto_check_update: bool,
pub stay_on_top: bool,
pub default_origin: String,
pub origin: String,

View File

@@ -10,7 +10,6 @@ use std::{
};
use tauri::{utils::config::Config, Manager, AppHandle, Wry};
use tauri::updater::UpdateResponse;
pub fn chat_root() -> PathBuf {
tauri::api::path::home_dir().unwrap().join(".chatgpt")
}
@@ -129,6 +128,20 @@ pub async fn get_data(
Ok(None)
}
}
pub fn run_check_update(app: AppHandle<Wry>) -> Result<()> {
tauri::async_runtime::spawn(async move {
let result = app.updater().check().await;
let update_resp = result.unwrap();
if update_resp.is_update_available() {
tauri::async_runtime::spawn(async move {
prompt_for_install(app, update_resp).await.unwrap();
});
}
});
Ok(())
}
// Copy private api in tauri/updater/mod.rs. TODO: refactor to public api
// Prompt a dialog asking if the user want to install the new version
// Maybe we should add an option to customize it in future versions.