diff options
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/vcs_data/src/constants.rs | 23 | ||||
| -rw-r--r-- | crates/vcs_data/src/data/vault.rs | 6 | ||||
| -rw-r--r-- | crates/vcs_data/src/data/vault/sheets.rs | 11 |
3 files changed, 25 insertions, 15 deletions
diff --git a/crates/vcs_data/src/constants.rs b/crates/vcs_data/src/constants.rs index 01344de..9b12d44 100644 --- a/crates/vcs_data/src/constants.rs +++ b/crates/vcs_data/src/constants.rs @@ -15,9 +15,11 @@ pub const VAULT_HOST_NAME: &str = "host"; pub const SERVER_FILE_VAULT: &str = "./vault.toml"; // Server - Sheets +pub const SERVER_SUFFIX_SHEET_FILE: &str = ".json"; +pub const SERVER_SUFFIX_SHEET_FILE_NO_DOT: &str = "json"; pub const REF_SHEET_NAME: &str = "ref"; pub const SERVER_PATH_SHEETS: &str = "./sheets/"; -pub const SERVER_FILE_SHEET: &str = "./sheets/{sheet_name}.yaml"; +pub const SERVER_FILE_SHEET: &str = "./sheets/{sheet_name}.json"; // Server - Members pub const SERVER_PATH_MEMBERS: &str = "./members/"; @@ -30,7 +32,10 @@ pub const SERVER_PATH_VF_TEMP: &str = "./.temp/{temp_name}"; pub const SERVER_PATH_VF_ROOT: &str = "./storage/"; pub const SERVER_PATH_VF_STORAGE: &str = "./storage/{vf_index}/{vf_id}/"; pub const SERVER_FILE_VF_VERSION_INSTANCE: &str = "./storage/{vf_index}/{vf_id}/{vf_version}.rf"; -pub const SERVER_FILE_VF_META: &str = "./storage/{vf_index}/{vf_id}/meta.yaml"; +pub const SERVER_FILE_VF_META: &str = "./storage/{vf_index}/{vf_id}/meta.json"; + +// Server - Updates +pub const SERVER_FILE_UPDATES: &str = "./.updates.txt"; // Server - Service pub const SERVER_FILE_LOCKFILE: &str = "./.lock"; @@ -45,20 +50,20 @@ pub const CLIENT_PATH_WORKSPACE_ROOT: &str = "./.jv/"; pub const CLIENT_FOLDER_WORKSPACE_ROOT_NAME: &str = ".jv"; // Client - Workspace (Main) -pub const CLIENT_FILE_WORKSPACE: &str = "./.jv/workspace.toml"; +pub const CLIENT_FILE_WORKSPACE: &str = "./.jv/workspace.json"; // Client - Latest Information -pub const CLIENT_FILE_LATEST_INFO: &str = "./.jv/.{account}_latest.json"; +pub const CLIENT_FILE_LATEST_INFO: &str = "./.jv/members/{account}/vault.yaml"; // Client - Local -pub const CLIENT_SUFFIX_LOCAL_SHEET_FILE: &str = ".toml"; -pub const CLIENT_SUFFIX_CACHED_SHEET_FILE: &str = ".toml"; +pub const CLIENT_SUFFIX_LOCAL_SHEET_FILE: &str = ".ron"; +pub const CLIENT_SUFFIX_CACHED_SHEET_FILE: &str = ".ron"; pub const CLIENT_PATH_LOCAL_DRAFT: &str = "./.jv/drafts/{account}/{sheet_name}/"; pub const CLIENT_PATH_LOCAL_SHEET: &str = "./.jv/local/"; pub const CLIENT_PATH_CACHED_SHEET: &str = "./.jv/cached/"; -pub const CLIENT_FILE_LOCAL_SHEET: &str = "./.jv/local/{account}/{sheet_name}.toml"; -pub const CLIENT_FILE_CACHED_SHEET: &str = "./.jv/cached/{sheet_name}.toml"; -pub const CLIENT_FILE_MEMBER_HELD: &str = "./.jv/helds/{account}.toml"; +pub const CLIENT_FILE_LOCAL_SHEET: &str = "./.jv/local/{account}/{sheet_name}.ron"; +pub const CLIENT_FILE_CACHED_SHEET: &str = "./.jv/cached/{sheet_name}.ron"; +pub const CLIENT_FILE_LATEST_DATA: &str = "./.jv/members/{account}/file.yaml"; pub const CLIENT_FILE_LOCAL_SHEET_NOSET: &str = "./.jv/.temp/wrong.json"; pub const CLIENT_FILE_MEMBER_HELD_NOSET: &str = "./.jv/.temp/wrong.json"; 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 |