From c8cc6b10d4f1280702d50f903e15266dd9785953 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Thu, 5 Feb 2026 22:42:31 +0800 Subject: Move vcs module to lib and adjust imports --- src/bin/jv.rs | 26 +++++++++++++------------- src/bin/jvv.rs | 12 ++++++------ src/cmds/arg/status.rs | 4 +++- src/cmds/cmd/status.rs | 2 +- src/cmds/collect/status.rs | 2 +- src/cmds/out/status.rs | 2 +- src/data/ipaddress_history.rs | 2 +- src/legacy_json_output/accounts.rs | 2 +- src/legacy_json_output/align.rs | 2 +- src/legacy_json_output/here.rs | 2 +- src/legacy_json_output/info.rs | 2 +- src/legacy_json_output/share.rs | 2 +- src/legacy_json_output/sheets.rs | 2 +- src/systems/cmd/errors.rs | 2 +- src/systems/cmd/workspace_reader.rs | 9 +++++---- utils/src/display.rs | 2 +- utils/src/logger.rs | 2 +- 17 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/bin/jv.rs b/src/bin/jv.rs index 9593c9d..c785358 100644 --- a/src/bin/jv.rs +++ b/src/bin/jv.rs @@ -2,19 +2,7 @@ use cli_utils::input::input_with_editor; use colored::Colorize; use just_enough_vcs::{ data::compile_info::CoreCompileInfo, - system::action_system::{action::ActionContext, action_pool::ActionPool}, - utils::{ - cfg_file::config::ConfigFile, - data_struct::data_sort::quick_sort_with_cmp, - sha1_hash, - string_proc::{ - self, - format_path::{format_path, format_path_str}, - snake_case, - }, - tcp_connection::instance::ConnectionInstance, - }, - vcs::{ + lib::{ constants::{ CLIENT_FILE_TODOLIST, CLIENT_FILE_WORKSPACE, CLIENT_FOLDER_WORKSPACE_ROOT_NAME, CLIENT_PATH_WORKSPACE_ROOT, PORT, VAULT_HOST_NAME, @@ -79,6 +67,18 @@ use just_enough_vcs::{ }, }, }, + system::action_system::{action::ActionContext, action_pool::ActionPool}, + utils::{ + cfg_file::config::ConfigFile, + data_struct::data_sort::quick_sort_with_cmp, + sha1_hash, + string_proc::{ + self, + format_path::{format_path, format_path_str}, + snake_case, + }, + tcp_connection::instance::ConnectionInstance, + }, }; use std::{ collections::{BTreeMap, HashMap, HashSet}, diff --git a/src/bin/jvv.rs b/src/bin/jvv.rs index 1fae774..0cac5c3 100644 --- a/src/bin/jvv.rs +++ b/src/bin/jvv.rs @@ -6,11 +6,7 @@ use cli_utils::{ }; use just_enough_vcs::{ data::compile_info::CoreCompileInfo, - utils::{ - cfg_file::config::ConfigFile, - string_proc::{self, pascal_case}, - }, - vcs::{ + lib::{ connection::action_service::server_entry, constants::SERVER_FILE_VAULT, data::{ @@ -19,6 +15,10 @@ use just_enough_vcs::{ }, env::current_vault_path, }, + utils::{ + cfg_file::config::ConfigFile, + string_proc::{self, pascal_case}, + }, }; use just_enough_vcs_cli::data::compile_info::CompileInfo; use log::{error, info}; @@ -402,7 +402,7 @@ async fn jvv_here(_args: HereArgs) { if metadata.is_file() { *total_size += metadata.len(); // Check if file name matches SERVER_NAME_VF_META - if entry.file_name() == just_enough_vcs::vcs::constants::SERVER_NAME_VF_META { + if entry.file_name() == just_enough_vcs::lib::constants::SERVER_NAME_VF_META { *file_count += 1; } } else if metadata.is_dir() { diff --git a/src/cmds/arg/status.rs b/src/cmds/arg/status.rs index c713227..fbfe5f5 100644 --- a/src/cmds/arg/status.rs +++ b/src/cmds/arg/status.rs @@ -1,4 +1,6 @@ use clap::Parser; #[derive(Parser, Debug)] -pub struct JVStatusArgument; +pub struct JVStatusArgument { + what: Option, // status of what to query +} diff --git a/src/cmds/cmd/status.rs b/src/cmds/cmd/status.rs index 52f12d0..4e89d42 100644 --- a/src/cmds/cmd/status.rs +++ b/src/cmds/cmd/status.rs @@ -15,7 +15,7 @@ use crate::{ }, }; use cmd_system_macros::exec; -use just_enough_vcs::vcs::{ +use just_enough_vcs::lib::{ constants::VAULT_HOST_NAME, data::local::workspace_analyzer::ModifiedRelativePathBuf, }; diff --git a/src/cmds/collect/status.rs b/src/cmds/collect/status.rs index b0e8fcd..fba86c2 100644 --- a/src/cmds/collect/status.rs +++ b/src/cmds/collect/status.rs @@ -1,6 +1,6 @@ use std::time::SystemTime; -use just_enough_vcs::vcs::data::{ +use just_enough_vcs::lib::data::{ local::{ latest_file_data::LatestFileData, local_sheet::LocalSheetData, workspace_analyzer::AnalyzeResultPure, diff --git a/src/cmds/out/status.rs b/src/cmds/out/status.rs index 2b8d9c6..417c94c 100644 --- a/src/cmds/out/status.rs +++ b/src/cmds/out/status.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, time::SystemTime}; -use just_enough_vcs::vcs::data::{ +use just_enough_vcs::lib::data::{ local::workspace_analyzer::{AnalyzeResultPure, ModifiedRelativePathBuf}, member::MemberId, sheet::SheetName, diff --git a/src/data/ipaddress_history.rs b/src/data/ipaddress_history.rs index c100fc9..142797d 100644 --- a/src/data/ipaddress_history.rs +++ b/src/data/ipaddress_history.rs @@ -1,4 +1,4 @@ -use just_enough_vcs::vcs::env::current_cfg_dir; +use just_enough_vcs::lib::env::current_cfg_dir; const IP_HISTORY_NAME: &str = "ip_history.txt"; diff --git a/src/legacy_json_output/accounts.rs b/src/legacy_json_output/accounts.rs index d29539a..705f4ea 100644 --- a/src/legacy_json_output/accounts.rs +++ b/src/legacy_json_output/accounts.rs @@ -1,4 +1,4 @@ -use just_enough_vcs::vcs::data::member::MemberId; +use just_enough_vcs::lib::data::member::MemberId; use serde::{Deserialize, Serialize}; use std::collections::HashMap; diff --git a/src/legacy_json_output/align.rs b/src/legacy_json_output/align.rs index 2c6bfc4..31f8aed 100644 --- a/src/legacy_json_output/align.rs +++ b/src/legacy_json_output/align.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, path::PathBuf}; -use just_enough_vcs::vcs::data::local::align_tasks::AlignTaskName; +use just_enough_vcs::lib::data::local::align_tasks::AlignTaskName; use serde::{Deserialize, Serialize}; #[derive(Debug, Default, Serialize, Deserialize)] diff --git a/src/legacy_json_output/here.rs b/src/legacy_json_output/here.rs index 178a467..8925d32 100644 --- a/src/legacy_json_output/here.rs +++ b/src/legacy_json_output/here.rs @@ -1,4 +1,4 @@ -use just_enough_vcs::vcs::data::{member::MemberId, vault::virtual_file::VirtualFileVersion}; +use just_enough_vcs::lib::data::{member::MemberId, vault::virtual_file::VirtualFileVersion}; use serde::{Deserialize, Serialize}; #[derive(Debug, Default, Serialize, Deserialize)] diff --git a/src/legacy_json_output/info.rs b/src/legacy_json_output/info.rs index 8948980..ccc46cb 100644 --- a/src/legacy_json_output/info.rs +++ b/src/legacy_json_output/info.rs @@ -1,4 +1,4 @@ -use just_enough_vcs::vcs::data::{ +use just_enough_vcs::lib::data::{ member::MemberId, vault::virtual_file::{VirtualFileId, VirtualFileVersion}, }; diff --git a/src/legacy_json_output/share.rs b/src/legacy_json_output/share.rs index 53282ea..8528842 100644 --- a/src/legacy_json_output/share.rs +++ b/src/legacy_json_output/share.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use just_enough_vcs::vcs::data::{ +use just_enough_vcs::lib::data::{ member::MemberId, sheet::{SheetMappingMetadata, SheetPathBuf}, vault::mapping_share::SheetShareId, diff --git a/src/legacy_json_output/sheets.rs b/src/legacy_json_output/sheets.rs index 2dc0c81..f5743f3 100644 --- a/src/legacy_json_output/sheets.rs +++ b/src/legacy_json_output/sheets.rs @@ -1,4 +1,4 @@ -use just_enough_vcs::vcs::data::member::MemberId; +use just_enough_vcs::lib::data::member::MemberId; use serde::{Deserialize, Serialize}; #[derive(Debug, Default, Serialize, Deserialize)] diff --git a/src/systems/cmd/errors.rs b/src/systems/cmd/errors.rs index 7ec5e1c..0b01abf 100644 --- a/src/systems/cmd/errors.rs +++ b/src/systems/cmd/errors.rs @@ -1,4 +1,4 @@ -use just_enough_vcs::vcs::data::{member::MemberId, sheet::SheetName}; +use just_enough_vcs::lib::data::{member::MemberId, sheet::SheetName}; #[derive(thiserror::Error, Debug)] pub enum CmdPrepareError { diff --git a/src/systems/cmd/workspace_reader.rs b/src/systems/cmd/workspace_reader.rs index c001330..8b2f642 100644 --- a/src/systems/cmd/workspace_reader.rs +++ b/src/systems/cmd/workspace_reader.rs @@ -1,11 +1,11 @@ use std::{collections::HashMap, net::SocketAddr, path::PathBuf}; use just_enough_vcs::{ - utils::cfg_file::config::ConfigFile, - vcs::{ + lib::{ data::{ local::{ LocalWorkspace, + cached_sheet::CachedSheet, latest_file_data::LatestFileData, latest_info::LatestInfo, local_sheet::{LocalSheet, LocalSheetData}, @@ -18,6 +18,7 @@ use just_enough_vcs::{ }, env::current_local_path, }, + utils::cfg_file::config::ConfigFile, }; use crate::systems::cmd::errors::CmdPrepareError; @@ -191,7 +192,7 @@ impl LocalWorkspaceReader { if !self.cached_sheet.contains_key(sheet_name) { let workspace_dir = self.workspace_dir()?; let cached_sheet = entry_dir!(&workspace_dir, { - match just_enough_vcs::vcs::data::local::cached_sheet::CachedSheet::cached_sheet_data(sheet_name).await { + match CachedSheet::cached_sheet_data(sheet_name).await { Ok(data) => data, Err(_) => return Err(CmdPrepareError::CachedSheetNotFound(sheet_name.clone())), } @@ -338,7 +339,7 @@ impl LocalWorkspaceReader { } else { let workspace_dir = self.workspace_dir()?; let cached_sheet = entry_dir!(&workspace_dir, { - match just_enough_vcs::vcs::data::local::cached_sheet::CachedSheet::cached_sheet_data(sheet_name).await { + match CachedSheet::cached_sheet_data(sheet_name).await { Ok(data) => data, Err(_) => return Err(CmdPrepareError::CachedSheetNotFound(sheet_name.clone())), } diff --git a/utils/src/display.rs b/utils/src/display.rs index 835313b..50b0858 100644 --- a/utils/src/display.rs +++ b/utils/src/display.rs @@ -1,5 +1,5 @@ use colored::*; -use just_enough_vcs::vcs::data::sheet::SheetMappingMetadata; +use just_enough_vcs::lib::data::sheet::SheetMappingMetadata; use std::{ collections::{BTreeMap, HashMap, VecDeque}, path::PathBuf, diff --git a/utils/src/logger.rs b/utils/src/logger.rs index 7dd4f62..6c9b95b 100644 --- a/utils/src/logger.rs +++ b/utils/src/logger.rs @@ -3,7 +3,7 @@ use std::path::Path; use colored::Colorize; use env_logger::{Builder, Target}; use just_enough_vcs::{ - utils::string_proc::format_path::format_path, vcs::data::vault::vault_config::LoggerLevel, + lib::data::vault::vault_config::LoggerLevel, utils::string_proc::format_path::format_path, }; use log::{Level, LevelFilter}; -- cgit