Merge pull request #17 from JustEnoughVCS/jvcs_dev

Jvcs dev

35 files changed, 39 insertions, 15 deletions

diff --git a/crates/vcs_actions/Cargo.toml b/crates/vcs_actions/Cargo.toml
new file mode 100644
index 0000000..e5a07f6
--- /dev/null
+++ b/crates/vcs_actions/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "vcs_actions"
+edition = "2024"
+version.workspace = true
+
+[dependencies]
+
+# Utils
+tcp_connection = { path = "../utils/tcp_connection" }
+cfg_file = { path = "../utils/cfg_file", features = ["default"] }
+string_proc = { path = "../utils/string_proc" }
+
+# Core dependencies
+action_system = { path = "../system_action" }
+vcs_data = { path = "../vcs_data" }
diff --git a/crates/vcs_actions/src/actions.rs b/crates/vcs_actions/src/actions.rs
new file mode 100644
index 0000000..20bd037
--- /dev/null
+++ b/crates/vcs_actions/src/actions.rs
@@ -0,0 +1,5 @@
+pub mod local_actions;
+pub mod sheet_actions;
+pub mod user_actions;
+pub mod vault_actions;
+pub mod virtual_file_actions;
diff --git a/crates/vcs_actions/src/actions/local_actions.rs b/crates/vcs_actions/src/actions/local_actions.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/crates/vcs_actions/src/actions/local_actions.rs
diff --git a/crates/vcs_actions/src/actions/sheet_actions.rs b/crates/vcs_actions/src/actions/sheet_actions.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/crates/vcs_actions/src/actions/sheet_actions.rs
diff --git a/crates/vcs_actions/src/actions/user_actions.rs b/crates/vcs_actions/src/actions/user_actions.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/crates/vcs_actions/src/actions/user_actions.rs
diff --git a/crates/vcs_actions/src/actions/vault_actions.rs b/crates/vcs_actions/src/actions/vault_actions.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/crates/vcs_actions/src/actions/vault_actions.rs
diff --git a/crates/vcs_actions/src/actions/virtual_file_actions.rs b/crates/vcs_actions/src/actions/virtual_file_actions.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/crates/vcs_actions/src/actions/virtual_file_actions.rs
diff --git a/crates/vcs_actions/src/lib.rs b/crates/vcs_actions/src/lib.rs
new file mode 100644
index 0000000..92de35f
--- /dev/null
+++ b/crates/vcs_actions/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod actions;
+pub mod registry;
diff --git a/crates/vcs_actions/src/registry.rs b/crates/vcs_actions/src/registry.rs
new file mode 100644
index 0000000..ceec1a1
--- /dev/null
+++ b/crates/vcs_actions/src/registry.rs
@@ -0,0 +1,2 @@
+pub mod client_registry;
+pub mod server_registry;
diff --git a/crates/vcs_actions/src/registry/client_registry.rs b/crates/vcs_actions/src/registry/client_registry.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/crates/vcs_actions/src/registry/client_registry.rs
diff --git a/crates/vcs_actions/src/registry/server_registry.rs b/crates/vcs_actions/src/registry/server_registry.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/crates/vcs_actions/src/registry/server_registry.rs
diff --git a/crates/vcs/Cargo.toml b/crates/vcs_data/Cargo.toml
index 888e18d..07f1a6a 100644
--- a/crates/vcs/Cargo.toml
+++ b/crates/vcs_data/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "vcs"
+name = "vcs_data"
 edition = "2024"
 version.workspace = true
 
