refactor: move config.rs to a seperate crate

name vitaoxipad_config is chosen so as to not conflict with external config crate
DvaMishkiLapa · Jan 25, 2025 · 13e681c · 13e681c
1 parent 2eb9176
commit 13e681c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/client/Cargo.lock b/client/Cargo.lock
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -5,5 +5,5 @@ members = [
     "packages/flatbuffers_structs",
     "packages/protocol",
     "packages/vita_reports",
-    "packages/vita_virtual_device",
+    "packages/vita_virtual_device", "packages/vitaoxipad_config",
 ]
diff --git a/client/packages/cli/Cargo.toml b/client/packages/cli/Cargo.toml
@@ -4,6 +4,7 @@ version = "1.3.0"
 edition = "2021"
 
 [dependencies]
+config = "0.14.1"
 argh = "0.1.12"
 color-eyre = "0.6.3"
 log = "0.4.22"
@@ -15,9 +16,8 @@ protocol = { version = "0.1.0", path = "../protocol" }
 vita_reports = { version = "0.1.0", path = "../vita_reports" }
 vita_virtual_device = { version = "0.1.0", path = "../vita_virtual_device" }
 serde = { version = "1.0.216", features = ["derive"] }
-config = "0.14.1"
-toml = "0.8.19"
-home = "0.5.9"
+vitaoxipad_config = { path = "../vitaoxipad_config" }
+
 
 [build-dependencies]
 build-data = "0.2.1"
diff --git a/client/packages/cli/src/main.rs b/client/packages/cli/src/main.rs
@@ -13,7 +13,7 @@ use flatbuffers_structs::net_protocol::{ConfigArgs, Endpoint, HandshakeArgs};
 use protocol::connection::Connection;
 use vita_virtual_device::{VitaDevice, VitaVirtualDevice};
 
-mod config;
+use vitaoxipad_config::*;
 
 /// Create a virtual controller and fetch its data from a Vita
 /// over the network.
@@ -68,10 +68,10 @@ fn main() -> color_eyre::Result<()> {
     // Do not load existing config while printing sample config
     if !args.sample_config {
         // Load existing config if any
-        config = config::load_config().wrap_err("Failed to load configuration")?;
+        config = load_config().wrap_err("Failed to load configuration")?;
     } else {
         // Show sample configuration
-        config::print_sample_config();
+        print_sample_config();
         return Ok(());
     }
 

diff --git a/client/packages/vitaoxipad_config/Cargo.toml b/client/packages/vitaoxipad_config/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "vitaoxipad_config"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+config = "0.14.1"
+toml = "0.8.19"
+home = "0.5.9"
+serde = { version = "1.0.216", features = ["derive"] }
+color-eyre = "0.6.3"
diff --git a/client/packages/cli/src/config.rs → client/packages/vitaoxipad_config/src/lib.rs b/client/packages/cli/src/config.rs → client/packages/vitaoxipad_config/src/lib.rs