Skip to content

Commit 77ab1f2

Browse files
committed
fix: remove all v2 API refs from config_cmd, mode, main
1 parent 271d555 commit 77ab1f2

3 files changed

Lines changed: 9 additions & 63 deletions

File tree

crates/cicada-client/src-tauri/src/commands/config_cmd.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
use crate::autostart;
22
use cicada_core::config::{load_config, save_config, AppConfig};
3-
use tauri::{Emitter, Manager};
43

54
#[tauri::command]
65
pub fn get_config() -> AppConfig {
76
load_config()
87
}
98

109
#[tauri::command]
11-
pub fn update_config(config: AppConfig, app: tauri::AppHandle) -> AppConfig {
10+
pub fn update_config(config: AppConfig) -> AppConfig {
1211
save_config(&config);
13-
1412
if config.behavior.auto_start {
1513
let _ = autostart::enable_autostart();
1614
} else {
1715
let _ = autostart::disable_autostart();
1816
}
19-
20-
if let Some(window) = app.get_webview_window("main") {
21-
let _ = window.set_always_on_top(config.behavior.floating_topmost);
22-
}
23-
24-
let _ = app.emit("config-updated", &config);
2517
config
2618
}
2719

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use cicada_core::config;
2-
use tauri::Emitter;
32

43
#[derive(serde::Serialize, Clone)]
54
pub enum AppMode {
@@ -8,22 +7,17 @@ pub enum AppMode {
87
}
98

109
#[tauri::command]
11-
pub fn set_mode(mode: String, app: tauri::AppHandle) -> Result<String, String> {
12-
let valid_modes = ["display", "admin"];
13-
if !valid_modes.contains(&mode.as_str()) {
14-
return Err(format!("Invalid mode: {}. Valid: display, admin", mode));
10+
pub fn set_mode(mode: String) -> Result<String, String> {
11+
if !["display", "admin"].contains(&mode.as_str()) {
12+
return Err(format!("Invalid mode: {}", mode));
1513
}
16-
1714
config::update_config(|c| {
1815
c.behavior.default_mode = mode.clone();
1916
});
20-
21-
let _ = app.emit("mode-changed", &mode);
2217
Ok(mode)
2318
}
2419

2520
#[tauri::command]
2621
pub fn get_mode() -> String {
27-
let config = config::load_config();
28-
config.behavior.default_mode
22+
config::load_config().behavior.default_mode
2923
}

crates/cicada-client/src-tauri/src/main.rs

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use cicada_core::auth::oauth::OAuthClient;
22
use cicada_core::auth::MemoryStorage;
3-
use cicada_core::config::{self};
3+
use cicada_core::config;
44
use commands::auth::AuthState;
5-
use tauri::{Emitter, Manager};
5+
use tauri::Manager;
66

77
mod autostart;
88
mod commands;
@@ -13,10 +13,6 @@ mod windows;
1313
fn main() {
1414
let config = config::load_config();
1515

16-
if config.behavior.auto_start && !autostart::is_autostart_enabled() {
17-
let _ = autostart::enable_autostart();
18-
}
19-
2016
let oauth_client = OAuthClient::new(
2117
config.connection.client_id.clone(),
2218
"https://appwrite.sectl.cn".to_string(),
@@ -30,10 +26,7 @@ fn main() {
3026
};
3127

3228
tauri::Builder::default()
33-
.plugin(tauri_plugin_shell::init())
34-
.plugin(tauri_plugin_process::init())
3529
.manage(auth_state)
36-
.manage(config.clone())
3730
.invoke_handler(tauri::generate_handler![
3831
commands::auth::start_login,
3932
commands::auth::complete_login,
@@ -48,41 +41,8 @@ fn main() {
4841
commands::mode::get_mode,
4942
commands::build_info::get_build_info,
5043
])
51-
.setup(move |app| {
52-
let window = app
53-
.get_webview_window("main")
54-
.expect("main window not found");
55-
56-
let ds = &config.display;
57-
if ds.window_width > 0 && ds.window_height > 0 {
58-
let _ = window.set_size(tauri::Size::Logical(tauri::LogicalSize {
59-
width: ds.window_width as f64,
60-
height: ds.window_height as f64,
61-
}));
62-
}
63-
64-
if ds.window_position_x >= 0 && ds.window_position_y >= 0 {
65-
let _ = window.set_position(tauri::Position::Logical(tauri::LogicalPosition {
66-
x: ds.window_position_x as f64,
67-
y: ds.window_position_y as f64,
68-
}));
69-
}
70-
71-
let _ = window.set_always_on_top(config.behavior.floating_topmost);
72-
73-
if config.behavior.start_minimized {
74-
let _ = window.hide();
75-
} else {
76-
let _ = window.show();
77-
}
78-
79-
let default_mode = config.behavior.default_mode.clone();
80-
if !default_mode.is_empty() {
81-
let _ = window.emit("mode-changed", &default_mode);
82-
}
83-
84-
let _ = tray::build(app.handle())?;
85-
44+
.setup(|app| {
45+
let _window = app.get_window("main").expect("main window not found");
8646
Ok(())
8747
})
8848
.run(tauri::generate_context!())

0 commit comments

Comments
 (0)