From a0e5d92bf989f9e63a166c2f714bfa4e82e94d46 Mon Sep 17 00:00:00 2001
From: Eric Coissac <eric@coissac.eu>
Date: Mon, 27 Oct 2025 08:00:57 +0100
Subject: [PATCH] stream radio paradise

---
 Cargo.lock                          | 10 ++++++++
 pmoparadise/src/paradise/channel.rs | 39 +++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 072fbbe7..a7025439 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2785,9 +2785,19 @@ dependencies = [
 name = "pmoplaylist"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
+ "once_cell",
+ "pmoaudiocache",
+ "pmocache",
+ "pmoconfig",
  "pmodidl",
+ "pmoupnp",
+ "rusqlite",
  "serde",
+ "serde_json",
+ "thiserror 1.0.69",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
diff --git a/pmoparadise/src/paradise/channel.rs b/pmoparadise/src/paradise/channel.rs
index 4e5a49f5..9953b061 100644
--- a/pmoparadise/src/paradise/channel.rs
+++ b/pmoparadise/src/paradise/channel.rs
@@ -341,18 +341,41 @@ impl ParadiseClientStream {
                 "🎧 Client connecting to stream"
             );
             channel.ensure_started().await?;
-            let mut index = 0usize;
+            let mut last_track_id: Option<String> = None;
             loop {
                 let entries = channel.playlist().active_snapshot().await;
 
-                if index >= entries.len() {
-                    channel.ensure_started().await?;
-                    channel.playlist().wait_for_track_count(index).await;
-                    continue;
-                }
+                // Find the next track after last_track_id
+                let next_entry = if let Some(ref last_id) = last_track_id {
+                    // Find the position of the last track we read
+                    let last_pos = entries.iter().position(|e| e.track_id == *last_id);
 
-                let entry = entries[index].clone();
-                index += 1;
+                    // Get the next track (or wait if none available)
+                    match last_pos {
+                        Some(pos) if pos + 1 < entries.len() => {
+                            Some(entries[pos + 1].clone())
+                        }
+                        _ => {
+                            // Last track not found (was removed) or no next track available
+                            // Wait for more tracks to be added
+                            channel.ensure_started().await?;
+                            let current_len = entries.len();
+                            channel.playlist().wait_for_track_count(current_len).await;
+                            continue;
+                        }
+                    }
+                } else {
+                    // First track for this client
+                    if entries.is_empty() {
+                        channel.ensure_started().await?;
+                        channel.playlist().wait_for_track_count(0).await;
+                        continue;
+                    }
+                    Some(entries[0].clone())
+                };
+
+                let entry = next_entry.unwrap();
+                last_track_id = Some(entry.track_id.clone());
 
                 let audio_pk = entry
                     .audio_pk