diff options
| author | 魏曹先生 <1992414357@qq.com> | 2025-09-26 12:52:59 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2025-09-26 12:52:59 +0800 |
| commit | 6ce41600a46b542d1975af0bdf28f3454e65715f (patch) | |
| tree | e8ecde63e9f924ef385fe0362b9c60edc7b32cd8 /crates/vcs/src/data | |
| parent | 9c44621f13f27e7f2a82fa5ab2fc8e27381f3e39 (diff) | |
feat: Automatically create host member and ref sheet during vault setup
- Add VAULT_HOST_NAME constant for 'host' member
- Modify setup_vault to automatically register host member and create ref sheet
- Update test assertions to account for the additional ref sheet
- Fix code formatting in sheets.rs
Diffstat (limited to 'crates/vcs/src/data')
| -rw-r--r-- | crates/vcs/src/data/vault.rs | 21 | ||||
| -rw-r--r-- | crates/vcs/src/data/vault/sheets.rs | 25 |
2 files changed, 33 insertions, 13 deletions
diff --git a/crates/vcs/src/data/vault.rs b/crates/vcs/src/data/vault.rs index 152836e..2881c82 100644 --- a/crates/vcs/src/data/vault.rs +++ b/crates/vcs/src/data/vault.rs @@ -9,10 +9,10 @@ use cfg_file::config::ConfigFile; use crate::{ constants::{ SERVER_FILE_README, SERVER_FILE_VAULT, SERVER_PATH_MEMBER_PUB, SERVER_PATH_MEMBERS, - SERVER_PATH_SHEETS, SERVER_PATH_VF_ROOT, + SERVER_PATH_SHEETS, SERVER_PATH_VF_ROOT, VAULT_HOST_NAME, }, current::{current_vault_path, find_vault_path}, - data::vault::config::VaultConfig, + data::{member::Member, vault::config::VaultConfig}, }; pub mod config; @@ -71,6 +71,23 @@ impl Vault { // 5. Setup storage directory create_dir_all(vault_path.join(SERVER_PATH_VF_ROOT))?; + let Some(vault) = Vault::init(config, &vault_path) else { + return Err(std::io::Error::new( + std::io::ErrorKind::Other, + "Failed to initialize vault", + )); + }; + + // 6. Create host member + vault + .register_member_to_vault(Member::new(VAULT_HOST_NAME)) + .await?; + + // 7. Setup reference sheet + vault + .create_sheet(&"ref".to_string(), &VAULT_HOST_NAME.to_string()) + .await?; + // Final, generate README.md let readme_content = format!( "\ diff --git a/crates/vcs/src/data/vault/sheets.rs b/crates/vcs/src/data/vault/sheets.rs index dfad862..bcd5779 100644 --- a/crates/vcs/src/data/vault/sheets.rs +++ b/crates/vcs/src/data/vault/sheets.rs @@ -53,11 +53,13 @@ impl Vault { let path = entry.path(); // Check if it's a YAML file - if path.is_file() && path.extension().is_some_and(|ext| ext == "yaml") - && let Some(file_stem) = path.file_stem().and_then(|s| s.to_str()) { - // Create a new SheetName and add it to the result list - sheet_names.push(file_stem.to_string()); - } + if path.is_file() + && path.extension().is_some_and(|ext| ext == "yaml") + && let Some(file_stem) = path.file_stem().and_then(|s| s.to_str()) + { + // Create a new SheetName and add it to the result list + sheet_names.push(file_stem.to_string()); + } } Ok(sheet_names) @@ -229,13 +231,14 @@ impl Vault { let path = entry.path(); if path.is_file() - && let Some(file_name) = path.file_stem().and_then(|s| s.to_str()) { - // Check if the filename starts with the sheet name - if file_name.starts_with(&sheet_name) { - found_path = Some(path); - break; - } + && let Some(file_name) = path.file_stem().and_then(|s| s.to_str()) + { + // Check if the filename starts with the sheet name + if file_name.starts_with(&sheet_name) { + found_path = Some(path); + break; } + } } let trash_path = found_path.ok_or_else(|| { |
