diff --git a/modules/active_modifier.py b/modules/active_modifier.py index 815e185..ef0b7ba 100644 --- a/modules/active_modifier.py +++ b/modules/active_modifier.py @@ -26,7 +26,8 @@ class Module(ActiveModifier): self.skip_indexes = set() def on_new_playlist(self, playlist: list[Track], global_args: dict[str, str]): self.playlist = playlist - self.originals = [] + self.originals.clear() + self.skip_indexes.clear() self.crossfade = float(global_args.get("crossfade", DEFAULT_CROSSFADE)) if not self._imc: return diff --git a/modules/web/index.html b/modules/web/index.html index 9fe58e5..7737b6c 100644 --- a/modules/web/index.html +++ b/modules/web/index.html @@ -42,7 +42,7 @@ .btn.primary:hover { background:linear-gradient(90deg, #3399ee, #5bbaff); } ul.playlist{list-style:none; padding:6px; margin:0; font-family: "Consolas",monospace; font-size:13px;} - ul.playlist li{ padding:4px 6px; border-radius:6px; display:flex; justify-content:space-between; gap:8px; transition: background-color 0.2s ease, transform 0.15s ease; } + ul.playlist li{ padding:4px 6px; border-radius:6px; display:flex; justify-content:space -between; gap:8px; transition: background-color 0.2s ease, transform 0.15s ease; } ul.playlist li:hover{ background:rgba(255,255,255,0.04); } ul.playlist li.current{background:rgba(62,166,255,0.08)} ul.playlist li.selected{background:rgba(62, 165, 255, 0.305)} @@ -52,13 +52,11 @@ .listbox{ height:100%; - min-height:100px; overflow:auto; border-radius:6px; background:var(--card); padding:8px; font-size:14px; - scrollbar-width: none; } .listbox::-webkit-scrollbar { display: none; } @@ -66,14 +64,13 @@ .listbox div.item:hover{background:rgba(255,255,255,0.04); cursor:pointer} .listbox div.item.selected{background:rgba(62, 165, 255, 0.305)} - #section-playlist { flex: 2 1; } + #section-playlist { flex: 2 1; overflow: hidden;} #section-queue { flex: 1; display: flex; flex-direction: column; } #section-queue .collapsible-content { flex-grow: 1; } #section-queue.collapsed .collapsible-content { display: none; } #section-playlist.collapsed + #section-queue { flex: 1 1 auto !important; } .small{font-size:12px; color:var(--muted)} - .muted{color:var(--muted); font-size:13px} .footer{display:flex; justify-content:space-between; gap:5px; align-items:center; margin-top:8px; background:var(--panel); border-radius:10px; padding:8px; box-shadow: 0 8px 18px rgba(2,8,16,0.6);} .directory-grid { display: flex; @@ -114,7 +111,7 @@ #whep-section .collapsible-content { overflow: hidden; max-height: 200px; - transition: max-height 0.3s cubic-bezier(0.4, 0, 0.2, 1); + transition: max-height 0.2s cubic-bezier(0.4, 0, 0.2, 1); } #whep-section.collapsed .collapsible-content { max-height: 0; } #whep-section.collapsed .frame-title::after { transform: rotate(90deg); } @@ -164,7 +161,6 @@ .layout{flex-direction: column; height: auto} .left{min-width:auto} .directory-grid {grid-template-columns: 1fr; height: auto; overflow: visible} - .listbox {min-height: 200px} button, .btn {padding: 10px 14px} .panel.right { height: auto; } #section-playlist, #section-queue { flex: 1 1 auto; } @@ -176,12 +172,13 @@
-

RadioPlayer status

- +
+

RadioPlayer status

+ +
-
Now Playing
@@ -211,10 +208,8 @@
Playlist Viewer
-
-
-
    -
    +
    +
      @@ -266,10 +261,9 @@
      -
      +
      Server: connecting...
      - Keys: S skip N +skip M -skip diff --git a/modules/web/reader.js b/modules/web/reader.js index 7492d9f..2a42798 100644 --- a/modules/web/reader.js +++ b/modules/web/reader.js @@ -445,7 +445,7 @@ class MediaMTXWebRTCReader { }); const direction = 'recvonly'; - this.pc.addTransceiver('video', { direction }); + // this.pc.addTransceiver('video', { direction }); this.pc.addTransceiver('audio', { direction }); // using data channels requires creating a data channel locally diff --git a/modules/web/web.js b/modules/web/web.js index adb575c..2146665 100644 --- a/modules/web/web.js +++ b/modules/web/web.js @@ -10,6 +10,7 @@ let selectedSubFile = null; let basePath = ""; let subbasePath = ""; let skipCount = 0; +let skipCountToRender = 0; let indexDigits = 1; let skipped_idx = []; @@ -17,13 +18,17 @@ function toggleSection(id) { document.getElementById(id).classList.toggle('collapsed'); } +function tnet() { + return window.location.protocol === "file:" || window.location.hostname.includes("tnet") +} + function initLayout() { if (window.innerWidth <= 800) { document.getElementById('section-playlist').classList.add('collapsed'); document.getElementById('section-dirs').classList.add('collapsed'); document.getElementById('section-subdir').classList.add('collapsed'); } - if(window.location.protocol === "file:") document.getElementById("whep-url-input").value = "https://webrtc.terminal.tnet/radio/whep" + if(tnet()) document.getElementById("whep-url-input").value = "https://webrtc.terminal.tnet/radio/whep" } function connectWs() { @@ -31,7 +36,7 @@ function connectWs() { statusText.textContent = "connecting..."; let url = "/ws"; - if(window.location.protocol === "file:") url = "https://radio95.tnet/ws" + if(tnet()) url = "https://radio95.tnet/ws" ws = new WebSocket(url); ws.addEventListener("open", () => { @@ -59,7 +64,13 @@ function connectWs() { }); } -function handleMessage(msg){ +function RenderPlaylistQueue() { + skipCountToRender = skipCount; + renderQueue() + renderPlaylist() +} + +function handleMessage(msg) { if(msg.event === "state"){ const d = msg.data || {}; if(d.dirs) updateDirs(d.dirs); @@ -69,7 +80,7 @@ function handleMessage(msg){ document.getElementById("rds-text").textContent = rt ?? ""; } else if(msg.event === "playlist") { playlist = msg.data || []; - renderPlaylist(); + RenderPlaylistQueue() } else if(msg.event === "new_track"){ applyTrackState(msg.data); ws.send(JSON.stringify({action:"get_toplay"})); @@ -78,16 +89,15 @@ function handleMessage(msg){ } else if(msg.event === "progress") applyProgressState(msg.data); else if(msg.event === "toplay") { Queue = msg.data.data || []; - renderQueue(); + RenderPlaylistQueue(); } else if(msg.event === "request_dir") applySubdir(msg.data || {}) else if(msg.event === "skipc") { skipCount = msg.data?.data ?? 0; document.getElementById("skpn-count").textContent = skipCount; - renderPlaylist(); - renderQueue(); + RenderPlaylistQueue(); } else if(msg.event === "skipi") { skipped_idx = msg.data?.data ?? skipped_idx; - renderPlaylist(); + RenderPlaylistQueue(); } } @@ -98,7 +108,7 @@ function applyTrackState(payload) { currentTrackIndex = payload.index; document.getElementById("now-track").textContent = `${String(currentTrackIndex).padStart(indexDigits,'0')}: ` + (track.official ? "(official) " : "(unofficial) ") + track.path.replace(basePath, "").slice(1);; document.getElementById("next-track").textContent = (next.official ? "(official) " : "(unofficial) ") + next.path.replace(basePath, "").slice(1); - renderPlaylist(); + RenderPlaylistQueue(); } function applyProgressState(payload) { @@ -140,9 +150,12 @@ function applySubdir(payload) { } catch(e) { dirsBox.innerHTML = "Error fetching dirs: "+e.message; } } -function formatTime(s){ - s = Number(s||0); - const h = Math.floor(s/3600), m = Math.floor((s%3600)/60), sec = Math.floor(s%60); +function formatTime(s) { + s = Number(s || 0); + const h = Math.floor(s / 3600) + const m = Math.floor((s % 3600) / 60) + const sec = Math.floor(s % 60); + if(h != 0) return [h,m,sec].map(x => String(x).padStart(2,'0')).join(":"); else return [m,sec].map(x => String(x).padStart(2,'0')).join(":"); } @@ -162,15 +175,17 @@ function renderPlaylist() { li.addEventListener("click", () => { selectPlaylistItem(i, li); }); if (path === currentTrackPath && i === currentTrackIndex) { li.classList.add("current"); currentIndex = i; } else if (i === currentTrackIndex) { li.classList.add("pointer"); currentIndex = i - 1; } - if(currentIndex !== null && Queue.length === 0 && i > currentIndex && i <= currentIndex + skipCount) li.style.textDecoration = "line-through"; + if(skipCountToRender > 0 && i > currentTrackIndex) { + li.style.textDecoration = "line-through"; + skipCountToRender--; + } li.textContent = ` ${String(i).padStart(indexDigits,'0')}: `; li.textContent = (i === currentTrackIndex ? "▶ " : " ") + li.textContent + displayPath; ul.appendChild(li); if(skipped_idx.includes(i)) li.style.textDecoration = "line-through"; }); if(currentIndex !== null){ - const el = ul.children[currentIndex]; - if(el) el.scrollIntoView({block:'center', behavior: 'smooth'}); + ul.children[currentIndex]?.scrollIntoView({block:'center', behavior: 'smooth'}); } updateControls(); } @@ -180,7 +195,10 @@ function renderQueue() { Queue.forEach((element, i) => { const li = document.createElement("li"); li.textContent = element.replace(basePath, "").slice(1); - if(i < skipCount) li.style.textDecoration = "line-through"; + if(skipCountToRender > 0) { + li.style.textDecoration = "line-through"; + skipCountToRender--; + } ul.appendChild(li); }); updateControls() @@ -357,8 +375,8 @@ function whepSetVol(v) { } function whepToggle() { - if (whepConnected) { whepDisconnect(); return; } - whepConnect(); + if(whepConnected) whepDisconnect(); + else whepConnect(); } function whepDisconnect() { @@ -429,6 +447,5 @@ async function whepConnect() { } } -// Start initLayout(); setTimeout(connectWs, 100); \ No newline at end of file