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

Removed potential race condition with youtube-dl archives in main downloader

Browse Source 
Fixed bug where downloaded subscriptions' zip files would include erroneous folders for their videos
This commit is contained in:
Isaac Grynsztein
2020-03-20 16:17:15 -04:00
parent 2b2a033b7e
commit ce2f294a3d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/app.js
View File

@@ -393,8 +393,9 @@ async function createPlaylistZipFile(fileNames, type, outputName, fullPathProvid
for (let i = 0; i < fileNames.length; i++) { for (let i = 0; i < fileNames.length; i++) {
let fileName = fileNames[i]; let fileName = fileNames[i];
let fileNamePathRemoved = path.parse(fileName).base;
let file_path = !fullPathProvided ? zipFolderPath + fileName + ext : fileName; let file_path = !fullPathProvided ? zipFolderPath + fileName + ext : fileName;
archive.file(file_path, {name: fileName + ext}) archive.file(file_path, {name: fileNamePathRemoved + ext})
} }
await archive.finalize(); await archive.finalize();
@@ -744,6 +745,7 @@ app.post('/api/tomp3', async function(req, res) {
let downloadConfig = null; let downloadConfig = null;
let qualityPath = '-f bestaudio'; let qualityPath = '-f bestaudio';
let merged_path = null;
let merged_string = null; let merged_string = null;
if (customArgs) { if (customArgs) {
@@ -788,7 +790,8 @@ app.post('/api/tomp3', async function(req, res) {
fs.closeSync(fs.openSync(blacklist_path, 'w')); fs.closeSync(fs.openSync(blacklist_path, 'w'));
} }
let merged_path = audioFolderPath + 'merged.txt'; // creates merged folder
merged_path = audioFolderPath + `merged_${uuid()}.txt`;
// merges blacklist and regular archive // merges blacklist and regular archive
let inputPathList = [archive_path, blacklist_path]; let inputPathList = [archive_path, blacklist_path];
let status = await mergeFiles(inputPathList, merged_path); let status = await mergeFiles(inputPathList, merged_path);
@@ -853,9 +856,10 @@ app.post('/api/tomp3', async function(req, res) {
let is_playlist = file_names.length > 1; let is_playlist = file_names.length > 1;
if (merged_string !== null) { if (merged_string !== null) {
let current_merged_archive = fs.readFileSync(audioFolderPath + 'merged.txt', 'utf8'); let current_merged_archive = fs.readFileSync(merged_path, 'utf8');
let diff = current_merged_archive.replace(merged_string, ''); let diff = current_merged_archive.replace(merged_string, '');
fs.appendFileSync(audioFolderPath + 'archive.txt', diff); fs.appendFileSync(audioFolderPath + 'archive.txt', diff);
fs.unlinkSync(merged_path)
} }
var audiopathEncoded = encodeURIComponent(file_names[0]); var audiopathEncoded = encodeURIComponent(file_names[0]);