From 5671f1e5a412e69060075098147b30531e37fef7 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Sat, 19 Dec 2020 00:28:39 +0100 Subject: [PATCH] fix: do not announce unplayable tracks via mpris fixes #349 --- src/mpris.rs | 1 + src/sharing.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mpris.rs b/src/mpris.rs index 24922f1..06432ac 100644 --- a/src/mpris.rs +++ b/src/mpris.rs @@ -46,6 +46,7 @@ fn get_metadata(playable: Option) -> Metadata { Variant(Box::new(Path::from(format!( "/org/ncspot/{}", playable + .filter(|t| t.id().is_some()) .map(|t| t.uri().replace(':', "/")) .unwrap_or_else(|| String::from("0")) )))), diff --git a/src/sharing.rs b/src/sharing.rs index 3733be9..b306dfa 100644 --- a/src/sharing.rs +++ b/src/sharing.rs @@ -1,10 +1,10 @@ #![cfg(feature = "share_clipboard")] +#[cfg(feature = "share_selection")] +use clipboard::x11_clipboard::{Primary, X11ClipboardContext}; #[cfg(not(feature = "share_selection"))] use clipboard::ClipboardContext; use clipboard::ClipboardProvider; -#[cfg(feature = "share_selection")] -use clipboard::x11_clipboard::{X11ClipboardContext, Primary}; #[cfg(not(feature = "share_selection"))] pub fn read_share() -> Option {