diff options
Diffstat (limited to 'crates/vcs_data/src/data')
| -rw-r--r-- | crates/vcs_data/src/data/vault.rs | 6 | ||||
| -rw-r--r-- | crates/vcs_data/src/data/vault/sheets.rs | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/crates/vcs_data/src/data/vault.rs b/crates/vcs_data/src/data/vault.rs index fedebb3..7cbb459 100644 --- a/crates/vcs_data/src/data/vault.rs +++ b/crates/vcs_data/src/data/vault.rs @@ -10,8 +10,8 @@ use vcs_docs::docs::READMES_VAULT_README; use crate::{ constants::{ - SERVER_FILE_README, SERVER_FILE_VAULT, SERVER_PATH_MEMBER_PUB, SERVER_PATH_MEMBERS, - SERVER_PATH_SHEETS, SERVER_PATH_VF_ROOT, VAULT_HOST_NAME, + REF_SHEET_NAME, SERVER_FILE_README, SERVER_FILE_VAULT, SERVER_PATH_MEMBER_PUB, + SERVER_PATH_MEMBERS, SERVER_PATH_SHEETS, SERVER_PATH_VF_ROOT, VAULT_HOST_NAME, }, current::{current_vault_path, find_vault_path}, data::{member::Member, vault::config::VaultConfig}, @@ -91,7 +91,7 @@ impl Vault { // 7. Setup reference sheet vault - .create_sheet(&"ref".to_string(), &VAULT_HOST_NAME.to_string()) + .create_sheet(&REF_SHEET_NAME.to_string(), &VAULT_HOST_NAME.to_string()) .await?; // Final, generate README.md diff --git a/crates/vcs_data/src/data/vault/sheets.rs b/crates/vcs_data/src/data/vault/sheets.rs index cea7271..4101d45 100644 --- a/crates/vcs_data/src/data/vault/sheets.rs +++ b/crates/vcs_data/src/data/vault/sheets.rs @@ -5,7 +5,7 @@ use string_proc::snake_case; use tokio::fs; use crate::{ - constants::SERVER_PATH_SHEETS, + constants::{SERVER_PATH_SHEETS, SERVER_SUFFIX_SHEET_FILE_NO_DOT}, data::{ member::MemberId, sheet::{Sheet, SheetData, SheetName}, @@ -55,7 +55,9 @@ impl Vault { // Check if it's a YAML file if path.is_file() - && path.extension().is_some_and(|ext| ext == "yaml") + && path + .extension() + .is_some_and(|ext| ext == SERVER_SUFFIX_SHEET_FILE_NO_DOT) && let Some(file_stem) = path.file_stem().and_then(|s| s.to_str()) { // Create a new SheetName and add it to the result list @@ -214,7 +216,10 @@ impl Vault { .duration_since(std::time::UNIX_EPOCH) .unwrap() .as_millis(); - let trash_file_name = format!("{}_{}.yaml", sheet_name, timestamp); + let trash_file_name = format!( + "{}_{}.{}", + sheet_name, timestamp, SERVER_SUFFIX_SHEET_FILE_NO_DOT + ); let trash_path = trash_dir.join(trash_file_name); // Move the sheet file to the trash |