diff options
Diffstat (limited to 'crates/vcs_data/src/data/vault')
| -rw-r--r-- | crates/vcs_data/src/data/vault/config.rs | 22 | ||||
| -rw-r--r-- | crates/vcs_data/src/data/vault/sheet_share.rs | 4 | ||||
| -rw-r--r-- | crates/vcs_data/src/data/vault/virtual_file.rs | 6 |
3 files changed, 21 insertions, 11 deletions
diff --git a/crates/vcs_data/src/data/vault/config.rs b/crates/vcs_data/src/data/vault/config.rs index 60f6cbb..caa8552 100644 --- a/crates/vcs_data/src/data/vault/config.rs +++ b/crates/vcs_data/src/data/vault/config.rs @@ -81,9 +81,9 @@ pub struct VaultConfig { #[serde(rename = "name")] vault_name: VaultName, - /// Vault admin id, a list of member id representing administrator identities - #[serde(rename = "admin")] - vault_admin_list: Vec<MemberId>, + /// Vault host ids, a list of member id representing administrator identities + #[serde(rename = "hosts")] + vault_host_list: Vec<MemberId>, /// Vault server configuration, which will be loaded when connecting to the server #[serde(rename = "profile")] @@ -125,7 +125,7 @@ impl Default for VaultConfig { Self { vault_uuid: Uuid::new_v4(), vault_name: "JustEnoughVault".to_string(), - vault_admin_list: Vec::new(), + vault_host_list: Vec::new(), server_config: VaultServerConfig { local_bind: IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), port: PORT, @@ -148,15 +148,15 @@ impl VaultConfig { /// Add admin pub fn add_admin(&mut self, member: &Member) { let uuid = member.id(); - if !self.vault_admin_list.contains(&uuid) { - self.vault_admin_list.push(uuid); + if !self.vault_host_list.contains(&uuid) { + self.vault_host_list.push(uuid); } } /// Remove admin pub fn remove_admin(&mut self, member: &Member) { let id = member.id(); - self.vault_admin_list.retain(|x| x != &id); + self.vault_host_list.retain(|x| x != &id); } /// Get vault UUID @@ -180,13 +180,13 @@ impl VaultConfig { } /// Get vault admin list - pub fn vault_admin_list(&self) -> &Vec<MemberId> { - &self.vault_admin_list + pub fn vault_host_list(&self) -> &Vec<MemberId> { + &self.vault_host_list } /// Set vault admin list - pub fn set_vault_admin_list(&mut self, vault_admin_list: Vec<MemberId>) { - self.vault_admin_list = vault_admin_list; + pub fn set_vault_host_list(&mut self, vault_host_list: Vec<MemberId>) { + self.vault_host_list = vault_host_list; } /// Get server config diff --git a/crates/vcs_data/src/data/vault/sheet_share.rs b/crates/vcs_data/src/data/vault/sheet_share.rs index b62c74b..af1aa53 100644 --- a/crates/vcs_data/src/data/vault/sheet_share.rs +++ b/crates/vcs_data/src/data/vault/sheet_share.rs @@ -23,9 +23,11 @@ const SHARE_ID: &str = "{share_id}"; #[derive(Default, Serialize, Deserialize, ConfigFile, Clone, Debug)] pub struct Share { /// Sharer: the member who created this share item + #[serde(rename = "sharer")] pub sharer: MemberId, /// Description of the share item + #[serde(rename = "desc")] pub description: String, /// Metadata path @@ -33,9 +35,11 @@ pub struct Share { pub path: Option<PathBuf>, /// From: which sheet the member exported the file from + #[serde(rename = "from")] pub from_sheet: SheetName, /// Mappings: the sheet mappings contained in the share item + #[serde(rename = "map")] pub mappings: HashMap<SheetPathBuf, SheetMappingMetadata>, } diff --git a/crates/vcs_data/src/data/vault/virtual_file.rs b/crates/vcs_data/src/data/vault/virtual_file.rs index 150a469..8dbcb5d 100644 --- a/crates/vcs_data/src/data/vault/virtual_file.rs +++ b/crates/vcs_data/src/data/vault/virtual_file.rs @@ -39,24 +39,30 @@ pub struct VirtualFile<'a> { #[derive(Default, Clone, Serialize, Deserialize, ConfigFile)] pub struct VirtualFileMeta { /// Current version of the virtual file + #[serde(rename = "ver")] current_version: VirtualFileVersion, /// The member who holds the edit right of the file + #[serde(rename = "holder")] hold_member: MemberId, /// Description of each version + #[serde(rename = "descs")] version_description: HashMap<VirtualFileVersion, VirtualFileVersionDescription>, /// Histories + #[serde(rename = "histories")] histories: Vec<VirtualFileVersion>, } #[derive(Debug, Default, Clone, Serialize, Deserialize)] pub struct VirtualFileVersionDescription { /// The member who created this version + #[serde(rename = "creator")] pub creator: MemberId, /// The description of this version + #[serde(rename = "desc")] pub description: String, } |
