playlist-admin 2.6.77 → 2.6.79

package/cli/lib/lufs.js

@@ -24,6 +24,8 @@ export class LufsService {
   }
 
   _resolvePlaylistPath(entry, playlistsPath, basePath, libraryPath) {
+    let decodePath = (s) => { try { return decodeURIComponent(s); } catch { return s; } };
+    entry = decodePath(entry);
     if (!entry) return null;
     if (!entry.includes('.') && !entry.includes('\\') && !entry.includes('/')) return null;
     const resolved = path.join(playlistsPath, entry);

package/cli/lib/pipeline.js

@@ -269,6 +269,8 @@ export class PipelineOrchestrator {
   }
 
   _trackFileExists(entry) {
+    let decodePath = (s) => { try { return decodeURIComponent(s); } catch { return s; } };
+    entry = decodePath(entry);
     if (!entry.includes('.') && !entry.includes('\\')) return true;
     const relToPl = path.join(this.config.playlistsPath, entry);
     if (fs.existsSync(relToPl)) return true;
@@ -334,7 +336,8 @@ export class PipelineOrchestrator {
     for (const filePath of newUnsorted) {
       const absFilePath = path.resolve(filePath);
       sb += `#EXTINF:-1,${stemOf(filePath)}\n`;
-      sb += `${relativePath(absFilePath, absPlPath)}\n`;
+      // Echo Nightly compatible: URI-encode the relative path
+      sb += `${encodeURIComponent(relativePath(absFilePath, absPlPath)).replace(/%2F/g, '/')}\n`;
     }
 
     fs.writeFileSync(unsortedPath, sb, { flag: existingStems.size === 0 ? 'w' : 'a', encoding: 'utf-8' });

package/cli/lib/playlist_parser.js

@@ -2,6 +2,10 @@ import fs from 'node:fs';
 import { stemOf } from './util.js';
 
 // Port of lib/services/playlist_parser.dart
+function decodePath(s) {
+  try { return decodeURIComponent(s); } catch { return s; }
+}
+
 export class PlaylistParser {
   static isInternalPlaylist(name) {
     const n = name.toLowerCase();
@@ -31,7 +35,7 @@ export class PlaylistParser {
           const name = pathLine.includes('\\') || pathLine.includes('/')
             ? pathLine.replace(/[\\/]/g, '\\').split('\\').pop()
             : pathLine;
-          songs.push(name.replace(/\.[^.]+$/, ''));
+          songs.push(decodePath(name).replace(/\.[^.]+$/, ''));
           i = j + 1;
         } else {
           i++;
@@ -64,7 +68,7 @@ export class PlaylistParser {
         let j = i + 1;
         while (j < lines.length && (lines[j].startsWith('#') || lines[j].length === 0)) j++;
         if (j < lines.length) {
-          entries.push(lines[j]);
+          entries.push(decodePath(lines[j]));
           i = j + 1;
         } else {
           i++;

package/cli/lib/podcast.js

@@ -16,14 +16,22 @@ function parseRss(xml) {
     const block = m[1];
     const title = (block.match(/<title>([\s\S]*?)<\/title>/) || [])[1] || '';
     const pubDate = (block.match(/<pubDate>([\s\S]*?)<\/pubDate>/) || [])[1] || '';
-    const enclosure = block.match(/<enclosure[^>]*url="([^"]*)"[^>]*type="([^"]*)"[^>]*\/?>/);
+    const enclosure = block.match(/<enclosure[^>]*\/?>/);
+    let audioUrl = '';
+    let audioType = '';
+    if (enclosure) {
+      const u = enclosure[0].match(/url="\s*([^"]+)"/);
+      const t = enclosure[0].match(/type="([^"]+)"/);
+      if (u) audioUrl = decodeXml(u[1]);
+      if (t) audioType = t[1];
+    }
     const duration = (block.match(/<itunes:duration>([\s\S]*?)<\/itunes:duration>/) || [])[1] || '';
     const description = (block.match(/<description>([\s\S]*?)<\/description>/) || [])[1] || '';
     items.push({
       title: decodeXml(title),
       pub_date: decodeXml(pubDate),
-      audio_url: enclosure ? decodeXml(enclosure[1]) : '',
-      audio_type: enclosure ? enclosure[2] : '',
+      audio_url: audioUrl,
+      audio_type: audioType,
       duration: decodeXml(duration),
       description: decodeXml(description),
     });
@@ -94,6 +102,7 @@ export class PodcastService {
     if (!resp.ok) throw new Error(`Download HTTP ${resp.status}`);
     const total = parseInt(resp.headers.get('content-length') || '0', 10);
     let downloaded = 0;
+    let lastPct = -1;
     const ws = fs.createWriteStream(outputPath + '.part');
     const reader = resp.body.getReader();
     while (true) {
@@ -102,11 +111,16 @@ export class PodcastService {
       ws.write(value);
       downloaded += value.length;
       if (total > 0) {
-        process.stdout.write(`\r  ⬇️ ${(downloaded / total * 100).toFixed(1)}%`);
+        const pct = Math.trunc(downloaded / total * 100);
+        if (pct !== lastPct) {
+          lastPct = pct;
+          process.stdout.write(`\r  ⬇️ ${pct}%`);
+        }
       }
     }
     ws.end();
-    if (total > 0) process.stdout.write('\n');
+    if (total > 0 && lastPct !== 100) process.stdout.write('\r  ⬇️ 100%');
+    process.stdout.write('\n');
     await new Promise((r) => ws.on('finish', r));
     fs.renameSync(outputPath + '.part', outputPath);
     return true;

package/cli/lib/scraper.js

@@ -220,7 +220,9 @@ export class SpotifyScraper {
         sb += `#EXTINF:-1,${localName}\n`;
         const absPath = path.resolve(matched);
         const absPl = path.resolve(path.dirname(m3uPath));
-        sb += `${relativePath(absPath, absPl)}\n`;
+        // Echo Nightly compatible: URI-encode the path (keep slashes)
+        const rel = encodeURIComponent(relativePath(absPath, absPl)).replace(/%2F/g, '/');
+        sb += `${rel}\n`;
         resolved++;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playlist-admin",
-  "version": "2.6.77",
+  "version": "2.6.79",
   "description": "Playlist Administrator CLI - music library pipeline, podcast pipeline and Spotube automation (Node.js)",
   "type": "module",
   "bin": {
@@ -35,4 +35,4 @@
     "node": ">=20"
   },
   "private": false
-}
+}