Fix files.

Add license

.github/workflows/release-upload.yml

@@ -8,10 +8,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    
     - uses: actions/checkout@v1
     - name: Pre-build
-      run: apt install -y libdbus-1-dev pkg-config libdbus-1-3
+      run: sudo apt install -y libdbus-1-dev pkg-config libdbus-1-3
     - name: Build
       run: cargo build --verbose --release
       env:

LICENSE-WTFPL

@@ -0,0 +1,13 @@
+        DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+                    Version 2, December 2004 
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> 
+
+ Everyone is permitted to copy and distribute verbatim or modified 
+ copies of this license document, and changing it is allowed as long 
+ as the name is changed. 
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

src/main.rs

@@ -12,6 +12,7 @@ const TRACK_NAME: &str = "#[fg=colour3]";
 const TRACK_ARTIST: &str = "#[fg=colour3]";
 const TRACK_TIME: &str = "#[bg=colour252 fg=colour235 bold]";
 
+#[derive(Debug, Clone)]
 struct TrackInfo {
     title: String,
     artist: String,
@@ -69,57 +70,80 @@ fn cpu_load_bar(bar_len: i32) {
     print!("{:.2} LA1", one);
 }
 
-fn player_info(player: &str) -> Result<TrackInfo, Box<dyn std::error::Error>> {
+fn get_player() -> Result<Vec<String>, Box<dyn std::error::Error>> {
     let conn = Connection::new_session()?;
-    let mut service: String = "org.mpris.MediaPlayer2.".to_owned();
-    service.push_str(player);
-    let proxy = conn.with_proxy(
-        service,
-        "/org/mpris/MediaPlayer2",
-        Duration::from_millis(5000),
-    );
-    let metadata: Box<dyn arg::RefArg> = proxy.get("org.mpris.MediaPlayer2.Player", "Metadata")?;
-    let mut iter = metadata.as_iter().unwrap();
-    let mut track_info = TrackInfo {
-        artist: "".to_string(),
-        title: "".to_string(),
-        position: "".to_string(),
-        duration: "".to_string(),
-        status: "".to_string(),
-    };
-    while let Some(key) = iter.next() {
-        if key.as_str() == Some("xesam:title") {
-            if let Some(title) = iter.next().unwrap().as_str() {
-                track_info.title = title.to_string();
-            }
+    let proxy = conn.with_proxy("org.freedesktop.DBus", "/", Duration::from_millis(5000));
+    let (names,): (Vec<String>,) = proxy.method_call("org.freedesktop.DBus", "ListNames", ())?;
+    let mut players: Vec<String> = Vec::new();
+    for name in names {
+        if name.contains("org.mpris.MediaPlayer2") {
+            players.push(name);
         }
-        if key.as_str() == Some("mpris:length") {
-            if let Some(length) = iter.next().unwrap().as_i64() {
-                track_info.duration = format_time(length / 1000000);
+    }
+
+    Ok(players)
+}
+
+fn player_info(players: Vec<String>) -> Result<TrackInfo, Box<dyn std::error::Error>> {
+    let mut players_vec: Vec<TrackInfo> = Vec::new();
+    for player in players {
+        let mut track_info = TrackInfo {
+            artist: "".to_string(),
+            title: "".to_string(),
+            position: "".to_string(),
+            duration: "".to_string(),
+            status: "".to_string(),
+        };
+        let conn = Connection::new_session()?;
+        let proxy = conn.with_proxy(
+            player,
+            "/org/mpris/MediaPlayer2",
+            Duration::from_millis(5000),
+        );
+        let metadata: Box<dyn arg::RefArg> =
+            proxy.get("org.mpris.MediaPlayer2.Player", "Metadata")?;
+        let mut iter = metadata.as_iter().unwrap();
+        while let Some(key) = iter.next() {
+            if key.as_str() == Some("xesam:title") {
+                if let Some(title) = iter.next().unwrap().as_str() {
+                    track_info.title = title.to_string();
+                }
             }
-        }
-        if key.as_str() == Some("xesam:artist") {
-            if let Some(mut artists) = iter.next().unwrap().as_iter() {
-                while let Some(artist) = artists.next() {
-                    if let Some(mut line) = artist.as_iter() {
-                        track_info.artist = line.next().unwrap().as_str().unwrap().to_string();
+            if key.as_str() == Some("mpris:length") {
+                if let Some(length) = iter.next().unwrap().as_i64() {
+                    track_info.duration = format_time(length / 1000000);
+                }
+            }
+            if key.as_str() == Some("xesam:artist") {
+                if let Some(mut artists) = iter.next().unwrap().as_iter() {
+                    while let Some(artist) = artists.next() {
+                        if let Some(mut line) = artist.as_iter() {
+                            track_info.artist = line.next().unwrap().as_str().unwrap().to_string();
+                        }
                     }
                 }
             }
         }
+        let position: Box<dyn arg::RefArg> =
+            proxy.get("org.mpris.MediaPlayer2.Player", "Position")?;
+        track_info.position = format_time(position.as_i64().unwrap() / 1000000);
+        // ugly
+        let _status_text_box: Box<dyn arg::RefArg> =
+            proxy.get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")?;
+        let _status_text = _status_text_box.as_str().unwrap();
+        match _status_text.as_ref() {
+            "Playing" => track_info.status = "▶".to_string(),
+            "Paused" => track_info.status = "⏸".to_string(),
+            _ => track_info.status = "⏹".to_string(),
+        };
+        players_vec.push(track_info);
     }
-    let position: Box<dyn arg::RefArg> = proxy.get("org.mpris.MediaPlayer2.Player", "Position")?;
-    track_info.position = format_time(position.as_i64().unwrap() / 1000000);
-    // ugly
-    let _status_text_box: Box<dyn arg::RefArg> =
-        proxy.get("org.mpris.MediaPlayer2.Player", "PlaybackStatus")?;
-    let _status_text = _status_text_box.as_str().unwrap();
-    match _status_text.as_ref() {
-        "Playing" => track_info.status = "▶".to_string(),
-        "Paused" => track_info.status = "⏸".to_string(),
-        _ => track_info.status = "⏹".to_string(),
-    };
-    Ok(track_info)
+    for player in &players_vec {
+        if player.status == "▶".to_string() {
+            return Ok(player.clone());
+        }
+    }
+    Ok(players_vec[players_vec.len() - 1].clone())
 }
 
 fn format_time(sec: i64) -> String {
@@ -139,23 +163,51 @@ fn main() {
         2 => match args[1].as_ref() {
             "-cb" => cpu_load_bar(15),
             "-mb" => mem_load_bar(15),
-            "-p" => match player_info("cmus") {
+            "-p" => match player_info(get_player().unwrap()) {
                 Ok(mut track_info) => {
-                    let title_len = 30;
-                    let artist_len = 30;
-                    if track_info.title.len() >= title_len {
-                        track_info.title.truncate(title_len);
-                        track_info.title.push_str("..");
+                    let mut title_len = 30;
+                    let mut artist_len = 30;
+                    let mut separator: String = " - ".to_string();
+                    let max_shift = 6;
+                    if title_len + max_shift >= track_info.title.chars().count() {
+                        title_len = track_info.title.chars().count()
                     }
-                    if track_info.artist.len() >= artist_len {
-                        track_info.artist.truncate(artist_len);
-                        track_info.artist.push_str("..");
+                    if track_info.title.len() > title_len {
+                        let mut title: String = String::new();
+                        let mut counter = 0;
+                        for ch in track_info.title.chars() {
+                            if counter == title_len {
+                                break;
+                            }
+                            title.push(ch);
+                            counter += 1;
+                        }
+                        title.push_str("..");
+                        track_info.title = title;
+                    }
+                    if artist_len + max_shift >= track_info.artist.chars().count() {
+                        artist_len = track_info.artist.chars().count()
+                    }
+                    if track_info.artist.chars().count() == 0 {separator = "".to_string()}
+                    if track_info.artist.len() > artist_len {
+                        let mut artist: String = String::new();
+                        let mut counter = 0;
+                        for ch in track_info.artist.chars() {
+                            if counter == artist_len {
+                                break;
+                            }
+                            artist.push(ch);
+                            counter += 1;
+                        }
+                        artist.push_str("..");
+                        track_info.artist = artist;
                     }
                     println!(
-                        "#[none]#[bold]{}{}{}#[none]{} - {}{} {}[{}/{}] {} {}",
+                        "#[none]#[bold]{}{}{}#[none]{}{}{}{} {}[{}/{}] {} {}",
                         TRACK_NAME,
                         track_info.title,
                         END,
+                        separator,
                         TRACK_ARTIST,
                         track_info.artist,
                         END,