From d566d8792f4af772ca8f21af13f64b7a71271777 Mon Sep 17 00:00:00 2001
From: Sijmen <me@vijf.life>
Date: Sat, 23 Dec 2023 09:25:57 +0100
Subject: [PATCH] Add consume and shuffle buttons

---
 src/main.rs           | 30 +++++++++++++++++++++++++++++-
 src/routes/player.rs  |  4 ++++
 static/style.css      |  5 ++++-
 templates/index.html  |  2 +-
 templates/player.html | 12 ++++++++++++
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 336e4a3..8bec5d0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,6 +26,29 @@ async fn post_next(_req: tide::Request<()>) -> tide::Result {
     Ok("".into())
 }
 
+async fn post_consume(_req: tide::Request<()>) -> tide::Result {
+    let mut mpd = mpd::get_instance().await;
+
+    let status = mpd.command("status").await?.into_hashmap();
+    let consume = status["consume"] == "1";
+
+    mpd.command(&format!("consume {}", if consume { 0 } else { 1 }))
+        .await?;
+    Ok("".into())
+}
+
+async fn post_shuffle(_req: tide::Request<()>) -> tide::Result {
+    let mut mpd = mpd::get_instance().await;
+
+    let status = mpd.command("status").await?.into_hashmap();
+    let random = status["random"] == "1";
+
+    mpd.command(&format!("random {}", if random { 0 } else { 1 }))
+        .await?;
+
+    Ok("".into())
+}
+
 async fn sse(_req: tide::Request<()>, sender: tide::sse::Sender) -> tide::Result<()> {
     // Update everything on connect
     sender.send("playlist", "", None).await?;
@@ -35,7 +58,9 @@ async fn sse(_req: tide::Request<()>, sender: tide::sse::Sender) -> tide::Result
     mpd.connect().await.unwrap();
 
     loop {
-        let systems = mpd.idle(&["playlist", "player", "database"]).await?;
+        let systems = mpd
+            .idle(&["playlist", "player", "database", "options"])
+            .await?;
         for system in systems {
             sender.send(&system, "", None).await?;
         }
@@ -68,6 +93,9 @@ async fn main() -> tide::Result<()> {
     app.at("/previous").post(post_previous);
     app.at("/next").post(post_next);
 
+    app.at("/consume").post(post_consume);
+    app.at("/shuffle").post(post_shuffle);
+
     app.at("/static").serve_dir("static/")?;
 
     let bind = std::env::var("EMPEDE_BIND").unwrap_or("0.0.0.0:8080".to_string());
diff --git a/src/routes/player.rs b/src/routes/player.rs
index 27a6291..af055be 100644
--- a/src/routes/player.rs
+++ b/src/routes/player.rs
@@ -8,6 +8,8 @@ struct PlayerTemplate<'a> {
     song: Option<&'a HashMap<String, String>>,
     name: Option<String>,
     state: &'a str,
+    consume: bool,
+    shuffle: bool,
     elapsed: f32,
     duration: f32,
 }
@@ -30,6 +32,8 @@ pub async fn get_player(_req: tide::Request<()>) -> tide::Result {
         song: if song.is_empty() { None } else { Some(&song) },
         name: None,
         state: &status["state"],
+        consume: status["consume"] == "1",
+        shuffle: status["random"] == "1",
         elapsed,
         duration,
     };
diff --git a/static/style.css b/static/style.css
index 3ed4012..98a4c18 100644
--- a/static/style.css
+++ b/static/style.css
@@ -37,6 +37,9 @@ button {
 button .material-symbols-outlined {
   margin-right: 0.25rem;
 }
+.active {
+  color: #99f;
+}
 
 .browser {
   flex: 1;
@@ -242,7 +245,7 @@ ul.dir li .material-symbols-outlined {
   flex-flow: column;
   background-color: #334;
   border-radius: 0.25rem;
-  height: 10.0rem;
+  height: 13.0rem;
 }
 @media (prefers-contrast: more) {
   .player .nowplaying {
diff --git a/templates/index.html b/templates/index.html
index 54fd146..871905b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -33,7 +33,7 @@
     ></div>
 
     <div class="player">
-      <div class="nowplaying" hx-trigger="sse:player" hx-get="/player"></div>
+      <div class="nowplaying" hx-trigger="sse:player,sse:options" hx-get="/player"></div>
 
       <div class="queue-header">
         <div class="queue-next">Next in queue</div>
diff --git a/templates/player.html b/templates/player.html
index 1a502b4..bbf5259 100644
--- a/templates/player.html
+++ b/templates/player.html
@@ -52,6 +52,18 @@
   >skip_next</button>
 </div>
 
+<div class="controls" hx-swap="none" hx-trigger="click,keyUp[key=='Enter']">
+  <button
+    hx-post="/consume"
+    class="control material-symbols-outlined {% if consume %}active{% endif %}" role="button" title="Consume"
+  >delete_sweep</button>
+
+  <button 
+    hx-post="/shuffle"
+    class="control material-symbols-outlined {% if shuffle %}active{% endif %}" role="button" title="Shuffle"
+  >shuffle</button>
+</div>
+
 <div class="progress" style="width: {{ elapsed / duration * 100.0 }}%"></div>
 
 <script>