diff options
32 files changed, 40 insertions, 40 deletions
diff --git a/actions/src/connection/action_service.rs b/actions/src/connection/action_service.rs index f137126..3e05a70 100644 --- a/actions/src/connection/action_service.rs +++ b/actions/src/connection/action_service.rs @@ -15,7 +15,7 @@ use tokio::{ select, signal, spawn, sync::mpsc, }; -use vcs_data::data::vault::{Vault, config::VaultConfig}; +use vcs_data::data::vault::{Vault, vault_config::VaultConfig}; use crate::{ connection::protocol::RemoteActionInvoke, registry::server_registry::server_action_pool, diff --git a/actions/src/registry/client_registry.rs b/actions/src/registry/client_registry.rs index c31b19a..a1bccae 100644 --- a/actions/src/registry/client_registry.rs +++ b/actions/src/registry/client_registry.rs @@ -4,7 +4,7 @@ use action_system::{action::ActionContext, action_pool::ActionPool}; use cfg_file::config::ConfigFile; use tcp_connection::error::TcpTargetError; use vcs_data::data::{ - local::{LocalWorkspace, config::LocalConfig}, + local::{LocalWorkspace, workspace_config::LocalConfig}, user::UserDirectory, }; diff --git a/actions/src/remote_actions.rs b/actions/src/remote_actions.rs index 33f01aa..d15edc9 100644 --- a/actions/src/remote_actions.rs +++ b/actions/src/remote_actions.rs @@ -7,7 +7,7 @@ use tokio::sync::{Mutex, mpsc::Sender}; use vcs_data::{ constants::{SERVER_PATH_MEMBER_PUB, VAULT_HOST_NAME}, data::{ - local::{LocalWorkspace, config::LocalConfig, latest_info::LatestInfo}, + local::{LocalWorkspace, latest_info::LatestInfo, workspace_config::LocalConfig}, member::MemberId, sheet::SheetName, user::UserDirectory, diff --git a/actions/src/remote_actions/content_manage/track.rs b/actions/src/remote_actions/content_manage/track.rs index c158700..a59ca76 100644 --- a/actions/src/remote_actions/content_manage/track.rs +++ b/actions/src/remote_actions/content_manage/track.rs @@ -16,13 +16,13 @@ use vcs_data::{ data::{ local::{ cached_sheet::CachedSheet, latest_file_data::LatestFileData, - local_sheet::LocalMappingMetadata, vault_modified::sign_vault_modified, + local_sheet::LocalMappingMetadata, modified_status::sign_vault_modified, workspace_analyzer::AnalyzeResult, }, member::MemberId, sheet::SheetName, vault::{ - config::VaultUuid, + vault_config::VaultUuid, virtual_file::{VirtualFileId, VirtualFileVersion, VirtualFileVersionDescription}, }, }, diff --git a/actions/src/remote_actions/edit_right_manage/change_virtual_file_edit_right.rs b/actions/src/remote_actions/edit_right_manage/change_virtual_file_edit_right.rs index b999e42..1045bce 100644 --- a/actions/src/remote_actions/edit_right_manage/change_virtual_file_edit_right.rs +++ b/actions/src/remote_actions/edit_right_manage/change_virtual_file_edit_right.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use action_system::{action::ActionContext, macros::action_gen}; use serde::{Deserialize, Serialize}; use tcp_connection::error::TcpTargetError; -use vcs_data::data::local::vault_modified::sign_vault_modified; +use vcs_data::data::local::modified_status::sign_vault_modified; use crate::remote_actions::{ auth_member, check_connection_instance, get_current_sheet_name, try_get_vault, diff --git a/actions/src/remote_actions/mapping_manage/edit_mapping.rs b/actions/src/remote_actions/mapping_manage/edit_mapping.rs index b66f568..3c39c5d 100644 --- a/actions/src/remote_actions/mapping_manage/edit_mapping.rs +++ b/actions/src/remote_actions/mapping_manage/edit_mapping.rs @@ -4,7 +4,7 @@ use action_system::{action::ActionContext, macros::action_gen}; use serde::{Deserialize, Serialize}; use tcp_connection::error::TcpTargetError; use vcs_data::data::local::{ - vault_modified::sign_vault_modified, + modified_status::sign_vault_modified, workspace_analyzer::{FromRelativePathBuf, ToRelativePathBuf}, }; diff --git a/actions/src/remote_actions/mapping_manage/merge_share_mapping.rs b/actions/src/remote_actions/mapping_manage/merge_share_mapping.rs index 1034029..df889a1 100644 --- a/actions/src/remote_actions/mapping_manage/merge_share_mapping.rs +++ b/actions/src/remote_actions/mapping_manage/merge_share_mapping.rs @@ -4,8 +4,8 @@ use action_system::{action::ActionContext, macros::action_gen}; use serde::{Deserialize, Serialize}; use tcp_connection::error::TcpTargetError; use vcs_data::data::{ - local::vault_modified::sign_vault_modified, - vault::sheet_share::{ShareMergeMode, SheetShareId}, + local::modified_status::sign_vault_modified, + vault::mapping_share::{ShareMergeMode, SheetShareId}, }; use crate::{ diff --git a/actions/src/remote_actions/sheet_manage/drop_sheet.rs b/actions/src/remote_actions/sheet_manage/drop_sheet.rs index 0dcd790..e21f3dd 100644 --- a/actions/src/remote_actions/sheet_manage/drop_sheet.rs +++ b/actions/src/remote_actions/sheet_manage/drop_sheet.rs @@ -3,7 +3,7 @@ use std::io::ErrorKind; use action_system::{action::ActionContext, macros::action_gen}; use serde::{Deserialize, Serialize}; use tcp_connection::error::TcpTargetError; -use vcs_data::data::{local::vault_modified::sign_vault_modified, sheet::SheetName}; +use vcs_data::data::{local::modified_status::sign_vault_modified, sheet::SheetName}; use crate::{ remote_actions::{ diff --git a/actions/src/remote_actions/sheet_manage/make_sheet.rs b/actions/src/remote_actions/sheet_manage/make_sheet.rs index ac5e140..a323413 100644 --- a/actions/src/remote_actions/sheet_manage/make_sheet.rs +++ b/actions/src/remote_actions/sheet_manage/make_sheet.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use tcp_connection::error::TcpTargetError; use vcs_data::{ constants::VAULT_HOST_NAME, - data::{local::vault_modified::sign_vault_modified, sheet::SheetName}, + data::{local::modified_status::sign_vault_modified, sheet::SheetName}, }; use crate::{ diff --git a/actions/src/remote_actions/workspace_manage/set_upstream_vault.rs b/actions/src/remote_actions/workspace_manage/set_upstream_vault.rs index d3201b2..ba45214 100644 --- a/actions/src/remote_actions/workspace_manage/set_upstream_vault.rs +++ b/actions/src/remote_actions/workspace_manage/set_upstream_vault.rs @@ -5,7 +5,7 @@ use cfg_file::config::ConfigFile; use log::info; use serde::{Deserialize, Serialize}; use tcp_connection::error::TcpTargetError; -use vcs_data::data::{local::config::LocalConfig, vault::config::VaultUuid}; +use vcs_data::data::{local::workspace_config::LocalConfig, vault::vault_config::VaultUuid}; use crate::remote_actions::{ auth_member, check_connection_instance, try_get_local_workspace, try_get_vault, diff --git a/actions/src/remote_actions/workspace_manage/update_to_latest_info.rs b/actions/src/remote_actions/workspace_manage/update_to_latest_info.rs index 695d1f0..cd17c32 100644 --- a/actions/src/remote_actions/workspace_manage/update_to_latest_info.rs +++ b/actions/src/remote_actions/workspace_manage/update_to_latest_info.rs @@ -20,12 +20,12 @@ use vcs_data::{ cached_sheet::CachedSheet, latest_file_data::LatestFileData, latest_info::{LatestInfo, SheetInfo}, - vault_modified::sign_vault_modified, + modified_status::sign_vault_modified, }, member::MemberId, sheet::{SheetData, SheetName, SheetPathBuf}, vault::{ - sheet_share::{Share, SheetShareId}, + mapping_share::{Share, SheetShareId}, virtual_file::{VirtualFileId, VirtualFileVersion, VirtualFileVersionDescription}, }, }, diff --git a/data/src/data/local.rs b/data/src/data/local.rs index 0927e3f..d4115c6 100644 --- a/data/src/data/local.rs +++ b/data/src/data/local.rs @@ -16,26 +16,26 @@ use crate::{ CLIENT_FILE_TODOLIST, CLIENT_FILE_WORKSPACE, CLIENT_FOLDER_WORKSPACE_ROOT_NAME, CLIENT_PATH_LOCAL_SHEET, CLIENT_SUFFIX_LOCAL_SHEET_FILE, KEY_ACCOUNT, KEY_SHEET_NAME, }, - current::{current_local_path, find_local_path}, data::{ local::{ - config::LocalConfig, local_sheet::{LocalSheet, LocalSheetData, LocalSheetPathBuf}, + workspace_config::LocalConfig, }, member::MemberId, sheet::SheetName, }, + env::{current_local_path, find_local_path}, }; -pub mod align; +pub mod align_tasks; pub mod cached_sheet; -pub mod config; pub mod latest_file_data; pub mod latest_info; pub mod local_files; pub mod local_sheet; -pub mod vault_modified; +pub mod modified_status; pub mod workspace_analyzer; +pub mod workspace_config; pub struct LocalWorkspace { config: Arc<Mutex<LocalConfig>>, diff --git a/data/src/data/local/align.rs b/data/src/data/local/align_tasks.rs index b72804c..b72804c 100644 --- a/data/src/data/local/align.rs +++ b/data/src/data/local/align_tasks.rs diff --git a/data/src/data/local/cached_sheet.rs b/data/src/data/local/cached_sheet.rs index 8394006..46b390f 100644 --- a/data/src/data/local/cached_sheet.rs +++ b/data/src/data/local/cached_sheet.rs @@ -9,8 +9,8 @@ use crate::{ CLIENT_FILE_CACHED_SHEET, CLIENT_PATH_CACHED_SHEET, CLIENT_SUFFIX_CACHED_SHEET_FILE, KEY_SHEET_NAME, }, - current::current_local_path, data::sheet::{SheetData, SheetName}, + env::current_local_path, }; pub type CachedSheetPathBuf = PathBuf; diff --git a/data/src/data/local/latest_file_data.rs b/data/src/data/local/latest_file_data.rs index 95de015..f9b3aeb 100644 --- a/data/src/data/local/latest_file_data.rs +++ b/data/src/data/local/latest_file_data.rs @@ -5,11 +5,11 @@ use serde::{Deserialize, Serialize}; use crate::{ constants::{CLIENT_FILE_LATEST_DATA, CLIENT_FILE_MEMBER_HELD_NOSET, KEY_ACCOUNT}, - current::current_local_path, data::{ member::MemberId, vault::virtual_file::{VirtualFileId, VirtualFileVersion, VirtualFileVersionDescription}, }, + env::current_local_path, }; /// # Latest file data diff --git a/data/src/data/local/latest_info.rs b/data/src/data/local/latest_info.rs index ec1e482..5748793 100644 --- a/data/src/data/local/latest_info.rs +++ b/data/src/data/local/latest_info.rs @@ -13,7 +13,7 @@ use crate::{ member::{Member, MemberId}, sheet::{SheetData, SheetName, SheetPathBuf}, vault::{ - sheet_share::{Share, SheetShareId}, + mapping_share::{Share, SheetShareId}, virtual_file::VirtualFileId, }, }, diff --git a/data/src/data/local/vault_modified.rs b/data/src/data/local/modified_status.rs index 563d11f..e0e6dd5 100644 --- a/data/src/data/local/vault_modified.rs +++ b/data/src/data/local/modified_status.rs @@ -1,4 +1,4 @@ -use crate::{constants::CLIENT_FILE_VAULT_MODIFIED, current::current_local_path}; +use crate::{constants::CLIENT_FILE_VAULT_MODIFIED, env::current_local_path}; pub async fn check_vault_modified() -> bool { let Some(current_dir) = current_local_path() else { diff --git a/data/src/data/local/config.rs b/data/src/data/local/workspace_config.rs index 08c25ff..f97d049 100644 --- a/data/src/data/local/config.rs +++ b/data/src/data/local/workspace_config.rs @@ -14,11 +14,11 @@ use crate::constants::CLIENT_PATH_WORKSPACE_ROOT; use crate::constants::KEY_ACCOUNT; use crate::constants::KEY_SHEET_NAME; use crate::constants::PORT; -use crate::current::current_local_path; use crate::data::local::latest_info::LatestInfo; use crate::data::member::MemberId; use crate::data::sheet::SheetName; -use crate::data::vault::config::VaultUuid; +use crate::data::vault::vault_config::VaultUuid; +use crate::env::current_local_path; #[derive(Serialize, Deserialize, ConfigFile, Clone)] #[cfg_file(path = CLIENT_FILE_WORKSPACE)] diff --git a/data/src/data/user.rs b/data/src/data/user.rs index 9f52fdc..a2326fa 100644 --- a/data/src/data/user.rs +++ b/data/src/data/user.rs @@ -1,4 +1,4 @@ -use crate::current::current_cfg_dir; +use crate::env::current_cfg_dir; use std::path::PathBuf; pub mod accounts; diff --git a/data/src/data/vault.rs b/data/src/data/vault.rs index 595997a..0f93016 100644 --- a/data/src/data/vault.rs +++ b/data/src/data/vault.rs @@ -8,15 +8,15 @@ use crate::{ 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}, + data::{member::Member, vault::vault_config::VaultConfig}, + env::{current_vault_path, find_vault_path}, }; -pub mod config; -pub mod member; -pub mod service; -pub mod sheet_share; -pub mod sheets; +pub mod lock_status; +pub mod mapping_share; +pub mod member_manage; +pub mod sheet_manage; +pub mod vault_config; pub mod virtual_file; pub struct Vault { diff --git a/data/src/data/vault/service.rs b/data/src/data/vault/lock_status.rs index 3f59c30..3f59c30 100644 --- a/data/src/data/vault/service.rs +++ b/data/src/data/vault/lock_status.rs diff --git a/data/src/data/vault/sheet_share.rs b/data/src/data/vault/mapping_share.rs index 5d27859..5d27859 100644 --- a/data/src/data/vault/sheet_share.rs +++ b/data/src/data/vault/mapping_share.rs diff --git a/data/src/data/vault/member.rs b/data/src/data/vault/member_manage.rs index 9d22d09..9d22d09 100644 --- a/data/src/data/vault/member.rs +++ b/data/src/data/vault/member_manage.rs diff --git a/data/src/data/vault/sheets.rs b/data/src/data/vault/sheet_manage.rs index c22c849..c22c849 100644 --- a/data/src/data/vault/sheets.rs +++ b/data/src/data/vault/sheet_manage.rs diff --git a/data/src/data/vault/config.rs b/data/src/data/vault/vault_config.rs index caa8552..caa8552 100644 --- a/data/src/data/vault/config.rs +++ b/data/src/data/vault/vault_config.rs diff --git a/data/src/current.rs b/data/src/env.rs index 209c0cc..209c0cc 100644 --- a/data/src/current.rs +++ b/data/src/env.rs diff --git a/data/src/lib.rs b/data/src/lib.rs index 1b41391..df2ec34 100644 --- a/data/src/lib.rs +++ b/data/src/lib.rs @@ -1,5 +1,5 @@ pub mod constants; -pub mod current; +pub mod env; #[allow(dead_code)] pub mod data; diff --git a/data/tests/src/test_local_workspace_setup_and_account_management.rs b/data/tests/src/test_local_workspace_setup_and_account_management.rs index 8fa2676..edb9295 100644 --- a/data/tests/src/test_local_workspace_setup_and_account_management.rs +++ b/data/tests/src/test_local_workspace_setup_and_account_management.rs @@ -4,7 +4,7 @@ use cfg_file::config::ConfigFile; use vcs_data::{ constants::{CLIENT_FILE_TODOLIST, CLIENT_FILE_WORKSPACE, USER_FILE_KEY, USER_FILE_MEMBER}, data::{ - local::{LocalWorkspace, config::LocalConfig}, + local::{LocalWorkspace, workspace_config::LocalConfig}, member::Member, user::UserDirectory, }, diff --git a/data/tests/src/test_sheet_creation_management_and_persistence.rs b/data/tests/src/test_sheet_creation_management_and_persistence.rs index 6683d06..adff1bd 100644 --- a/data/tests/src/test_sheet_creation_management_and_persistence.rs +++ b/data/tests/src/test_sheet_creation_management_and_persistence.rs @@ -6,7 +6,7 @@ use vcs_data::{ data::{ member::{Member, MemberId}, sheet::SheetName, - vault::{Vault, config::VaultConfig, virtual_file::VirtualFileId}, + vault::{Vault, vault_config::VaultConfig, virtual_file::VirtualFileId}, }, }; diff --git a/data/tests/src/test_sheet_share_creation_and_management.rs b/data/tests/src/test_sheet_share_creation_and_management.rs index 89891d6..5123360 100644 --- a/data/tests/src/test_sheet_share_creation_and_management.rs +++ b/data/tests/src/test_sheet_share_creation_and_management.rs @@ -8,8 +8,8 @@ use vcs_data::{ sheet::{SheetName, SheetPathBuf}, vault::{ Vault, - config::VaultConfig, - sheet_share::{Share, ShareMergeMode, SheetShareId}, + mapping_share::{Share, ShareMergeMode, SheetShareId}, + vault_config::VaultConfig, virtual_file::VirtualFileId, }, }, diff --git a/data/tests/src/test_vault_setup_and_member_register.rs b/data/tests/src/test_vault_setup_and_member_register.rs index 286a4a2..d34e48e 100644 --- a/data/tests/src/test_vault_setup_and_member_register.rs +++ b/data/tests/src/test_vault_setup_and_member_register.rs @@ -8,7 +8,7 @@ use vcs_data::{ }, data::{ member::Member, - vault::{Vault, config::VaultConfig}, + vault::{Vault, vault_config::VaultConfig}, }, }; diff --git a/data/tests/src/test_virtual_file_creation_and_update.rs b/data/tests/src/test_virtual_file_creation_and_update.rs index 2d9d393..a09f7dc 100644 --- a/data/tests/src/test_virtual_file_creation_and_update.rs +++ b/data/tests/src/test_virtual_file_creation_and_update.rs @@ -14,7 +14,7 @@ use vcs_data::{ constants::SERVER_FILE_VAULT, data::{ member::Member, - vault::{Vault, config::VaultConfig, virtual_file::VirtualFileVersionDescription}, + vault::{Vault, vault_config::VaultConfig, virtual_file::VirtualFileVersionDescription}, }, }; |