lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 优化代码逻辑

Browse Source 
1. 避免使用 `clone`
2. 在获取配置失败时给予默认值
This commit is contained in:
Bryan Lee
2022-10-27 10:22:06 +08:00
parent 91fc9fe6e8
commit 946b0e554c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src-tauri/src/main.rs
View File

@@ -1,4 +1,3 @@
use std::fs::File;
use tauri_utils::config::{Config, WindowConfig}; use tauri_utils::config::{Config, WindowConfig};
fn main() -> wry::Result<()> { fn main() -> wry::Result<()> {
@@ -45,7 +44,7 @@ fn main() -> wry::Result<()> {
transparent, transparent,
fullscreen, fullscreen,
.. ..
} = get_windows_config(); } = get_windows_config().unwrap_or(WindowConfig::default());
let event_loop = EventLoop::new(); let event_loop = EventLoop::new();
let window = WindowBuilder::new() let window = WindowBuilder::new()
.with_resizable(resizable) .with_resizable(resizable)
@@ -107,9 +106,9 @@ fn main() -> wry::Result<()> {
}); });
} }
fn get_windows_config() -> WindowConfig { fn get_windows_config() -> Option<WindowConfig> {
let config_file = include_str!("../tauri.conf.json"); let config_file = include_str!("../tauri.conf.json");
let config: Config = serde_json::from_str(config_file).expect("failed to parse windows config"); let config: Config = serde_json::from_str(config_file).expect("failed to parse windows config");
config.tauri.windows[0].clone() config.tauri.windows.iter().next().cloned()
} }