use stable versions and features to be more crates.io-friendly

Cargo.toml

@@ -16,11 +16,8 @@ album-art = ["ureq", "image"]
 # Macro to generate error types from enums
 thiserror = "1"
 
-# Pure Rust library for accessing D-Bus. A specific revision ahead of latest
-# release (0.17) is used to support Marshal/Unmarshal on enums, as well as get
-# back better typed errors. Move to 0.18 when 0.18 is cut.
-rustbus        = { git = "https://github.com/KillingSpark/rustbus", rev = "1dfd01d0ef6be915a7a50d501da849703b636f68" }
-rustbus_derive = { git = "https://github.com/KillingSpark/rustbus", rev = "1dfd01d0ef6be915a7a50d501da849703b636f68" }
+# Pure Rust library for accessing D-Bus.
+rustbus = "0.17"
 
 # Logging facade and simple output logger
 log = "0.4"

src/dbus.rs

@@ -5,7 +5,7 @@ use thiserror::Error;
 #[derive(Debug, Error)]
 pub enum DBusError {
     #[error("error connecting to D-Bus")]
-    Connection(#[from] rustbus::connection::Error),
+    Connection(rustbus::connection::Error),
 
     #[error("Unexpected D-Bus message format")]
     Invalid(String),
@@ -14,16 +14,39 @@ pub enum DBusError {
     Generic(String),
 
     #[error("error unmarshalling D-Bus message")]
-    Unmarshal(#[from] rustbus::wire::errors::UnmarshalError),
+    Unmarshal(rustbus::wire::unmarshal::Error),
 
     #[error("error marshalling D-Bus message")]
-    Marshal(#[from] rustbus::wire::errors::MarshalError),
+    Marshal(rustbus::wire::marshal::Error),
+
+    #[error("rustbus message error")]
+    Message(rustbus::Error)
 }
 
 pub struct DBusConnection {
     connection: DuplexConn,
 }
 
+impl From<rustbus::connection::Error> for DBusError {
+    fn from(err: rustbus::connection::Error) -> Self {
+        DBusError::Connection(err)
+    }
+}
+
+impl From<rustbus::wire::unmarshal::Error> for DBusError {
+    fn from(err: rustbus::wire::unmarshal::Error) -> Self {
+        DBusError::Unmarshal(err)
+    }
+}
+
+impl From<rustbus::Error> for DBusError {
+    fn from(err: rustbus::Error) -> Self {
+        DBusError::Message(err)
+    }
+}
+
+
+
 impl DBusConnection {
     pub fn new() -> Result<Self, DBusError> {
         let (connection, _) = Self::connect()?;

src/main.rs

@@ -1,5 +1,3 @@
-#![feature(is_some_with)]
-
 #[cfg(feature = "album-art")]
 mod art;
 

src/notifier.rs

@@ -6,7 +6,7 @@ use crate::formatter::FormattedNotification;
 use crate::mpris::PlayerMetadata;
 use crate::Configuration;
 use rustbus::MessageBuilder;
-use rustbus::{Marshal, Signature, Unmarshal};
+use rustbus::{dbus_variant_sig, Marshal, Unmarshal, Signature};
 use std::collections::HashMap;
 
 const NOTIFICATION_NAMESPACE: &str = "org.freedesktop.Notifications";
@@ -17,16 +17,11 @@ pub struct Notifier {
     configuration: Configuration,
 }
 
-// HACK - This is used to get Rustbus to marshal a nested Dict has <String,
-// Variant> (rather than as <String, String>).
-#[derive(Marshal, Unmarshal, Signature, Debug)]
-enum HintVariant {
-    String(String),
-    ImageData(NotificationImage),
-}
+type NotificationHintMap = HashMap<String, NotificationHintVariant>;
+dbus_variant_sig!(NotificationHintVariant, CaseString => String; CaseNotificationImage => NotificationImage);
 
 // See: https://specifications.freedesktop.org/notification-spec/notification-spec-latest.html#icons-and-images
-#[derive(Marshal, Unmarshal, Signature, Debug)]
+#[derive(Marshal, Unmarshal, Signature, Debug, Eq, PartialEq)]
 pub struct NotificationImage {
     width: i32,
     height: i32,
@@ -82,13 +77,13 @@ impl Notifier {
         message.body.push_param(subject)?; // summary
         message.body.push_param(body)?; // body
         message.body.push_param(Vec::<String>::new())?; // actions (array of strings)
-        let mut hints: HashMap<String, HintVariant> = HashMap::new();
+        let mut hints: NotificationHintMap = HashMap::new();
         hints.insert(
             "x-canonical-private-synchronous".to_string(),
-            HintVariant::String(NOTIFICATION_SOURCE.to_string()),
+            NotificationHintVariant::CaseString(NOTIFICATION_SOURCE.to_string()),
         );
         if let Some(album_art) = album_art {
-            hints.insert("image-data".to_string(), HintVariant::ImageData(album_art));
+            hints.insert("image-data".to_string(), NotificationHintVariant::CaseNotificationImage(album_art));
         }
         message.body.push_param(&hints)?; // hints (dict of a{sv})
         message.body.push_param(-1_i32)?; // timeout

src/signal_handler.rs

@@ -50,8 +50,9 @@ impl SignalHandler {
             }
 
             // Don't notify for the same track twice, unless we're resuming play
-            if previous_track_id.is_some_and(|id| *id == metadata.track_id)
-                || previous_status.is_some_and(|status| *status != PlayerStatus::Playing)
+            if previous_track_id.is_some()
+                && (previous_track_id.unwrap() == metadata.track_id
+                    || previous_status.unwrap() != PlayerStatus::Playing)
             {
                 return Ok(());
             }