Sanitize the dbus path for aura devices (remove '.' chars)

This commit is contained in:
Luke D. Jones
2024-05-10 19:37:18 +12:00
parent f131a3fa70
commit fd72a04bb8
4 changed files with 21 additions and 16 deletions

View File

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Further tweaks to aura init - Further tweaks to aura init
- More logging - More logging
- Fix TUF laptop led power - Fix TUF laptop led power
- Sanitize the dbus path for aura devices (remove `.` chars)
## [v6.0.5] ## [v6.0.5]

28
Cargo.lock generated
View File

@@ -117,7 +117,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]] [[package]]
name = "asusctl" name = "asusctl"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"asusd", "asusd",
"cargo-husky", "cargo-husky",
@@ -135,7 +135,7 @@ dependencies = [
[[package]] [[package]]
name = "asusd" name = "asusd"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"concat-idents", "concat-idents",
@@ -161,7 +161,7 @@ dependencies = [
[[package]] [[package]]
name = "asusd-user" name = "asusd-user"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"config-traits", "config-traits",
@@ -828,7 +828,7 @@ dependencies = [
[[package]] [[package]]
name = "config-traits" name = "config-traits"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"log", "log",
@@ -934,7 +934,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
[[package]] [[package]]
name = "cpuctl" name = "cpuctl"
version = "6.0.5" version = "6.0.6"
[[package]] [[package]]
name = "cpufeatures" name = "cpufeatures"
@@ -1134,7 +1134,7 @@ dependencies = [
[[package]] [[package]]
name = "dmi_id" name = "dmi_id"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"log", "log",
"udev 0.8.0", "udev 0.8.0",
@@ -3309,7 +3309,7 @@ dependencies = [
[[package]] [[package]]
name = "rog-control-center" name = "rog-control-center"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"asusd", "asusd",
"betrayer", "betrayer",
@@ -3341,7 +3341,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_anime" name = "rog_anime"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"dmi_id", "dmi_id",
@@ -3358,7 +3358,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_aura" name = "rog_aura"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"dmi_id", "dmi_id",
@@ -3372,7 +3372,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_dbus" name = "rog_dbus"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"asusd", "asusd",
"cargo-husky", "cargo-husky",
@@ -3386,7 +3386,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_platform" name = "rog_platform"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"concat-idents", "concat-idents",
@@ -3401,7 +3401,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_profiles" name = "rog_profiles"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"log", "log",
@@ -3415,7 +3415,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_simulators" name = "rog_simulators"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"log", "log",
"rog_anime", "rog_anime",
@@ -3425,7 +3425,7 @@ dependencies = [
[[package]] [[package]]
name = "rog_slash" name = "rog_slash"
version = "6.0.5" version = "6.0.6"
dependencies = [ dependencies = [
"cargo-husky", "cargo-husky",
"dmi_id", "dmi_id",

View File

@@ -1,5 +1,5 @@
[workspace.package] [workspace.package]
version = "6.0.5" version = "6.0.6"
rust-version = "1.77" rust-version = "1.77"
license = "MPL-2.0" license = "MPL-2.0"
readme = "README.md" readme = "README.md"

View File

@@ -1,3 +1,4 @@
use log::warn;
use udev::Device; use udev::Device;
use zbus::zvariant::{ObjectPath, OwnedObjectPath}; use zbus::zvariant::{ObjectPath, OwnedObjectPath};
@@ -23,7 +24,10 @@ pub(super) fn filename_partial(parent: &Device) -> Option<OwnedObjectPath> {
} else { } else {
format!("{id_product}") 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 None
} }