feat: get artist is ok

ttimochan · Jul 20, 2023 · f22d211 · f22d211
1 parent 68b1af1
commit f22d211
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 22 deletions.
diff --git a/src/get_media.rs b/src/get_media.rs
@@ -2,14 +2,19 @@
  * @Author: timochan
  * @Date: 2023-07-17 15:23:40
  * @LastEditors: timochan
- * @LastEditTime: 2023-07-20 12:35:42
+ * @LastEditTime: 2023-07-20 15:23:01
  * @FilePath: /processforlinux/src/get_media.rs
  */
 use dbus::arg::RefArg;
 use dbus::blocking::stdintf::org_freedesktop_dbus::Properties;
 use dbus::blocking::{Connection, Proxy};
 
-pub fn get_media() -> Option<(String, String)> {
+pub struct MediaMetadata {
+    pub title: Option<String>,
+    pub artist: Option<String>,
+}
+
+pub fn get_media_metadata() -> Option<MediaMetadata> {
     let media_player_identifiers = [
         "org.mpris.MediaPlayer2.yesplaymusic",
         "org.mpris.MediaPlayer2.netease-cloud-music",
@@ -39,17 +44,43 @@ pub fn get_media() -> Option<(String, String)> {
                 Err(_) => continue, // Try the next media player identifier.
             };
 
-            if let Some(title) = metadata.get("xesam:title") {
-                if let Some(title_str) = title.as_str() {
-                    if let Some(artist) = metadata.get("xesam:artist") {
-                        if let Some(artist_str) = artist.as_str() {
-                            return Some((title_str.to_string(), artist_str.to_string()));
+            let title = metadata
+                .get("xesam:title")
+                .and_then(|title| title.as_str())
+                .map(|title_str| title_str.to_string());
+
+            let artist = if let Some(artist_variant) = metadata.get("xesam:artist") {
+                match artist_variant {
+                    dbus::arg::Variant(boxed_value) => {
+                        if let Some(artist_str) = boxed_value.as_str() {
+                            Some(artist_str.to_string())
+                        } else if let Some(artist_array) = boxed_value.as_iter() {
+                            let artists: Vec<String> = artist_array
+                                .filter_map(|a| a.as_str().map(String::from))
+                                .collect();
+
+                            if !artists.is_empty() {
+                                let artists_str = artists.join(", ");
+                                Some(artists_str)
+                            } else {
+                                println!("No artist information available.");
+                                None
+                            }
+                        } else {
+                            println!("Unknown artist format.");
+                            None
                         }
                     }
                 }
+            } else {
+                None
+            };
+
+            if title.is_some() || artist.is_some() {
+                return Some(MediaMetadata { title, artist });
             }
         }
     }
 
-    None 
+    None // Return None if no valid media player connection or metadata is found.
 }
diff --git a/src/main.rs b/src/main.rs
@@ -2,7 +2,7 @@
  * @Author: timochan
  * @Date: 2023-07-17 11:48:02
  * @LastEditors: timochan
- * @LastEditTime: 2023-07-20 12:35:16
+ * @LastEditTime: 2023-07-20 15:24:01
  * @FilePath: /processforlinux/src/main.rs
  */
 mod get_active_window;
@@ -25,17 +25,20 @@ async fn run_loop() {
                 break;
             }
         };
-        let (media_title, media_artist) = match media_enable.as_str() {
-            "true" => match get_media::get_media() {
-                Some((title, artist)) => (title, artist),
-                None => (String::from("None"), String::new()),
-            },
-            _ => (String::from("None"), String::new()),
-        };
-        println!(
-            "media_title: {} media_artlist: {:?}",
-            media_title, media_artist
-        );
+
+        let mut media_title = String::new();
+        let mut media_artist = String::new();
+        if media_enable == "true" {
+            let media_metadata = match get_media::get_media_metadata() {
+                Some(metadata) => metadata,
+                None => {
+                    eprintln!("Failed to get media metadata");
+                    continue;
+                }
+            };
+            media_title = media_metadata.title.unwrap_or_else(|| "None".to_string());
+            media_artist = media_metadata.artist.unwrap_or_else(|| "None".to_string());
+        }
         let process_name = match get_active_window::get_active_window_process_and_title() {
             Ok(name) => name,
             Err(e) => {

diff --git a/src/reportprocess.rs b/src/reportprocess.rs
@@ -2,7 +2,7 @@
  * @Author: timochan
  * @Date: 2023-07-17 13:50:34
  * @LastEditors: timochan
- * @LastEditTime: 2023-07-20 12:05:50
+ * @LastEditTime: 2023-07-20 15:24:09
  * @FilePath: /processforlinux/src/reportprocess.rs
  */
 use chrono::Utc;
@@ -86,7 +86,6 @@ pub async fn process_report(
 
         println!("--------------------------------------------------");
         println!("This Report Time: {}", this_report_time);
-        println!("This Report payload: {}", &payload);
         println!("Response: {}", &response);
         println!("Next Report Time: {}", next_report_time);
         println!("--------------------------------------------------");