From fd72a04bb8ae7361de749ab0278b5c15456a1458 Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Fri, 10 May 2024 19:37:18 +1200
Subject: [PATCH] Sanitize the dbus path for aura devices (remove '.' chars)

---
 CHANGELOG.md               |  1 +
 Cargo.lock                 | 28 ++++++++++++++--------------
 Cargo.toml                 |  2 +-
 asusd/src/ctrl_aura/mod.rs |  6 +++++-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b02ddff..259d8aae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Further tweaks to aura init
 - More logging
 - Fix TUF laptop led power
+- Sanitize the dbus path for aura devices (remove `.` chars)
 
 ## [v6.0.5]
 
diff --git a/Cargo.lock b/Cargo.lock
index 56f707a7..b7658ab8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,7 +117,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "asusctl"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "asusd",
  "cargo-husky",
@@ -135,7 +135,7 @@ dependencies = [
 
 [[package]]
 name = "asusd"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "concat-idents",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "asusd-user"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "config-traits",
@@ -828,7 +828,7 @@ dependencies = [
 
 [[package]]
 name = "config-traits"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "log",
@@ -934,7 +934,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
 [[package]]
 name = "cpuctl"
-version = "6.0.5"
+version = "6.0.6"
 
 [[package]]
 name = "cpufeatures"
@@ -1134,7 +1134,7 @@ dependencies = [
 
 [[package]]
 name = "dmi_id"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "log",
  "udev 0.8.0",
@@ -3309,7 +3309,7 @@ dependencies = [
 
 [[package]]
 name = "rog-control-center"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "asusd",
  "betrayer",
@@ -3341,7 +3341,7 @@ dependencies = [
 
 [[package]]
 name = "rog_anime"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "dmi_id",
@@ -3358,7 +3358,7 @@ dependencies = [
 
 [[package]]
 name = "rog_aura"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "dmi_id",
@@ -3372,7 +3372,7 @@ dependencies = [
 
 [[package]]
 name = "rog_dbus"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "asusd",
  "cargo-husky",
@@ -3386,7 +3386,7 @@ dependencies = [
 
 [[package]]
 name = "rog_platform"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "concat-idents",
@@ -3401,7 +3401,7 @@ dependencies = [
 
 [[package]]
 name = "rog_profiles"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "log",
@@ -3415,7 +3415,7 @@ dependencies = [
 
 [[package]]
 name = "rog_simulators"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "log",
  "rog_anime",
@@ -3425,7 +3425,7 @@ dependencies = [
 
 [[package]]
 name = "rog_slash"
-version = "6.0.5"
+version = "6.0.6"
 dependencies = [
  "cargo-husky",
  "dmi_id",
diff --git a/Cargo.toml b/Cargo.toml
index 63ca410e..fc7fc819 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "6.0.5"
+version = "6.0.6"
 rust-version = "1.77"
 license = "MPL-2.0"
 readme = "README.md"
diff --git a/asusd/src/ctrl_aura/mod.rs b/asusd/src/ctrl_aura/mod.rs
index 60807428..e9506738 100644
--- a/asusd/src/ctrl_aura/mod.rs
+++ b/asusd/src/ctrl_aura/mod.rs
@@ -1,3 +1,4 @@
+use log::warn;
 use udev::Device;
 use zbus::zvariant::{ObjectPath, OwnedObjectPath};
 
@@ -23,7 +24,10 @@ pub(super) fn filename_partial(parent: &Device) -> Option<OwnedObjectPath> {
         } else {
             format!("{id_product}")
         };
-        return Some(ObjectPath::from_str_unchecked(&path).into());
+        if path.contains('.') {
+            warn!("dbus path for {id_product} contains `.`, removing");
+        }
+        return Some(ObjectPath::from_str_unchecked(path.trim_matches('.')).into());
     }
     None
 }