From f7e72e717d4317cc3a55fb9ca6fb21dd0b8a09f2 Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Wed, 18 Mar 2026 13:13:29 +0000
Subject: [PATCH] move to workspaces

---
 Cargo.lock                  | 18 +++++++++++++++++-
 Cargo.toml                  | 27 +++++++++++----------------
 src/daemon/Cargo.toml       | 12 ++++++++++++
 src/{ => daemon}/battery.rs |  0
 src/{ => daemon}/main.rs    |  0
 src/data/Cargo.toml         | 12 ++++++++++++
 src/{ => data}/data.rs      |  0
 src/tui/Cargo.toml          | 14 ++++++++++++++
 src/tui/data_graph.rs       |  4 +---
 9 files changed, 67 insertions(+), 20 deletions(-)
 create mode 100644 src/daemon/Cargo.toml
 rename src/{ => daemon}/battery.rs (100%)
 rename src/{ => daemon}/main.rs (100%)
 create mode 100644 src/data/Cargo.toml
 rename src/{ => data}/data.rs (100%)
 create mode 100644 src/tui/Cargo.toml

diff --git a/Cargo.lock b/Cargo.lock
index bf82c34..a7327ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,10 +45,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
-name = "battery_logger"
+name = "battery-daemon"
+version = "0.1.0"
+dependencies = [
+ "data",
+ "rkyv",
+]
+
+[[package]]
+name = "battery-tui"
 version = "0.1.0"
 dependencies = [
  "crossterm",
+ "data",
  "ratatui",
  "rkyv",
 ]
@@ -264,6 +273,13 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "data"
+version = "0.1.0"
+dependencies = [
+ "rkyv",
+]
+
 [[package]]
 name = "deltae"
 version = "0.3.2"
diff --git a/Cargo.toml b/Cargo.toml
index 50f17bd..1975f78 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,17 +1,12 @@
-[package]
-name = "battery_logger"
-version = "0.1.0"
-edition = "2024"
+[workspace]
+members = [
+    "src/tui",
+    "src/daemon",
+    "src/data",
+]
+resolver = "2"
 
-[[bin]]
-name = "daemon"
-path = "src/main.rs"
-
-[[bin]]
-name = "tui"
-path = "src/tui/main.rs"
-
-[dependencies]
-crossterm = "0.29.0"
-ratatui = "0.30.0"
-rkyv = {version = "0.8.15"}
+[workspace.dependencies]
+# Define versions here once; crates can inherit them
+rkyv = "0.8.15"
+data = { path = "src/data" }
diff --git a/src/daemon/Cargo.toml b/src/daemon/Cargo.toml
new file mode 100644
index 0000000..38ad643
--- /dev/null
+++ b/src/daemon/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "battery-daemon"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "daemon"
+path = "main.rs"
+
+[dependencies]
+rkyv = { workspace = true }
+data = { workspace = true }
diff --git a/src/battery.rs b/src/daemon/battery.rs
similarity index 100%
rename from src/battery.rs
rename to src/daemon/battery.rs
diff --git a/src/main.rs b/src/daemon/main.rs
similarity index 100%
rename from src/main.rs
rename to src/daemon/main.rs
diff --git a/src/data/Cargo.toml b/src/data/Cargo.toml
new file mode 100644
index 0000000..9422e77
--- /dev/null
+++ b/src/data/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "data"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+path = "data.rs"
+
+[dependencies]
+rkyv = {workspace = true}
+# data = { workspace = true }
diff --git a/src/data.rs b/src/data/data.rs
similarity index 100%
rename from src/data.rs
rename to src/data/data.rs
diff --git a/src/tui/Cargo.toml b/src/tui/Cargo.toml
new file mode 100644
index 0000000..ea558bb
--- /dev/null
+++ b/src/tui/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "battery-tui"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "tui"
+path = "main.rs"
+
+[dependencies]
+rkyv = { workspace = true }
+data.workspace = true
+ratatui = "0.30.0"
+crossterm = "0.29.0"
diff --git a/src/tui/data_graph.rs b/src/tui/data_graph.rs
index a11b6a4..04ff452 100644
--- a/src/tui/data_graph.rs
+++ b/src/tui/data_graph.rs
@@ -1,8 +1,6 @@
 use ratatui::widgets::Dataset;
 
-use crate::data_graph::data::DataChunk;
-#[path = "../data.rs"]
-mod data;
+use data::DataChunk;
 
 trait Graphable {
     fn as_dataset(&self) -> Dataset<'_>;