hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try to fix https://github.com/rustdesk/rustdesk-server-pro/issues/266

Browse Source
This commit is contained in:
rustdesk 2024-06-11 19:51:11 +08:00
parent 35fb9f8897
commit cd3db3a686
1 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libs/hbb_common/src/config.rs
View File

@ -912,7 +912,7 @@ impl Config {
#[inline] #[inline]
fn purify_options(v: &mut HashMap<String, String>) { fn purify_options(v: &mut HashMap<String, String>) {
v.retain(|k, _| is_option_can_save(&OVERWRITE_SETTINGS, k)); v.retain(|k, v| is_option_can_save(&OVERWRITE_SETTINGS, k, &DEFAULT_SETTINGS, v));
} }
pub fn set_options(mut v: HashMap<String, String>) { pub fn set_options(mut v: HashMap<String, String>) {
@ -936,7 +936,7 @@ impl Config {
} }
pub fn set_option(k: String, v: String) { pub fn set_option(k: String, v: String) {
if !is_option_can_save(&OVERWRITE_SETTINGS, &k) { if !is_option_can_save(&OVERWRITE_SETTINGS, &k, &DEFAULT_SETTINGS, &v) {
return; return;
} }
let mut config = CONFIG2.write().unwrap(); let mut config = CONFIG2.write().unwrap();
@ -1449,7 +1449,7 @@ impl LocalConfig {
} }
pub fn set_option(k: String, v: String) { pub fn set_option(k: String, v: String) {
if !is_option_can_save(&OVERWRITE_LOCAL_SETTINGS, &k) { if !is_option_can_save(&OVERWRITE_LOCAL_SETTINGS, &k, &DEFAULT_LOCAL_SETTINGS, &v) {
return; return;
} }
let mut config = LOCAL_CONFIG.write().unwrap(); let mut config = LOCAL_CONFIG.write().unwrap();
@ -1636,7 +1636,12 @@ impl UserDefaultConfig {
} }
pub fn set(&mut self, key: String, value: String) { pub fn set(&mut self, key: String, value: String) {
if !is_option_can_save(&OVERWRITE_DISPLAY_SETTINGS, &key) { if !is_option_can_save(
&OVERWRITE_DISPLAY_SETTINGS,
&key,
&DEFAULT_DISPLAY_SETTINGS,
&value,
) {
return; return;
} }
if value.is_empty() { if value.is_empty() {
@ -1959,8 +1964,15 @@ fn get_or(
} }
#[inline] #[inline]
fn is_option_can_save(overwrite: &RwLock<HashMap<String, String>>, k: &str) -> bool { fn is_option_can_save(
if overwrite.read().unwrap().contains_key(k) { overwrite: &RwLock<HashMap<String, String>>,
k: &str,
defaults: &RwLock<HashMap<String, String>>,
v: &str,
) -> bool {
if overwrite.read().unwrap().contains_key(k)
|| defaults.read().unwrap().get(k).map_or(false, |x| x == v)
{
return false; return false;
} }
true true
@ -2100,6 +2112,11 @@ pub mod keys {
pub const OPTION_ALLOW_LINUX_HEADLESS: &str = "allow-linux-headless"; pub const OPTION_ALLOW_LINUX_HEADLESS: &str = "allow-linux-headless";
pub const OPTION_ENABLE_HWCODEC: &str = "enable-hwcodec"; pub const OPTION_ENABLE_HWCODEC: &str = "enable-hwcodec";
pub const OPTION_APPROVE_MODE: &str = "approve-mode"; pub const OPTION_APPROVE_MODE: &str = "approve-mode";
pub const OPTION_CUSTOM_RENDEZVOUS_SERVER: &str = "custom-rendezvous-server";
pub const OPTION_API_SERVER: &str = "api-server";
pub const OPTION_KEY: &str = "key";
pub const OPTION_PRESET_ADDRESS_BOOK_NAME: &str = "preset-address-book-name";
pub const OPTION_PRESET_ADDRESS_BOOK_TAG: &str = "preset-address-book-tag";
// flutter local options // flutter local options
pub const OPTION_FLUTTER_REMOTE_MENUBAR_STATE: &str = "remoteMenubarState"; pub const OPTION_FLUTTER_REMOTE_MENUBAR_STATE: &str = "remoteMenubarState";
@ -2117,6 +2134,9 @@ pub mod keys {
pub const OPTION_FLOATING_WINDOW_TRANSPARENCY: &str = "floating-window-transparency"; pub const OPTION_FLOATING_WINDOW_TRANSPARENCY: &str = "floating-window-transparency";
pub const OPTION_FLOATING_WINDOW_SVG: &str = "floating-window-svg"; pub const OPTION_FLOATING_WINDOW_SVG: &str = "floating-window-svg";
pub const OPTION_DISABLE_GROUP_PANEL: &str = "disable-group-panel";
pub const OPTION_PRE_ELEVATE_SERVICE: &str = "pre-elevate-service";
// proxy settings // proxy settings
// The following options are not real keys, they are just used for custom client advanced settings. // The following options are not real keys, they are just used for custom client advanced settings.
// The real keys are in Config2::socks. // The real keys are in Config2::socks.
@ -2177,6 +2197,8 @@ pub mod keys {
OPTION_FLOATING_WINDOW_UNTOUCHABLE, OPTION_FLOATING_WINDOW_UNTOUCHABLE,
OPTION_FLOATING_WINDOW_TRANSPARENCY, OPTION_FLOATING_WINDOW_TRANSPARENCY,
OPTION_FLOATING_WINDOW_SVG, OPTION_FLOATING_WINDOW_SVG,
OPTION_DISABLE_GROUP_PANEL,
OPTION_PRE_ELEVATE_SERVICE,
]; ];
// DEFAULT_SETTINGS, OVERWRITE_SETTINGS // DEFAULT_SETTINGS, OVERWRITE_SETTINGS
pub const KEYS_SETTINGS: &[&str] = &[ pub const KEYS_SETTINGS: &[&str] = &[
@ -2208,6 +2230,11 @@ pub mod keys {
OPTION_PROXY_URL, OPTION_PROXY_URL,
OPTION_PROXY_USERNAME, OPTION_PROXY_USERNAME,
OPTION_PROXY_PASSWORD, OPTION_PROXY_PASSWORD,
OPTION_CUSTOM_RENDEZVOUS_SERVER,
OPTION_API_SERVER,
OPTION_KEY,
OPTION_PRESET_ADDRESS_BOOK_NAME,
OPTION_PRESET_ADDRESS_BOOK_TAG,
]; ];
} }
@ -2283,7 +2310,18 @@ mod tests {
res.insert("c".to_owned(), "d".to_string()); res.insert("c".to_owned(), "d".to_string());
res.insert("d".to_owned(), "cc".to_string()); res.insert("d".to_owned(), "cc".to_string());
Config::purify_options(&mut res); Config::purify_options(&mut res);
DEFAULT_SETTINGS
.write()
.unwrap()
.insert("f".to_string(), "c".to_string());
Config::purify_options(&mut res);
assert!(res.len() == 2); assert!(res.len() == 2);
DEFAULT_SETTINGS
.write()
.unwrap()
.insert("f".to_string(), "a".to_string());
Config::purify_options(&mut res);
assert!(res.len() == 1);
let res = Config::get_options(); let res = Config::get_options();
assert!(res["a"] == "b"); assert!(res["a"] == "b");
assert!(res["c"] == "f"); assert!(res["c"] == "f");