bugfix: add version to user daemon. Fix multiple anime config

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+# [3.5.1] - 2021-04-25
+### Changed
++ Anime:
+  - Fix using multiple configs
+
 # [3.5.0] - 2021-04-25
 ### Changed
 + Keyboard:

Cargo.lock

@@ -206,7 +206,7 @@ dependencies = [
 
 [[package]]
 name = "daemon"
-version = "3.5.0"
+version = "3.5.1"
 dependencies = [
  "env_logger",
  "intel-pstate",
@@ -230,7 +230,7 @@ dependencies = [
 
 [[package]]
 name = "daemon-user"
-version = "1.1.0"
+version = "1.1.1"
 dependencies = [
  "dirs 3.0.1",
  "rog_anime",
@@ -899,7 +899,7 @@ checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
 
 [[package]]
 name = "rog_anime"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
  "gif",
  "glam",

daemon-user/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daemon-user"
-version = "1.1.0"
+version = "1.1.1"
 authors = ["Luke D Jones <luke@ljones.dev>"]
 edition = "2018"
 description = "Usermode daemon for user settings, anime, per-key lighting"
@@ -27,4 +27,4 @@ dirs = "3.0.1"
 
 zbus = "^1.9.1"
 zvariant = "^2.6"
-zvariant_derive = "^2.6"
+zvariant_derive = "^2.6"

daemon-user/src/daemon.rs

@@ -16,7 +16,9 @@ use std::sync::atomic::AtomicBool;
 static ANIME_INNER_EARLY_RETURN: AtomicBool = AtomicBool::new(false);
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    println!("   rog-dbus version {}", rog_dbus::VERSION);
+    println!("user daemon v{}", rog_user::VERSION);
+    println!("  rog-anime v{}", rog_anime::VERSION);
+    println!("   rog-dbus v{}", rog_dbus::VERSION);
 
     let (client, _) = AuraDbusClient::new().unwrap();
     let supported = client.proxies().supported().get_supported_functions()?;

daemon-user/src/lib.rs

@@ -7,3 +7,5 @@ pub mod ctrl_anime;
 pub mod zbus_anime;
 
 pub static DBUS_NAME: &str = "org.asuslinux.Daemon";
+
+pub static VERSION: &str = env!("CARGO_PKG_VERSION");

daemon-user/src/user_config.rs

@@ -63,7 +63,7 @@ impl UserAnimeConfig {
             create_dir(path.clone())?;
         }
 
-        path.push(name + ".cfg");
+        path.push(name.clone() + ".cfg");
 
         let mut file = OpenOptions::new()
             .read(true)
@@ -75,7 +75,7 @@ impl UserAnimeConfig {
 
         if let Ok(read_len) = file.read_to_string(&mut buf) {
             if read_len == 0 {
-                let default = UserAnimeConfig::default();
+                let default = UserAnimeConfig { name, ..Default::default() };
                 let json = serde_json::to_string_pretty(&default).unwrap();
                 file.write_all(json.as_bytes())?;
                 return Ok(default);
@@ -89,7 +89,7 @@ impl UserAnimeConfig {
 
 impl Default for UserAnimeConfig {
     fn default() -> Self {
-        let x = Self {
+        Self {
             name: "default".to_string(),
             anime: vec![
                 AnimeAction::AsusAnimation {
@@ -122,9 +122,7 @@ impl Default for UserAnimeConfig {
                     time: AnimTime::Cycles(2),
                 },
             ],
-        };
+        }
-        println!("{}", serde_json::to_string_pretty(&x).unwrap());
-        x
     }
 }
 

daemon/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "daemon"
-version = "3.5.0"
+version = "3.5.1"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]

rog-anime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rog_anime"
-version = "1.0.3"
+version = "1.0.4"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]

rog-anime/src/lib.rs

@@ -31,3 +31,5 @@ pub mod error;
 
 /// Provides const methods to create the USB HID control packets
 pub mod usb;
+
+pub static VERSION: &str = env!("CARGO_PKG_VERSION");