TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-21 11:13:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #580 from GlassedSilver/master

Browse Source 
Fix for #480 - existing DLs still getting queued
This commit is contained in:
Glassed Silver
2022-05-01 09:21:48 +02:00
committed by GitHub
parent 2c6485acb2 0a8aba54d2
commit fcf7d14f46
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/subscriptions.js
View File

@@ -141,6 +141,7 @@ async function unsubscribe(sub, deleteMode, user_uid = null) {
if (sub.archive && (await fs.pathExists(sub.archive))) { if (sub.archive && (await fs.pathExists(sub.archive))) {
const archive_file_path = path.join(sub.archive, 'archive.txt'); const archive_file_path = path.join(sub.archive, 'archive.txt');
// deletes archive if it exists // deletes archive if it exists
// TODO: Keep entries in blacklist_video.txt by moving them to a global blacklist
if (await fs.pathExists(archive_file_path)) { if (await fs.pathExists(archive_file_path)) {
await fs.unlink(archive_file_path); await fs.unlink(archive_file_path);
} }
@@ -379,7 +380,11 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
if (useArchive && !redownload) { if (useArchive && !redownload) {
if (sub.archive) { if (sub.archive) {
archive_dir = sub.archive; archive_dir = sub.archive;
archive_path = path.join(archive_dir, 'archive.txt') if (sub.type && sub.type === 'audio') {
archive_path = path.join(archive_dir, 'merged_audio.txt');
} else {
archive_path = path.join(archive_dir, 'merged_video.txt');
}
} }
downloadConfig.push('--download-archive', archive_path); downloadConfig.push('--download-archive', archive_path);
} }