From 3e0a3d131c3eca721858357621bcde8cc7b9423f Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Sat, 3 Jan 2026 13:59:09 +0800 Subject: Replace hardcoded file extension with constant Use SERVER_SUFFIX_MEMBER_INFO_NO_DOT constant instead of literal "toml" string for member info file extension check --- crates/vcs_data/src/constants.rs | 2 ++ crates/vcs_data/src/data/vault/member.rs | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'crates/vcs_data') diff --git a/crates/vcs_data/src/constants.rs b/crates/vcs_data/src/constants.rs index 94e245c..98f29e0 100644 --- a/crates/vcs_data/src/constants.rs +++ b/crates/vcs_data/src/constants.rs @@ -24,6 +24,8 @@ pub const SERVER_FILE_SHEET: &str = "./sheets/{sheet_name}.bcfg"; pub const SERVER_FILE_SHEET_SHARE: &str = "./sheets/shares/{sheet_name}/{share_id}.bcfg"; // Server - Members +pub const SERVER_SUFFIX_MEMBER_INFO: &str = ".bcfg"; +pub const SERVER_SUFFIX_MEMBER_INFO_NO_DOT: &str = "bcfg"; pub const SERVER_PATH_MEMBERS: &str = "./members/"; pub const SERVER_PATH_MEMBER_PUB: &str = "./key/"; pub const SERVER_FILE_MEMBER_INFO: &str = "./members/{member_id}.bcfg"; diff --git a/crates/vcs_data/src/data/vault/member.rs b/crates/vcs_data/src/data/vault/member.rs index aebd92d..9d22d09 100644 --- a/crates/vcs_data/src/data/vault/member.rs +++ b/crates/vcs_data/src/data/vault/member.rs @@ -7,7 +7,10 @@ use std::{ use cfg_file::config::ConfigFile; use crate::{ - constants::{SERVER_FILE_MEMBER_INFO, SERVER_FILE_MEMBER_PUB, SERVER_PATH_MEMBERS}, + constants::{ + SERVER_FILE_MEMBER_INFO, SERVER_FILE_MEMBER_PUB, SERVER_PATH_MEMBERS, + SERVER_SUFFIX_MEMBER_INFO_NO_DOT, + }, data::{ member::{Member, MemberId}, vault::Vault, @@ -44,7 +47,8 @@ impl Vault { if path.is_file() && let Some(file_name) = path.file_stem().and_then(|s| s.to_str()) - && path.extension().and_then(|s| s.to_str()) == Some("toml") + && path.extension().and_then(|s| s.to_str()) + == Some(SERVER_SUFFIX_MEMBER_INFO_NO_DOT) { member_ids.push(file_name.to_string()); } -- cgit