nixamp 0.23.3 → 0.23.4

package/dist/catalogs.d.ts

@@ -61,8 +61,10 @@ export declare function preferPlus(source: string): string;
 export declare function entryId(source: string): string;
 /**
  * Parse an extended m3u: `#EXTINF:-1 tvg-name="CNN" group-title="News",CNN HD`
- * decorates the URL on the next line, and `#EXTGRP:News` names the group for
- * lists that write it that way instead.
+ * decorates the URL on the next line, `#EXTGRP:News` names the group for
+ * lists that write it that way instead, and `#EXTIMG:https://...` is the
+ * picture for lists (a podcast's episodes, say) that carry one that way
+ * rather than as a tvg-logo attribute.
  */
 export declare function parseCatalog(text: string, base: string): CatalogEntry[];
 export interface Group {

package/dist/links.d.ts

@@ -68,6 +68,7 @@ export declare const PLAYLIST_FETCH_TIMEOUT_MS = 15000;
 export declare function playlistFrom(text: string, base: string): {
     hls: boolean;
     sources: string[];
+    image: string;
 };
 /**
  * A pasted .m3u, read and turned into a channel's worth of entries. Fetched

package/dist/links.js

@@ -97,12 +97,14 @@ export const PLAYLIST_FETCH_TIMEOUT_MS = 15_000;
  */
 export function playlistFrom(text, base) {
     if (/^#EXT-X-/m.test(text))
-        return { hls: true, sources: [] };
-    const sources = parseCatalog(text, base)
-        .map((entry) => entry.source)
-        .filter((source) => /^(https?|rtmps?):\/\//i.test(source))
+        return { hls: true, sources: [], image: "" };
+    const entries = parseCatalog(text, base)
+        .filter((entry) => /^(https?|rtmps?):\/\//i.test(entry.source))
         .slice(0, PLAYLIST_MAX_ENTRIES);
-    return { hls: false, sources };
+    // The picture of the list is the first picture in it: a podcast's episodes
+    // all wear the show's art, and the newest is first.
+    const image = entries.map((entry) => pictureUrl(entry.logo)).find((one) => one !== "") ?? "";
+    return { hls: false, sources: entries.map((entry) => entry.source), image };
 }
 /**
  * A pasted .m3u, read and turned into a channel's worth of entries. Fetched
@@ -147,7 +149,7 @@ export async function resolvePlaylist(url, options = {}) {
         extractor: "playlist",
         ext: "",
         page: url,
-        thumbnail: "",
+        thumbnail: list.image,
         about: "",
         playlist: list.sources,
     };

package/dist/server.js

@@ -3117,6 +3117,18 @@ export function createHandler(engine, options) {
                 return;
             }
             links.set(link, resolved);
+            // A channel already on -- put back by a restart, which forgets where
+            // it came from -- learns its picture and its line from the link pasted
+            // again, rather than waiting to be taken off and put on.
+            const already = options.channels.info(channelId);
+            if (already) {
+                if (!already.art && resolved.thumbnail)
+                    already.art = resolved.thumbnail;
+                if (!already.about && resolved.about)
+                    already.about = resolved.about;
+                if (already.art || already.about)
+                    options.rememberChannels?.(rememberedNow(options.channels));
+            }
             if (!options.channels.has(channelId)) {
                 // Asked of the site first, once, with the headers yt-dlp said to
                 // send. A media address that answers nothing is a site refusing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nixamp",
-  "version": "0.23.3",
+  "version": "0.23.4",
   "description": "It really whips the terminal's ass. A Winamp-shaped audio player for your terminal.",
   "license": "MIT",
   "type": "module",

package/src/links.ts

@@ -145,13 +145,15 @@ export const PLAYLIST_FETCH_TIMEOUT_MS = 15_000;
  * all -- a segment list with #EXT-X- tags -- and those are one stream for
  * ffmpeg to read as it is, not a list of streams.
  */
-export function playlistFrom(text: string, base: string): { hls: boolean; sources: string[] } {
-  if (/^#EXT-X-/m.test(text)) return { hls: true, sources: [] };
-  const sources = parseCatalog(text, base)
-    .map((entry) => entry.source)
-    .filter((source) => /^(https?|rtmps?):\/\//i.test(source))
+export function playlistFrom(text: string, base: string): { hls: boolean; sources: string[]; image: string } {
+  if (/^#EXT-X-/m.test(text)) return { hls: true, sources: [], image: "" };
+  const entries = parseCatalog(text, base)
+    .filter((entry) => /^(https?|rtmps?):\/\//i.test(entry.source))
     .slice(0, PLAYLIST_MAX_ENTRIES);
-  return { hls: false, sources };
+  // The picture of the list is the first picture in it: a podcast's episodes
+  // all wear the show's art, and the newest is first.
+  const image = entries.map((entry) => pictureUrl(entry.logo)).find((one) => one !== "") ?? "";
+  return { hls: false, sources: entries.map((entry) => entry.source), image };
 }
 
 /**
@@ -195,7 +197,7 @@ export async function resolvePlaylist(
     extractor: "playlist",
     ext: "",
     page: url,
-    thumbnail: "",
+    thumbnail: list.image,
     about: "",
     playlist: list.sources,
   };

package/src/server.ts

@@ -3666,6 +3666,15 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
         return;
       }
       links.set(link, resolved);
+      // A channel already on -- put back by a restart, which forgets where
+      // it came from -- learns its picture and its line from the link pasted
+      // again, rather than waiting to be taken off and put on.
+      const already = options.channels.info(channelId);
+      if (already) {
+        if (!already.art && resolved.thumbnail) already.art = resolved.thumbnail;
+        if (!already.about && resolved.about) already.about = resolved.about;
+        if (already.art || already.about) options.rememberChannels?.(rememberedNow(options.channels));
+      }
       if (!options.channels.has(channelId)) {
         // Asked of the site first, once, with the headers yt-dlp said to
         // send. A media address that answers nothing is a site refusing

package/web/dist/sw.js

@@ -1,5 +1,5 @@
 /* nixamp service worker — generated, do not edit */
-const CACHE = "nixamp-1789274173964";
+const CACHE = "nixamp-1789274541569";
 const PRECACHE = [
   "/",
   "/.well-known/openaccess.json",