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

fix default peer options

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-06-04 19:58:55 +08:00
parent afb8e255de
commit 113bf15cd4
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,9 @@ macro_rules! serde_field_string {
{ {
let s: String = let s: String =
de::Deserialize::deserialize(deserializer).unwrap_or(Self::$default_func()); de::Deserialize::deserialize(deserializer).unwrap_or(Self::$default_func());
if s.is_empty() {
return Ok(Self::$default_func());
}
Ok(s) Ok(s)
} }
}; };
@ -206,22 +209,26 @@ pub struct PeerConfig {
pub size_pf: Size, pub size_pf: Size,
#[serde( #[serde(
default = "PeerConfig::default_view_style", default = "PeerConfig::default_view_style",
deserialize_with = "PeerConfig::deserialize_view_style" deserialize_with = "PeerConfig::deserialize_view_style",
skip_serializing_if = "String::is_empty"
)] )]
pub view_style: String, pub view_style: String,
#[serde( #[serde(
default = "PeerConfig::default_scroll_style", default = "PeerConfig::default_scroll_style",
deserialize_with = "PeerConfig::deserialize_scroll_style" deserialize_with = "PeerConfig::deserialize_scroll_style",
skip_serializing_if = "String::is_empty"
)] )]
pub scroll_style: String, pub scroll_style: String,
#[serde( #[serde(
default = "PeerConfig::default_image_quality", default = "PeerConfig::default_image_quality",
deserialize_with = "PeerConfig::deserialize_image_quality" deserialize_with = "PeerConfig::deserialize_image_quality",
skip_serializing_if = "String::is_empty"
)] )]
pub image_quality: String, pub image_quality: String,
#[serde( #[serde(
default = "PeerConfig::default_custom_image_quality", default = "PeerConfig::default_custom_image_quality",
deserialize_with = "PeerConfig::deserialize_custom_image_quality" deserialize_with = "PeerConfig::deserialize_custom_image_quality",
skip_serializing_if = "Vec::is_empty"
)] )]
pub custom_image_quality: Vec<i32>, pub custom_image_quality: Vec<i32>,
#[serde(flatten)] #[serde(flatten)]
@ -244,7 +251,11 @@ pub struct PeerConfig {
pub enable_file_transfer: EnableFileTransfer, pub enable_file_transfer: EnableFileTransfer,
#[serde(flatten)] #[serde(flatten)]
pub show_quality_monitor: ShowQualityMonitor, pub show_quality_monitor: ShowQualityMonitor,
#[serde(default, deserialize_with = "deserialize_string")] #[serde(
default,
deserialize_with = "deserialize_string",
skip_serializing_if = "String::is_empty"
)]
pub keyboard_mode: String, pub keyboard_mode: String,
#[serde(flatten)] #[serde(flatten)]
pub view_only: ViewOnly, pub view_only: ViewOnly,