Fixed bug that preventing playlists from being downloaded a zip

backend/app.js

@@ -849,12 +849,13 @@ function getVideoFormatID(name)
     }
 }
 
-async function createPlaylistZipFile(fileNames, type, outputName, fullPathProvided = null) {
+async function createPlaylistZipFile(fileNames, type, outputName, fullPathProvided = null, user_uid = null) {
     return new Promise(async resolve => {
         let zipFolderPath = null;
 
         if (!fullPathProvided) {
-            zipFolderPath = path.join(__dirname, (type === 'audio') ? audioFolderPath : videoFolderPath);
+            zipFolderPath = path.join(type === 'audio' ? audioFolderPath : videoFolderPath);
+            if (user_uid) zipFolderPath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, zipFolderPath);
         } else {
             zipFolderPath = path.join(__dirname, config_api.getConfigItem('ytdl_subscriptions_base_path'));
         }
@@ -879,7 +880,7 @@ async function createPlaylistZipFile(fileNames, type, outputName, fullPathProvid
         for (let i = 0; i < fileNames.length; i++) {
             let fileName = fileNames[i];
             let fileNamePathRemoved = path.parse(fileName).base;
-            let file_path = !fullPathProvided ? zipFolderPath + fileName + ext : fileName;
+            let file_path = !fullPathProvided ? path.join(zipFolderPath, fileName + ext) : fileName;
             archive.file(file_path, {name: fileNamePathRemoved + ext})
         }
 
@@ -1239,7 +1240,7 @@ async function downloadFileByURL_exec(url, type, options, sessionID = null) {
                 if (options.merged_string !== null && options.merged_string !== undefined) {
                     let current_merged_archive = fs.readFileSync(path.join(fileFolderPath, `merged_${type}.txt`), 'utf8');
                     let diff = current_merged_archive.replace(options.merged_string, '');
-                    const archive_path = options.user ? path.join(config_api.getConfigItem('ytdl_users_base_path'), options.user, 'archives', `archive_${type}.txt`) : path.join(archivePath, `archive_${type}.txt`);
+                    const archive_path = options.user ? path.join(fileFolderPath, 'archives', `archive_${type}.txt`) : path.join(archivePath, `archive_${type}.txt`);
                     fs.appendFileSync(archive_path, diff);
                 }
 
@@ -1374,7 +1375,7 @@ async function downloadFileByURL_normal(url, type, options, sessionID = null) {
             if (options.merged_string !== null && options.merged_string !== undefined) {
                 let current_merged_archive = fs.readFileSync(path.join(fileFolderPath, `merged_${type}.txt`), 'utf8');
                 let diff = current_merged_archive.replace(options.merged_string, '');
-                const archive_path = options.user ? path.join(config_api.getConfigItem('ytdl_users_base_path'), options.user, 'archives', `archive_${type}.txt`) : path.join(archivePath, `archive_${type}.txt`);
+                const archive_path = options.user ? path.join(fileFolderPath, 'archives', `archive_${type}.txt`) : path.join(archivePath, `archive_${type}.txt`);
                 fs.appendFileSync(archive_path, diff);
             }
 
@@ -1475,7 +1476,7 @@ async function generateArgs(url, type, options) {
 
             let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
             if (useYoutubeDLArchive) {
-                const archive_folder = options.user ? path.join(config_api.getConfigItem('ytdl_users_base_path'), options.user, 'archives') : archivePath;
+                const archive_folder = options.user ? path.join(fileFolderPath, 'archives') : archivePath;
                 const archive_path = path.join(archive_folder, `archive_${type}.txt`);
 
                 fs.ensureDirSync(archive_folder);
@@ -1485,7 +1486,7 @@ async function generateArgs(url, type, options) {
                     fs.closeSync(fs.openSync(archive_path, 'w'));
                 }
 
-                let blacklist_path = options.user ? path.join(config_api.getConfigItem('ytdl_users_base_path'), options.user, 'archives', `blacklist_${type}.txt`) : path.join(archivePath, `blacklist_${type}.txt`);
+                let blacklist_path = options.user ? path.join(fileFolderPath, 'archives', `blacklist_${type}.txt`) : path.join(archivePath, `blacklist_${type}.txt`);
                 // create blacklist file if it doesn't exist
                 if (!fs.existsSync(blacklist_path)) {
                     fs.closeSync(fs.openSync(blacklist_path, 'w'));
@@ -1793,9 +1794,9 @@ const optionalJwt = function (req, res, next) {
         const uuid = using_body ? req.body.uuid : req.query.uuid;
         const uid = using_body ? req.body.uid : req.query.uid;
         const type = using_body ? req.body.type : req.query.type;
-        const file = !req.query.id ? auth_api.getUserVideo(uuid, uid, type, true, req.body) : auth_api.getUserPlaylist(uuid, req.query.id, null, true);
-        const is_shared = file ? file['sharingEnabled'] : false;
-        if (is_shared) {
+        const playlist_id = using_body ? req.body.id : req.query.id;
+        const file = !playlist_id ? auth_api.getUserVideo(uuid, uid, type, true, req.body) : auth_api.getUserPlaylist(uuid, playlist_id, null, false);
+        if (file) {
             req.can_watch = true;
             return next();
         } else {
@@ -1990,7 +1991,7 @@ app.post('/api/getFile', optionalJwt, function (req, res) {
     }
 });
 
-app.post('/api/getAllFiles', optionalJwt, async function (req, res) {
+app.post('/api/getAllFiles', optionalJwt, function (req, res) {
     // these are returned
     let files = [];
     let playlists = [];
@@ -2548,7 +2549,8 @@ app.post('/api/downloadFile', optionalJwt, async (req, res) => {
         for (let i = 0; i < fileNames.length; i++) {
             fileNames[i] = decodeURIComponent(fileNames[i]);
         }
-        file = await createPlaylistZipFile(fileNames, type, outputName, fullPathProvided);
+        file = await createPlaylistZipFile(fileNames, type, outputName, fullPathProvided, req.body.uuid);
+        file = path.join(__dirname, file);
     }
     res.sendFile(file, function (err) {
         if (err) {

backend/authentication/auth.js

@@ -283,6 +283,7 @@ exports.getUserVideos = function(user_uid, type) {
 }
 
 exports.getUserVideo = function(user_uid, file_uid, type, requireSharing = false) {
+  let file = null;
   if (!type) {
     file = users_db.get('users').find({uid: user_uid}).get(`files.audio`).find({uid: file_uid}).value();
     if (!file) {
@@ -397,7 +398,7 @@ exports.deleteUserFile = function(user_uid, file_uid, type, blacklistMode = fals
 
           // use subscriptions API to remove video from the archive file, and write it to the blacklist
           if (fs.existsSync(archive_path)) {
-              let line = youtube_id ? subscriptions_api.removeIDFromArchive(archive_path, youtube_id) : null;
+              const line = youtube_id ? subscriptions_api.removeIDFromArchive(archive_path, youtube_id) : null;
               if (blacklistMode && line) {
                 let blacklistPath = path.join(usersFileFolder, user_uid, 'archives', `blacklist_${type}.txt`);
                 // adds newline to the beginning of the line

src/app/player/player.component.ts

@@ -317,7 +317,8 @@ export class PlayerComponent implements OnInit, AfterViewInit, OnDestroy {
 
     const zipName = fileNames[0].split(' ')[0] + fileNames[1].split(' ')[0];
     this.downloading = true;
-    this.postsService.downloadFileFromServer(fileNames, this.type, zipName).subscribe(res => {
+    this.postsService.downloadFileFromServer(fileNames, this.type, zipName, null, null, null, null,
+                                            !this.uuid ? this.postsService.user.uid : this.uuid, this.id).subscribe(res => {
       this.downloading = false;
       const blob: Blob = res;
       saveAs(blob, zipName + '.zip');

src/app/posts.services.ts

@@ -223,7 +223,7 @@ export class PostsService implements CanActivate {
     }
 
     downloadFileFromServer(fileName, type, outputName = null, fullPathProvided = null, subscriptionName = null, subPlaylist = null,
-                            uid = null, uuid = null) {
+                            uid = null, uuid = null, id = null) {
         return this.http.post(this.path + 'downloadFile', {fileNames: fileName,
                                                             type: type,
                                                             zip_mode: Array.isArray(fileName),
@@ -232,7 +232,8 @@ export class PostsService implements CanActivate {
                                                             subscriptionName: subscriptionName,
                                                             subPlaylist: subPlaylist,
                                                             uuid: uuid,
-                                                            uid: uid
+                                                            uid: uid,
+                                                            id: id
                                                             },
                                                           {responseType: 'blob', params: this.httpOptions.params});
     }