From daca715d1b22e5dd2312a8a6ddc4ae6c3234492b Mon Sep 17 00:00:00 2001
From: Isaac Abadi <IsaacMGrynsztein@gmail.com>
Date: Sun, 20 Sep 2020 23:01:43 -0400
Subject: [PATCH] Fixes bug where playlists could not have download progress
 tracked - downloads are now treated as playlists for cleaner logic

---
 backend/app.js   | 18 ++++++++++++------
 backend/utils.js | 28 ++++++++++++++++++----------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/backend/app.js b/backend/app.js
index 38ab93d..d387cfd 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -1159,7 +1159,10 @@ async function downloadFileByURL_exec(url, type, options, sessionID = null) {
             return;
         } else {
             // store info in download for future use
-            download['_filename'] = info['_filename'];
+            if (Array.isArray(info)) {
+                download['fileNames'] = [];
+                for (let info_obj of info) download['fileNames'].push(info_obj['_filename']);
+            }
             download['filesize'] = utils.getExpectedFileSize(info);
         }
 
@@ -1613,12 +1616,15 @@ function checkDownloadPercent(download) {
     Any file that starts with <video title> will be counted as part of the "bytes downloaded", which will
     be divided by the "total expected bytes."
     */
-    const file_id = download['file_id'];
-    const filename = path.format(path.parse(download['_filename'].substring(0, download['_filename'].length-4)));
+    // assume it's a playlist for logic reasons
+    const fileNames = Array.isArray(download['fileNames']) ? download['fileNames'] 
+                                                        : [path.format(path.parse(download['_filename'].substring(0, download['_filename'].length-4)))];
+    
+    
     const resulting_file_size = download['filesize'];
-
-    glob(`${filename}*`, (err, files) => {
-        let sum_size = 0;
+    let sum_size = 0;
+    let glob_str = '';
+    glob(`{${fileNames.join(',')}, }*`, (err, files) => {
         files.forEach(file => {
             try {
                 const file_stats = fs.statSync(file);
diff --git a/backend/utils.js b/backend/utils.js
index 73156f3..0759722 100644
--- a/backend/utils.js
+++ b/backend/utils.js
@@ -105,19 +105,27 @@ function getDownloadedThumbnail(name, type, customPath = null) {
         return null;
 }
 
-function getExpectedFileSize(info_json) {
-    if (info_json['filesize']) {
-        return info_json['filesize'];
-    }
+function getExpectedFileSize(input_info_jsons) {
+    // treat single videos as arrays to have the file sizes checked/added to. makes the code cleaner
+    const info_jsons = Array.isArray(input_info_jsons) ? input_info_jsons : [input_info_jsons];
 
-    const formats = info_json['format_id'].split('+');
     let expected_filesize = 0;
-    formats.forEach(format_id => {
-        info_json.formats.forEach(available_format => {
-            if (available_format.format_id === format_id && available_format.filesize) {
-                expected_filesize += available_format.filesize;
-            }
+
+    info_jsons.forEach(info_json => {
+        if (info_json['filesize']) {
+            expected_filesize += info_json['filesize'];
+            return;
+        }
+        const formats = info_json['format_id'].split('+');
+        let individual_expected_filesize = 0;
+        formats.forEach(format_id => {
+            info_json.formats.forEach(available_format => {
+                if (available_format.format_id === format_id && available_format.filesize) {
+                    individual_expected_filesize += available_format.filesize;
+                }
+            });
         });
+        expected_filesize += individual_expected_filesize;
     });
 
     return expected_filesize;