rustdesk/hbb_common
1
0
Fork 0
mirror of https://github.com/rustdesk/hbb_common.git synced 2026-02-16 10:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from 21pages/device_group

Browse Source 
fix device group cache
This commit is contained in:
RustDesk
2025-02-14 16:48:49 +08:00
committed by GitHub
parent b237338eb3 a8efd320e6
commit 8b6700a33f
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/config.rs
View File

@@ -1965,6 +1965,16 @@ pub struct GroupUser {
pub name: String,
}
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
pub struct DeviceGroup {
#[serde(
default,
deserialize_with = "deserialize_string",
skip_serializing_if = "String::is_empty"
)]
pub name: String,
}
#[derive(Debug, Default, Serialize, Deserialize, Clone)]
pub struct Group {
#[serde(
@@ -1977,6 +1987,8 @@ pub struct Group {
pub users: Vec<GroupUser>,
#[serde(default, deserialize_with = "deserialize_vec_grouppeer")]
pub peers: Vec<GroupPeer>,
#[serde(default, deserialize_with = "deserialize_vec_devicegroup")]
pub device_groups: Vec<DeviceGroup>,
}
impl Group {
@@ -2048,6 +2060,7 @@ deserialize_default!(deserialize_vec_abpeer, Vec<AbPeer>);
deserialize_default!(deserialize_vec_abentry, Vec<AbEntry>);
deserialize_default!(deserialize_vec_groupuser, Vec<GroupUser>);
deserialize_default!(deserialize_vec_grouppeer, Vec<GroupPeer>);
deserialize_default!(deserialize_vec_devicegroup, Vec<DeviceGroup>);
deserialize_default!(deserialize_keypair, KeyPair);
deserialize_default!(deserialize_size, Size);
deserialize_default!(deserialize_hashmap_string_string, HashMap<String, String>);