diff --git a/crates/vcs/src/constants.rs b/crates/vcs_data/src/constants.rs
index 5e147c4..5e147c4 100644
--- a/crates/vcs/src/constants.rs
+++ b/crates/vcs_data/src/constants.rs
diff --git a/crates/vcs/src/current.rs b/crates/vcs_data/src/current.rs
index 97b5058..97b5058 100644
--- a/crates/vcs/src/current.rs
+++ b/crates/vcs_data/src/current.rs
diff --git a/crates/vcs/src/data.rs b/crates/vcs_data/src/data.rs
index ed9383a..ed9383a 100644
--- a/crates/vcs/src/data.rs
+++ b/crates/vcs_data/src/data.rs
diff --git a/crates/vcs/src/data/local.rs b/crates/vcs_data/src/data/local.rs
index 1c99832..1c99832 100644
--- a/crates/vcs/src/data/local.rs
+++ b/crates/vcs_data/src/data/local.rs
diff --git a/crates/vcs/src/data/local/config.rs b/crates/vcs_data/src/data/local/config.rs
index 5444047..5444047 100644
--- a/crates/vcs/src/data/local/config.rs
+++ b/crates/vcs_data/src/data/local/config.rs
diff --git a/crates/vcs/src/data/member.rs b/crates/vcs_data/src/data/member.rs
index b5136a1..b5136a1 100644
--- a/crates/vcs/src/data/member.rs
+++ b/crates/vcs_data/src/data/member.rs
diff --git a/crates/vcs/src/data/sheet.rs b/crates/vcs_data/src/data/sheet.rs
index a6220c9..a6220c9 100644
--- a/crates/vcs/src/data/sheet.rs
+++ b/crates/vcs_data/src/data/sheet.rs
diff --git a/crates/vcs/src/data/user.rs b/crates/vcs_data/src/data/user.rs
index 0abd098..0abd098 100644
--- a/crates/vcs/src/data/user.rs
+++ b/crates/vcs_data/src/data/user.rs
diff --git a/crates/vcs/src/data/user/accounts.rs b/crates/vcs_data/src/data/user/accounts.rs
index d77bc02..d77bc02 100644
--- a/crates/vcs/src/data/user/accounts.rs
+++ b/crates/vcs_data/src/data/user/accounts.rs
diff --git a/crates/vcs/src/data/vault.rs b/crates/vcs_data/src/data/vault.rs
index 5d17a81..5d17a81 100644
--- a/crates/vcs/src/data/vault.rs
+++ b/crates/vcs_data/src/data/vault.rs
diff --git a/crates/vcs/src/data/vault/config.rs b/crates/vcs_data/src/data/vault/config.rs
index 1cfc8ef..6eea25a 100644
--- a/crates/vcs/src/data/vault/config.rs
+++ b/crates/vcs_data/src/data/vault/config.rs
@@ -28,7 +28,7 @@ pub struct VaultServerConfig {
     port: u16,
 
     /// Whether to enable LAN discovery, allowing members on the same LAN to more easily find the upstream server
-    lan_discovery: bool,
+    lan_discovery: bool, // TODO
 
     /// Authentication strength level
     /// 0: Weakest - Anyone can claim any identity, fastest speed
@@ -36,7 +36,7 @@ pub struct VaultServerConfig {
     /// 2: Advanced - Uses asymmetric encryption, multiple devices can use key authentication to log in simultaneously, slightly slower
     /// 3: Secure - Uses asymmetric encryption, only one device can use key for authentication at a time, much slower
     /// Default is "Advanced", if using a lower security policy, ensure your server is only accessible by trusted devices
-    auth_strength: u8,
+    auth_strength: u8, // TODO
 }
 
 impl Default for VaultConfig {
diff --git a/crates/vcs/src/data/vault/member.rs b/crates/vcs_data/src/data/vault/member.rs
index aebd92d..aebd92d 100644
--- a/crates/vcs/src/data/vault/member.rs
+++ b/crates/vcs_data/src/data/vault/member.rs
diff --git a/crates/vcs/src/data/vault/sheets.rs b/crates/vcs_data/src/data/vault/sheets.rs
index 0bba4f5..0bba4f5 100644
--- a/crates/vcs/src/data/vault/sheets.rs
+++ b/crates/vcs_data/src/data/vault/sheets.rs
diff --git a/crates/vcs/src/data/vault/virtual_file.rs b/crates/vcs_data/src/data/vault/virtual_file.rs
index fe83594..fe83594 100644
--- a/crates/vcs/src/data/vault/virtual_file.rs
+++ b/crates/vcs_data/src/data/vault/virtual_file.rs
diff --git a/crates/vcs/src/lib.rs b/crates/vcs_data/src/lib.rs
index 1b41391..1b41391 100644
--- a/crates/vcs/src/lib.rs
+++ b/crates/vcs_data/src/lib.rs
diff --git a/crates/vcs/todo.txt b/crates/vcs_data/todo.txt
index 65c94ef..65c94ef 100644
--- a/crates/vcs/todo.txt
+++ b/crates/vcs_data/todo.txt
diff --git a/crates/vcs/vcs_test/Cargo.toml b/crates/vcs_data/vcs_data_test/Cargo.toml
index 1cc43ac..9dcbd4a 100644
--- a/crates/vcs/vcs_test/Cargo.toml
+++ b/crates/vcs_data/vcs_data_test/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "vcs_test"
+name = "vcs_data_test"
 edition = "2024"
 version.workspace = true
 
@@ -7,7 +7,7 @@ version.workspace = true
 tcp_connection = { path = "../../utils/tcp_connection" }
 tcp_connection_test = { path = "../../utils/tcp_connection/tcp_connection_test" }
 cfg_file = { path = "../../utils/cfg_file", features = ["default"] }
-vcs = { path = "../../vcs" }
+vcs_data = { path = "../../vcs_data" }
 
 # Async & Networking
 tokio = { version = "1.46.1", features = ["full"] }
diff --git a/crates/vcs/vcs_test/lib.rs b/crates/vcs_data/vcs_data_test/lib.rs
index 5b65941..5b65941 100644
--- a/crates/vcs/vcs_test/lib.rs
+++ b/crates/vcs_data/vcs_data_test/lib.rs
diff --git a/crates/vcs/vcs_test/src/lib.rs b/crates/vcs_data/vcs_data_test/src/lib.rs
index 8ad03e1..8ad03e1 100644
--- a/crates/vcs/vcs_test/src/lib.rs
+++ b/crates/vcs_data/vcs_data_test/src/lib.rs
diff --git a/crates/vcs/vcs_test/src/test_local_workspace_setup_and_account_management.rs b/crates/vcs_data/vcs_data_test/src/test_local_workspace_setup_and_account_management.rs
index df766f7..2718d01 100644
--- a/crates/vcs/vcs_test/src/test_local_workspace_setup_and_account_management.rs
+++ b/crates/vcs_data/vcs_data_test/src/test_local_workspace_setup_and_account_management.rs
@@ -1,7 +1,7 @@
 use std::io::Error;
 
 use cfg_file::config::ConfigFile;
-use vcs::{
+use vcs_data::{
     constants::{CLIENT_FILE_README, CLIENT_FILE_WORKSPACE, USER_FILE_KEY, USER_FILE_MEMBER},
     data::{
         local::{LocalWorkspace, config::LocalConfig},
diff --git a/crates/vcs/vcs_test/src/test_sheet_creation_management_and_persistence.rs b/crates/vcs_data/vcs_data_test/src/test_sheet_creation_management_and_persistence.rs
index 3b038a0..461d465 100644
--- a/crates/vcs/vcs_test/src/test_sheet_creation_management_and_persistence.rs
+++ b/crates/vcs_data/vcs_data_test/src/test_sheet_creation_management_and_persistence.rs
@@ -1,7 +1,7 @@
 use std::io::Error;
 
 use cfg_file::config::ConfigFile;
-use vcs::{
+use vcs_data::{
     constants::{SERVER_FILE_SHEET, SERVER_FILE_VAULT},
     data::{
         member::{Member, MemberId},
@@ -53,8 +53,8 @@ async fn test_sheet_creation_management_and_persistence() -> Result<(), std::io:
     let mut sheet = vault.sheet(&sheet_name).await?;
 
     // Add mapping entries for the files
-    let main_rs_path = vcs::data::sheet::SheetPathBuf::from("src/main.rs");
-    let lib_rs_path = vcs::data::sheet::SheetPathBuf::from("src/lib.rs");
+    let main_rs_path = vcs_data::data::sheet::SheetPathBuf::from("src/main.rs");
+    let lib_rs_path = vcs_data::data::sheet::SheetPathBuf::from("src/lib.rs");
     let main_rs_id = VirtualFileId::new();
     let lib_rs_id = VirtualFileId::new();
 
@@ -85,7 +85,7 @@ async fn test_sheet_creation_management_and_persistence() -> Result<(), std::io:
     );
 
     // Test 3: Add mapping entries
-    let mapping_path = vcs::data::sheet::SheetPathBuf::from("output/build.exe");
+    let mapping_path = vcs_data::data::sheet::SheetPathBuf::from("output/build.exe");
     let virtual_file_id = VirtualFileId::new();
 
     sheet
@@ -265,8 +265,8 @@ async fn test_sheet_data_serialization() -> Result<(), std::io::Error> {
         ),
     ];
     // First add mapping entries
-    let main_rs_path = vcs::data::sheet::SheetPathBuf::from("src/main.rs");
-    let lib_rs_path = vcs::data::sheet::SheetPathBuf::from("src/lib.rs");
+    let main_rs_path = vcs_data::data::sheet::SheetPathBuf::from("src/main.rs");
+    let lib_rs_path = vcs_data::data::sheet::SheetPathBuf::from("src/lib.rs");
     let main_rs_id = VirtualFileId::new();
     let lib_rs_id = VirtualFileId::new();
 
@@ -287,7 +287,7 @@ async fn test_sheet_data_serialization() -> Result<(), std::io::Error> {
 
     sheet
         .add_mapping(
-            vcs::data::sheet::SheetPathBuf::from("output/build.exe"),
+            vcs_data::data::sheet::SheetPathBuf::from("output/build.exe"),
             build_exe_id,
         )
         .await?;
diff --git a/crates/vcs/vcs_test/src/test_vault_setup_and_member_register.rs b/crates/vcs_data/vcs_data_test/src/test_vault_setup_and_member_register.rs
index 6a30cf7..80ae39e 100644
--- a/crates/vcs/vcs_test/src/test_vault_setup_and_member_register.rs
+++ b/crates/vcs_data/vcs_data_test/src/test_vault_setup_and_member_register.rs
@@ -1,7 +1,7 @@
 use std::io::Error;
 
 use cfg_file::config::ConfigFile;
-use vcs::{
+use vcs_data::{
     constants::{
         SERVER_FILE_MEMBER_INFO, SERVER_FILE_README, SERVER_FILE_VAULT, SERVER_PATH_MEMBER_PUB,
         SERVER_PATH_MEMBERS, SERVER_PATH_SHEETS, SERVER_PATH_VF_ROOT,
diff --git a/crates/vcs/vcs_test/src/test_virtual_file_creation_and_update.rs b/crates/vcs_data/vcs_data_test/src/test_virtual_file_creation_and_update.rs
index d86c13a..7e30dad 100644
--- a/crates/vcs/vcs_test/src/test_virtual_file_creation_and_update.rs
+++ b/crates/vcs_data/vcs_data_test/src/test_virtual_file_creation_and_update.rs
@@ -10,7 +10,7 @@ use tokio::{
     join,
     time::{sleep, timeout},
 };
-use vcs::{
+use vcs_data::{
     constants::SERVER_FILE_VAULT,
     data::{
         member::Member,