Convert to workspace project

DennisOSRM · Nov 30, 2023 · 1850789 · 1850789
1 parent b233e54
commit 1850789
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,19 +3,15 @@ name = "hms-mqtt-publish"
 version = "0.2.0"
 edition = "2021"
 
+[workspace]
+
 [dependencies]
+anyhow = "1.0.75"
 chrono = "0.4.31"
-crc16 = "0.4.0"
 env_logger = "0.10.1"
+hms2mqtt = { path = "hms2mqtt" }
 log = "0.4.20"
-protobuf = "3.3.0"
 rumqttc = "0.23.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-hostname = "0.3.1"
-toml = "0.8.8"
 serde_derive = "1.0.193"
-anyhow = "1.0.75"
-
-[build-dependencies]
-protobuf-codegen = "3.3.0"
+toml = "0.8.8"
diff --git a/hms2mqtt/Cargo.toml b/hms2mqtt/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "hms2mqtt"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.75"
+crc16 = "0.4.0"
+log = "0.4.20"
+protobuf = "3.3.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_derive = "1.0.193"
+
+[build-dependencies]
+protobuf-codegen = "3.3.0"
diff --git a/build.rs → hms2mqtt/build.rs b/build.rs → hms2mqtt/build.rs
diff --git a/src/home_assistant.rs → hms2mqtt/src/home_assistant.rs b/src/home_assistant.rs → hms2mqtt/src/home_assistant.rs
diff --git a/src/home_assistant_config.rs → hms2mqtt/src/home_assistant_config.rs b/src/home_assistant_config.rs → hms2mqtt/src/home_assistant_config.rs
diff --git a/src/inverter.rs → hms2mqtt/src/inverter.rs b/src/inverter.rs → hms2mqtt/src/inverter.rs
diff --git a/src/lib.rs → hms2mqtt/src/lib.rs b/src/lib.rs → hms2mqtt/src/lib.rs
@@ -1,5 +1,5 @@
-pub mod home_assistant;
 pub mod home_assistant_config;
+pub mod home_assistant;
 pub mod inverter;
 pub mod metric_collector;
 pub mod mqtt_config;

diff --git a/src/metric_collector.rs → hms2mqtt/src/metric_collector.rs b/src/metric_collector.rs → hms2mqtt/src/metric_collector.rs
diff --git a/src/mqtt_config.rs → hms2mqtt/src/mqtt_config.rs b/src/mqtt_config.rs → hms2mqtt/src/mqtt_config.rs
diff --git a/src/mqtt_wrapper.rs → hms2mqtt/src/mqtt_wrapper.rs b/src/mqtt_wrapper.rs → hms2mqtt/src/mqtt_wrapper.rs
diff --git a/src/protos/RealData.proto → hms2mqtt/src/protos/RealData.proto b/src/protos/RealData.proto → hms2mqtt/src/protos/RealData.proto
diff --git a/src/protos/mod.rs → hms2mqtt/src/protos/mod.rs b/src/protos/mod.rs → hms2mqtt/src/protos/mod.rs
diff --git a/src/simple_mqtt.rs → hms2mqtt/src/simple_mqtt.rs b/src/simple_mqtt.rs → hms2mqtt/src/simple_mqtt.rs
diff --git a/src/main.rs b/src/main.rs
@@ -4,11 +4,11 @@
 mod logging;
 mod rumqttc_wrapper;
 
-use hms_mqtt_publish::home_assistant::HomeAssistant;
-use hms_mqtt_publish::inverter::Inverter;
-use hms_mqtt_publish::metric_collector::MetricCollector;
-use hms_mqtt_publish::mqtt_config;
-use hms_mqtt_publish::simple_mqtt::SimpleMqtt;
+use hms2mqtt::home_assistant::HomeAssistant;
+use hms2mqtt::inverter::Inverter;
+use hms2mqtt::metric_collector::MetricCollector;
+use hms2mqtt::mqtt_config;
+use hms2mqtt::simple_mqtt::SimpleMqtt;
 use mqtt_config::MqttConfig;
 use rumqttc_wrapper::RumqttcWrapper;
 use serde_derive::Deserialize;

diff --git a/src/rumqttc_wrapper.rs b/src/rumqttc_wrapper.rs
@@ -1,11 +1,10 @@
-use anyhow::Ok;
-use hms_mqtt_publish::{
+use std::{thread, time::Duration};
+
+use hms2mqtt::{
     mqtt_config::MqttConfig,
     mqtt_wrapper::{self},
 };
 use rumqttc::{Client, MqttOptions};
-use std::thread;
-use std::time::Duration;
 
 pub struct RumqttcWrapper {
     client: Client,