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

remove deserializing config option using default config (#7491)

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
Co-authored-by: squarer3 <squalerblack@gmail.com>
This commit is contained in:
21pages 2024-03-23 20:20:12 -07:00 committed by GitHub
parent dd90e84f6a
commit 96e1b5b0f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,7 +317,11 @@ pub struct PeerConfig {
pub custom_resolutions: HashMap<String, Resolution>, pub custom_resolutions: HashMap<String, Resolution>,
// The other scalar value must before this // The other scalar value must before this
#[serde(default, deserialize_with = "PeerConfig::deserialize_options")] #[serde(
default,
deserialize_with = "deserialize_hashmap_string_string",
skip_serializing_if = "HashMap::is_empty"
)]
pub options: HashMap<String, String>, // not use delete to represent default values pub options: HashMap<String, String>, // not use delete to represent default values
// Various data for flutter ui // Various data for flutter ui
#[serde(default, deserialize_with = "deserialize_hashmap_string_string")] #[serde(default, deserialize_with = "deserialize_hashmap_string_string")]
@ -1230,22 +1234,8 @@ impl PeerConfig {
} }
} }
fn deserialize_options<'de, D>(deserializer: D) -> Result<HashMap<String, String>, D::Error>
where
D: de::Deserializer<'de>,
{
let mut mp: HashMap<String, String> = de::Deserialize::deserialize(deserializer)?;
Self::insert_default_options(&mut mp);
Ok(mp)
}
fn default_options() -> HashMap<String, String> { fn default_options() -> HashMap<String, String> {
let mut mp: HashMap<String, String> = Default::default(); let mut mp: HashMap<String, String> = Default::default();
Self::insert_default_options(&mut mp);
return mp;
}
fn insert_default_options(mp: &mut HashMap<String, String>) {
[ [
"codec-preference", "codec-preference",
"custom-fps", "custom-fps",
@ -1255,10 +1245,9 @@ impl PeerConfig {
"swap-left-right-mouse", "swap-left-right-mouse",
] ]
.map(|key| { .map(|key| {
if !mp.contains_key(key) { mp.insert(key.to_owned(), UserDefaultConfig::read(key));
mp.insert(key.to_owned(), UserDefaultConfig::read(key));
}
}); });
mp
} }
} }

7
src/client.rs
View File

@ -1481,12 +1481,7 @@ impl LoginConfigHandler {
.map(|o| !o.is_empty()) .map(|o| !o.is_empty())
.unwrap_or(false); .unwrap_or(false);
if is_set { if is_set {
if name == "zoom-cursor" { self.config.options.remove(&name);
self.config.options.insert(name, "".to_owned());
} else {
// Notice: When PeerConfig loads, the default value is taken when the option key does not exist.
self.config.options.remove(&name);
}
} else { } else {
self.config.options.insert(name, "Y".to_owned()); self.config.options.insert(name, "Y".to_owned());
} }