增加gui日志,修复config.json无效的问题,修复下载内核失败一直加载的问题

This commit is contained in:
leizi97
2024-11-17 21:52:49 +08:00
parent 2d4a44740a
commit 1813240378
16 changed files with 193 additions and 176 deletions
+1 -1
View File
@@ -1176,7 +1176,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "easytier-game"
version = "1.2.1"
version = "1.2.2"
dependencies = [
"log",
"planif",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.2.1"
version = "1.2.2"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
+4 -1
View File
@@ -92,6 +92,9 @@
"window-state:default",
"window-state:allow-save-window-state",
"window-state:allow-restore-state"
"window-state:allow-restore-state",
"log:default",
"log:allow-log"
]
}
+23 -12
View File
@@ -70,7 +70,10 @@ fn get_core_version() -> String {
let output_str = String::from_utf8_lossy(&output.stdout);
return output_str.trim().to_string();
}
Err(_e) => return "".to_string(),
Err(_e) => {
log::error!("{}", _e.to_string());
return "".to_string();
}
}
}
@@ -176,7 +179,7 @@ async fn download_easytier_zip(download_url: String, file_name: String) {
unzip(path);
match fs::remove_file(path) {
Ok(_) => println!("删除zip文件成功"),
Err(_) => println!("删除zip文件失败"),
Err(_) => log::error!("删除zip文件失败"),
}
}
@@ -263,7 +266,7 @@ fn run_command(
tx.send(line).expect("failed to send line");
}
Err(e) => {
eprintln!("error reading line: {}", e);
log::error!("error reading line: {}", e);
break;
}
}
@@ -392,7 +395,7 @@ fn spawn_autostart(enabled: bool) {
let _ = tx.send(true);
}
Err(e) => {
println!("Error: {}", e);
log::error!("Error: {}", e);
let _ = tx.send(false);
}
});
@@ -444,7 +447,7 @@ fn autostart_is_enabled() -> bool {
return enabled;
}
Err(e) => {
println!("autostart enabled: false -> {}", e);
log::error!("autostart enabled: false -> {}", e);
return false;
}
}
@@ -545,13 +548,21 @@ pub fn run() {
}))
.setup(move |app| {
let args = args.clone();
if cfg!(debug_assertions) {
app.handle().plugin(
tauri_plugin_log::Builder::default()
.level(log::LevelFilter::Info)
.build(),
)?;
}
// if cfg!(debug_assertions) {
let log_path = get_tool_exe_path(String::from("\\easytier\\guiLogs"));
app.handle().plugin(
tauri_plugin_log::Builder::default()
.target(tauri_plugin_log::Target::new(
tauri_plugin_log::TargetKind::Folder {
path: std::path::PathBuf::from(log_path),
file_name: None,
},
))
.max_file_size(50_000 /* bytes */)
.level(log::LevelFilter::Error)
.build(),
)?;
// }
#[cfg(not(target_os = "android"))]
let _tray_menu = TrayIconBuilder::with_id("main")
.menu_on_left_click(false)
+2 -2
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.2.1",
"version": "1.2.2",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -13,7 +13,7 @@
"app": {
"windows": [
{
"title": "easytier-game 1.2.1",
"title": "easytier-game 1.2.2",
"label": "main",
"minWidth": 340,
"width": 340,