From d100e788722019926b4e2a16cd9daa49953e4573 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Sat, 28 Dec 2024 13:58:19 +0100
Subject: [PATCH] mpd: add uri and filename format arguments

---
 man/waybar-mpd.5.scd    | 4 ++++
 src/modules/mpd/mpd.cpp | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/man/waybar-mpd.5.scd b/man/waybar-mpd.5.scd
index 84abc2e8f..d310efd4a 100644
--- a/man/waybar-mpd.5.scd
+++ b/man/waybar-mpd.5.scd
@@ -204,6 +204,10 @@ Addressed by *mpd*
 
 *{queueLength}*: The length of the current queue.
 
+*{uri}*: The URI of the song relative to the MPD music directory.
+
+*{filename}* The last part of the URI.
+
 *{stateIcon}*: The icon corresponding to the playing or paused status of the player (see *state-icons* option)
 
 *{consumeIcon}*: The icon corresponding the "consume" option (see *consume-icons* option)
diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp
index 192e6c1ad..396ce3e16 100644
--- a/src/modules/mpd/mpd.cpp
+++ b/src/modules/mpd/mpd.cpp
@@ -118,7 +118,7 @@ void waybar::modules::MPD::setLabel() {
 
   auto format = format_;
   Glib::ustring artist, album_artist, album, title;
-  std::string date, filename;
+  std::string date, filename, uri;
   int song_pos = 0, queue_length = 0, volume = 0;
   std::chrono::seconds elapsedTime, totalTime;
 
@@ -151,6 +151,7 @@ void waybar::modules::MPD::setLabel() {
     title = sanitize_string(getTag(MPD_TAG_TITLE));
     date = sanitize_string(getTag(MPD_TAG_DATE));
     filename = sanitize_string(getFilename());
+    uri = mpd_song_get_uri(song_.get());
     song_pos = mpd_status_get_song_pos(status_.get()) + 1;
     volume = mpd_status_get_volume(status_.get());
     if (volume < 0) {
@@ -184,7 +185,8 @@ void waybar::modules::MPD::setLabel() {
         fmt::arg("songPosition", song_pos), fmt::arg("queueLength", queue_length),
         fmt::arg("stateIcon", stateIcon), fmt::arg("consumeIcon", consumeIcon),
         fmt::arg("randomIcon", randomIcon), fmt::arg("repeatIcon", repeatIcon),
-        fmt::arg("singleIcon", singleIcon), fmt::arg("filename", filename));
+        fmt::arg("singleIcon", singleIcon), fmt::arg("filename", filename),
+        fmt::arg("uri", uri));
     if (text.empty()) {
       label_.hide();
     } else {
@@ -208,7 +210,8 @@ void waybar::modules::MPD::setLabel() {
                       fmt::arg("totalTime", totalTime), fmt::arg("songPosition", song_pos),
                       fmt::arg("queueLength", queue_length), fmt::arg("stateIcon", stateIcon),
                       fmt::arg("consumeIcon", consumeIcon), fmt::arg("randomIcon", randomIcon),
-                      fmt::arg("repeatIcon", repeatIcon), fmt::arg("singleIcon", singleIcon));
+                      fmt::arg("repeatIcon", repeatIcon), fmt::arg("singleIcon", singleIcon),
+                      fmt::arg("filename", filename), fmt::arg("uri", uri));
       label_.set_tooltip_text(tooltip_text);
     } catch (fmt::format_error const& e) {
       spdlog::warn("mpd: format error (tooltip): {}", e.what());