refactor: mode manage on tray

This commit is contained in:
GyDi
2022-07-13 02:26:54 +08:00
parent fcf570e96e
commit 6a51e93ded
4 changed files with 79 additions and 120 deletions

View File

@@ -16,9 +16,6 @@ pub struct ClashInfo {
/// clash secret
pub secret: Option<String>,
/// mode
pub mode: Option<String>,
}
impl ClashInfo {
@@ -29,7 +26,6 @@ impl ClashInfo {
let key_port_2 = Value::from("mixed-port");
let key_server = Value::from("external-controller");
let key_secret = Value::from("secret");
let key_mode = Value::from("mode");
let port = match config.get(&key_port_1) {
Some(value) => match value {
@@ -76,20 +72,11 @@ impl ClashInfo {
_ => None,
};
let mode = match config.get(&key_mode) {
Some(value) => match value {
Value::String(val_str) => Some(val_str.clone()),
_ => None,
},
_ => None,
};
ClashInfo {
status: "init".into(),
port,
server,
secret,
mode,
}
}
}