purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: config file case close #18

Browse Source
This commit is contained in:
GyDi 2022-03-12 21:03:17 +08:00
parent 392ecee3ff
commit c73b354386
No known key found for this signature in database
GPG Key ID: 1C95E0D3467B3084
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src-tauri/src/core/clash.rs
View File

@ -328,7 +328,7 @@ impl Clash {
if let Some(data) = result.data {
// all of these can not be revised by script
// http/https/socks port should be under control
let not_allow: Vec<Value> = vec![
let not_allow = vec![
"port",
"socks-port",
"mixed-port",
@ -337,23 +337,29 @@ impl Clash {
"external-controller",
"secret",
"log-level",
]
.iter()
.map(|&i| Value::from(i))
.collect();
];
for (key, value) in data.into_iter() {
if not_allow.iter().find(|&i| i == &key).is_none() {
config.insert(key, value);
}
key.as_str().map(|key_str| {
// change to lowercase
let mut key_str = String::from(key_str);
key_str.make_ascii_lowercase();
// filter
if !not_allow.contains(&&*key_str) {
config.insert(Value::String(key_str), value);
}
});
}
log::info!("profile enhanced status {}", result.status);
Self::_activate(info, config).unwrap();
}
log::info!("profile enhanced status {}", result.status);
result.error.map(|error| log::error!("{error}"));
if let Some(error) = result.error {
log::error!("{error}");
}
}
});

18
src-tauri/src/core/profiles.rs
View File

@ -566,13 +566,17 @@ impl Profiles {
"rules",
];
valid_keys.iter().for_each(|key| {
let key = Value::String(key.to_string());
if def_config.contains_key(&key) {
let value = def_config[&key].clone();
new_config.insert(key, value);
}
});
for (key, value) in def_config.into_iter() {
key.as_str().map(|key_str| {
// change to lowercase
let mut key_str = String::from(key_str);
key_str.make_ascii_lowercase();
if valid_keys.contains(&&*key_str) {
new_config.insert(Value::String(key_str), value);
}
});
}
return Ok(new_config);
}