show ffmpeg progress

th-ch · Mar 4, 2023 · 42baf9d · 42baf9d
1 parent ad484ab
commit 42baf9d
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/plugins/downloader/back.js b/plugins/downloader/back.js
@@ -111,7 +111,7 @@ async function downloadSong(url, playlistFolder = undefined, trackId = undefined
     }
 
     if (!presets[config.get('preset')]) {
-        const fileBuffer = await toMP3(iterableStream, metadata, format.content_length, sendFeedback, increasePlaylistProgress);
+        const fileBuffer = await bufferToMP3(iterableStream, metadata, format.content_length, sendFeedback, increasePlaylistProgress);
         writeFileSync(filePath, await writeID3(fileBuffer, metadata, sendFeedback));
     } else {
         const file = createWriteStream(filePath);
@@ -186,7 +186,7 @@ async function writeID3(buffer, metadata, sendFeedback) {
     }
 }
 
-async function toMP3(stream, metadata, content_length, sendFeedback, increasePlaylistProgress = () => { }, extension = "mp3") {
+async function bufferToMP3(stream, metadata, content_length, sendFeedback, increasePlaylistProgress = () => { }, extension = "mp3") {
     const chunks = [];
     let downloaded = 0;
     let total = content_length;
@@ -196,7 +196,7 @@ async function toMP3(stream, metadata, content_length, sendFeedback, increasePla
         const ratio = downloaded / total;
         const progress = Math.floor(ratio * 100);
         sendFeedback("Download: " + progress + "%", ratio);
-        increasePlaylistProgress(ratio);
+        increasePlaylistProgress(ratio * 0.15);
     }
     sendFeedback("Loading…", 2); // indefinite progress bar after download
 
@@ -214,6 +214,11 @@ async function toMP3(stream, metadata, content_length, sendFeedback, increasePla
 
         sendFeedback("Converting…");
 
+        ffmpeg.setProgress(({ ratio }) => {
+            sendFeedback("Converting: " + Math.floor(ratio * 100) + "%", ratio);
+            increasePlaylistProgress(0.15 + ratio * 0.85);
+        });
+
         await ffmpeg.run(
             "-i",
             safeVideoName,
@@ -307,6 +312,12 @@ async function downloadPlaylist(givenUrl) {
         sendError("Error getting playlist info: make sure it isn't a private or \"Mixed for you\" playlist\n\n" + e);
         return;
     }
+    if (playlist.items.length === 0) sendError(new Error("Playlist is empty"));
+    if (playlist.items.length === 1) {
+        sendFeedback("Playlist has only one item, downloading it directly");
+        await downloadSong(playlist.items[0].url);
+        return;
+    }
     let isAlbum = playlist.title.startsWith('Album - ');
     if (isAlbum) {
         playlist.title = playlist.title.slice(8);