From 2c43ce3c470be93909cd65bdf0e47fc0389c42ac Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Sun, 20 Sep 2020 21:30:41 -0700 Subject: [PATCH 1/5] Use async versions of filesystem methods --- backend/app.js | 849 ++++++++++++++++++++++++------------------------- 1 file changed, 411 insertions(+), 438 deletions(-) diff --git a/backend/app.js b/backend/app.js index c240dbb..f88e47b 100644 --- a/backend/app.js +++ b/backend/app.js @@ -1,6 +1,6 @@ -var async = require('async'); const { uuid } = require('uuidv4'); var fs = require('fs-extra'); +var { promisify } = require('util'); var auth_api = require('./authentication/auth'); var winston = require('winston'); var path = require('path'); @@ -18,7 +18,6 @@ var utils = require('./utils') var mergeFiles = require('merge-files'); const low = require('lowdb') var ProgressBar = require('progress'); -var md5 = require('md5'); const NodeID3 = require('node-id3') const downloader = require('youtube-dl/lib/downloader') const fetch = require('node-fetch'); @@ -195,6 +194,16 @@ app.use(auth_api.passport.initialize()); // actual functions +/** + * setTimeout, but its a promise. + * @param {number} ms + */ +async function wait(ms) { + await new Promise(resolve => { + setTimeout(resolve, ms); + }); +} + async function checkMigrations() { return new Promise(async resolve => { // 3.5->3.6 migration @@ -418,20 +427,20 @@ async function downloadReleaseZip(tag) { } async function installDependencies() { - return new Promise(resolve => { - var child_process = require('child_process'); - child_process.execSync('npm install',{stdio:[0,1,2]}); - resolve(true); - }); + var child_process = require('child_process'); + var exec = promisify(child_process.exec); + await exec('npm install',{stdio:[0,1,2]}); + return true; } async function backupServerLite() { - return new Promise(async resolve => { - fs.ensureDirSync(path.join(__dirname, 'appdata', 'backups')); - let output_path = path.join('appdata', 'backups', `backup-${Date.now()}.zip`); - logger.info(`Backing up your non-video/audio files to ${output_path}. This may take up to a few seconds/minutes.`); - let output = fs.createWriteStream(path.join(__dirname, output_path)); + await fs.ensureDir(path.join(__dirname, 'appdata', 'backups')); + let output_path = path.join('appdata', 'backups', `backup-${Date.now()}.zip`); + logger.info(`Backing up your non-video/audio files to ${output_path}. This may take up to a few seconds/minutes.`); + let output = fs.createWriteStream(path.join(__dirname, output_path)); + + await new Promise(resolve => { var archive = archiver('zip', { gzip: true, zlib: { level: 9 } // Sets the compression level. @@ -455,87 +464,80 @@ async function backupServerLite() { ignore: files_to_ignore }); - await archive.finalize(); - - // wait a tiny bit for the zip to reload in fs - setTimeout(function() { - resolve(true); - }, 100); + resolve(archive.finalize()); }); + + // wait a tiny bit for the zip to reload in fs + await wait(100); + return true; } async function isNewVersionAvailable() { - return new Promise(async resolve => { - // gets tag of the latest version of youtubedl-material, compare to current version - const latest_tag = await getLatestVersion(); - const current_tag = CONSTS['CURRENT_VERSION']; - if (latest_tag > current_tag) { - resolve(true); - } else { - resolve(false); - } - }); + // gets tag of the latest version of youtubedl-material, compare to current version + const latest_tag = await getLatestVersion(); + const current_tag = CONSTS['CURRENT_VERSION']; + if (latest_tag > current_tag) { + return true; + } else { + return false; + } } async function getLatestVersion() { - return new Promise(resolve => { - fetch('https://api.github.com/repos/tzahi12345/youtubedl-material/releases/latest', {method: 'Get'}) - .then(async res => res.json()) - .then(async (json) => { - if (json['message']) { - // means there's an error in getting latest version - logger.error(`ERROR: Received the following message from GitHub's API:`); - logger.error(json['message']); - if (json['documentation_url']) logger.error(`Associated URL: ${json['documentation_url']}`) - } - resolve(json['tag_name']); - return; - }); - }); + const res = await fetch('https://api.github.com/repos/tzahi12345/youtubedl-material/releases/latest', {method: 'Get'}); + const json = await res.json(); + + if (json['message']) { + // means there's an error in getting latest version + logger.error(`ERROR: Received the following message from GitHub's API:`); + logger.error(json['message']); + if (json['documentation_url']) logger.error(`Associated URL: ${json['documentation_url']}`) + } + return json['tag_name']; } async function killAllDownloads() { - return new Promise(resolve => { - ps.lookup({ - command: 'youtube-dl', - }, function(err, resultList ) { - if (err) { - // failed to get list of processes - logger.error('Failed to get a list of running youtube-dl processes.'); - logger.error(err); - resolve({ - details: err, - success: false - }); - } - - // processes that contain the string 'youtube-dl' in the name will be looped - resultList.forEach(function( process ){ - if (process) { - ps.kill(process.pid, 'SIGKILL', function( err ) { - if (err) { - // failed to kill, process may have ended on its own - logger.warn(`Failed to kill process with PID ${process.pid}`); - logger.warn(err); - } - else { - logger.verbose(`Process ${process.pid} has been killed!`); - } - }); + const lookupAsync = promisify(ps.lookup); + + try { + await lookupAsync({ + command: 'youtube-dl' + }); + } catch (err) { + // failed to get list of processes + logger.error('Failed to get a list of running youtube-dl processes.'); + logger.error(err); + return { + details: err, + success: false + }; + } + + // processes that contain the string 'youtube-dl' in the name will be looped + resultList.forEach(function( process ){ + if (process) { + ps.kill(process.pid, 'SIGKILL', function( err ) { + if (err) { + // failed to kill, process may have ended on its own + logger.warn(`Failed to kill process with PID ${process.pid}`); + logger.warn(err); + } + else { + logger.verbose(`Process ${process.pid} has been killed!`); } }); - resolve({ - success: true - }); - }); + } }); + + return { + success: true + }; } async function setPortItemFromENV() { - return new Promise(resolve => { - config_api.setConfigItem('ytdl_port', backendPort.toString()); - setTimeout(() => resolve(true), 100); - }); + config_api.setConfigItem('ytdl_port', backendPort.toString()); + await wait(100); + return true; } async function setAndLoadConfig() { @@ -544,51 +546,45 @@ async function setAndLoadConfig() { } async function setConfigFromEnv() { - return new Promise(resolve => { - let config_items = getEnvConfigItems(); - let success = config_api.setConfigItems(config_items); - if (success) { - logger.info('Config items set using ENV variables.'); - setTimeout(() => resolve(true), 100); - } else { - logger.error('ERROR: Failed to set config items using ENV variables.'); - resolve(false); - } - }); + let config_items = getEnvConfigItems(); + let success = config_api.setConfigItems(config_items); + if (success) { + logger.info('Config items set using ENV variables.'); + await wait(100); + return true; + } else { + logger.error('ERROR: Failed to set config items using ENV variables.'); + return false; + } } async function loadConfig() { - return new Promise(async resolve => { - loadConfigValues(); + loadConfigValues(); - // creates archive path if missing - if (!fs.existsSync(archivePath)){ - fs.mkdirSync(archivePath); - } + // creates archive path if missing + await fs.ensureDir(archivePath); - // get subscriptions - if (allowSubscriptions) { - // runs initially, then runs every ${subscriptionCheckInterval} seconds + // get subscriptions + if (allowSubscriptions) { + // runs initially, then runs every ${subscriptionCheckInterval} seconds + watchSubscriptions(); + setInterval(() => { watchSubscriptions(); - setInterval(() => { - watchSubscriptions(); - }, subscriptionsCheckInterval * 1000); - } - - db_api.importUnregisteredFiles(); + }, subscriptionsCheckInterval * 1000); + } - // check migrations - await checkMigrations(); + db_api.importUnregisteredFiles(); - // load in previous downloads - downloads = db.get('downloads').value(); + // check migrations + await checkMigrations(); - // start the server here - startServer(); + // load in previous downloads + downloads = db.get('downloads').value(); - resolve(true); - }); + // start the server here + startServer(); + return true; } function loadConfigValues() { @@ -850,210 +846,196 @@ function getVideoFormatID(name) } async function createPlaylistZipFile(fileNames, type, outputName, fullPathProvided = null, user_uid = null) { - return new Promise(async resolve => { - let zipFolderPath = null; + let zipFolderPath = null; - if (!fullPathProvided) { - 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')); - } + if (!fullPathProvided) { + zipFolderPath = path.join(__dirname, (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')); + } - let ext = (type === 'audio') ? '.mp3' : '.mp4'; + let ext = (type === 'audio') ? '.mp3' : '.mp4'; - let output = fs.createWriteStream(path.join(zipFolderPath, outputName + '.zip')); + let output = fs.createWriteStream(path.join(zipFolderPath, outputName + '.zip')); - var archive = archiver('zip', { - gzip: true, - zlib: { level: 9 } // Sets the compression level. - }); + var archive = archiver('zip', { + gzip: true, + zlib: { level: 9 } // Sets the compression level. + }); - archive.on('error', function(err) { - logger.error(err); - throw err; - }); + archive.on('error', function(err) { + logger.error(err); + throw err; + }); - // pipe archive data to the output file - archive.pipe(output); + // pipe archive data to the output file + archive.pipe(output); - for (let i = 0; i < fileNames.length; i++) { - let fileName = fileNames[i]; - let fileNamePathRemoved = path.parse(fileName).base; - let file_path = !fullPathProvided ? path.join(zipFolderPath, fileName + ext) : fileName; - archive.file(file_path, {name: fileNamePathRemoved + ext}) - } + for (let i = 0; i < fileNames.length; i++) { + let fileName = fileNames[i]; + let fileNamePathRemoved = path.parse(fileName).base; + let file_path = !fullPathProvided ? path.join(zipFolderPath, fileName + ext) : fileName; + archive.file(file_path, {name: fileNamePathRemoved + ext}) + } - await archive.finalize(); + await archive.finalize(); - // wait a tiny bit for the zip to reload in fs - setTimeout(function() { - resolve(path.join(zipFolderPath,outputName + '.zip')); - }, 100); + // wait a tiny bit for the zip to reload in fs + await wait(100); + return path.join(zipFolderPath,outputName + '.zip'); +} - }); +async function deleteAudioFile(name, customPath = null, blacklistMode = false) { + let filePath = customPath ? customPath : audioFolderPath; + var jsonPath = path.join(filePath,name+'.mp3.info.json'); + var altJSONPath = path.join(filePath,name+'.info.json'); + var audioFilePath = path.join(filePath,name+'.mp3'); + var thumbnailPath = path.join(filePath,name+'.webp'); + var altThumbnailPath = path.join(filePath,name+'.jpg'); -} + jsonPath = path.join(__dirname, jsonPath); + altJSONPath = path.join(__dirname, altJSONPath); + audioFilePath = path.join(__dirname, audioFilePath); -async function deleteAudioFile(name, customPath = null, blacklistMode = false) { - return new Promise(resolve => { - let filePath = customPath ? customPath : audioFolderPath; - - var jsonPath = path.join(filePath,name+'.mp3.info.json'); - var altJSONPath = path.join(filePath,name+'.info.json'); - var audioFilePath = path.join(filePath,name+'.mp3'); - var thumbnailPath = path.join(filePath,name+'.webp'); - var altThumbnailPath = path.join(filePath,name+'.jpg'); - - jsonPath = path.join(__dirname, jsonPath); - altJSONPath = path.join(__dirname, altJSONPath); - audioFilePath = path.join(__dirname, audioFilePath); - - let jsonExists = fs.existsSync(jsonPath); - let thumbnailExists = fs.existsSync(thumbnailPath); - - if (!jsonExists) { - if (fs.existsSync(altJSONPath)) { - jsonExists = true; - jsonPath = altJSONPath; - } - } + let jsonExists = await fs.pathExists(jsonPath); + let thumbnailExists = await fs.pathExists(thumbnailPath); - if (!thumbnailExists) { - if (fs.existsSync(altThumbnailPath)) { - thumbnailExists = true; - thumbnailPath = altThumbnailPath; - } + if (!jsonExists) { + if (await fs.pathExists(altJSONPath)) { + jsonExists = true; + jsonPath = altJSONPath; } + } - let audioFileExists = fs.existsSync(audioFilePath); + if (!thumbnailExists) { + if (await fs.pathExists(altThumbnailPath)) { + thumbnailExists = true; + thumbnailPath = altThumbnailPath; + } + } - if (config_api.descriptors[name]) { - try { - for (let i = 0; i < config_api.descriptors[name].length; i++) { - config_api.descriptors[name][i].destroy(); - } - } catch(e) { + let audioFileExists = await fs.pathExists(audioFilePath); + if (config_api.descriptors[name]) { + try { + for (let i = 0; i < config_api.descriptors[name].length; i++) { + config_api.descriptors[name][i].destroy(); } + } catch(e) { + } + } - let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); - if (useYoutubeDLArchive) { - const archive_path = path.join(archivePath, 'archive_audio.txt'); + let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); + if (useYoutubeDLArchive) { + const archive_path = path.join(archivePath, 'archive_audio.txt'); - // get ID from JSON + // get ID from JSON - var jsonobj = utils.getJSONMp3(name, filePath); - let id = null; - if (jsonobj) id = jsonobj.id; + var jsonobj = utils.getJSONMp3(name, filePath); + let id = null; + if (jsonobj) id = jsonobj.id; - // use subscriptions API to remove video from the archive file, and write it to the blacklist - if (fs.existsSync(archive_path)) { - const line = id ? subscriptions_api.removeIDFromArchive(archive_path, id) : null; - if (blacklistMode && line) writeToBlacklist('audio', line); - } else { - logger.info('Could not find archive file for audio files. Creating...'); - fs.closeSync(fs.openSync(archive_path, 'w')); - } + // use subscriptions API to remove video from the archive file, and write it to the blacklist + if (await fs.pathExists(archive_path)) { + const line = id ? subscriptions_api.removeIDFromArchive(archive_path, id) : null; + if (blacklistMode && line) await writeToBlacklist('audio', line); + } else { + logger.info('Could not find archive file for audio files. Creating...'); + await fs.close(await fs.open(archive_path, 'w')); } + } - if (jsonExists) fs.unlinkSync(jsonPath); - if (thumbnailExists) fs.unlinkSync(thumbnailPath); - if (audioFileExists) { - fs.unlink(audioFilePath, function(err) { - if (fs.existsSync(jsonPath) || fs.existsSync(audioFilePath)) { - resolve(false); - } else { - resolve(true); - } - }); + if (jsonExists) await fs.unlink(jsonPath); + if (thumbnailExists) await fs.unlink(thumbnailPath); + if (audioFileExists) { + await fs.unlink(audioFilePath); + if (await fs.pathExists(jsonPath) || await fs.pathExists(audioFilePath)) { + return false; } else { - // TODO: tell user that the file didn't exist - resolve(true); + return true; } - - }); + } else { + // TODO: tell user that the file didn't exist + return true; + } } async function deleteVideoFile(name, customPath = null, blacklistMode = false) { - return new Promise(resolve => { - let filePath = customPath ? customPath : videoFolderPath; - var jsonPath = path.join(filePath,name+'.info.json'); + let filePath = customPath ? customPath : videoFolderPath; + var jsonPath = path.join(filePath,name+'.info.json'); - var altJSONPath = path.join(filePath,name+'.mp4.info.json'); - var videoFilePath = path.join(filePath,name+'.mp4'); - var thumbnailPath = path.join(filePath,name+'.webp'); - var altThumbnailPath = path.join(filePath,name+'.jpg'); + var altJSONPath = path.join(filePath,name+'.mp4.info.json'); + var videoFilePath = path.join(filePath,name+'.mp4'); + var thumbnailPath = path.join(filePath,name+'.webp'); + var altThumbnailPath = path.join(filePath,name+'.jpg'); - jsonPath = path.join(__dirname, jsonPath); - videoFilePath = path.join(__dirname, videoFilePath); + jsonPath = path.join(__dirname, jsonPath); + videoFilePath = path.join(__dirname, videoFilePath); - let jsonExists = fs.existsSync(jsonPath); - let videoFileExists = fs.existsSync(videoFilePath); - let thumbnailExists = fs.existsSync(thumbnailPath); + let jsonExists = await fs.pathExists(jsonPath); + let videoFileExists = await fs.pathExists(videoFilePath); + let thumbnailExists = await fs.pathExists(thumbnailPath); - if (!jsonExists) { - if (fs.existsSync(altJSONPath)) { - jsonExists = true; - jsonPath = altJSONPath; - } - } - - if (!thumbnailExists) { - if (fs.existsSync(altThumbnailPath)) { - thumbnailExists = true; - thumbnailPath = altThumbnailPath; - } + if (!jsonExists) { + if (await fs.pathExists(altJSONPath)) { + jsonExists = true; + jsonPath = altJSONPath; } + } - if (config_api.descriptors[name]) { - try { - for (let i = 0; i < config_api.descriptors[name].length; i++) { - config_api.descriptors[name][i].destroy(); - } - } catch(e) { + if (!thumbnailExists) { + if (await fs.pathExists(altThumbnailPath)) { + thumbnailExists = true; + thumbnailPath = altThumbnailPath; + } + } + if (config_api.descriptors[name]) { + try { + for (let i = 0; i < config_api.descriptors[name].length; i++) { + config_api.descriptors[name][i].destroy(); } + } catch(e) { + } + } - let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); - if (useYoutubeDLArchive) { - const archive_path = path.join(archivePath, 'archive_video.txt'); + let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); + if (useYoutubeDLArchive) { + const archive_path = path.join(archivePath, 'archive_video.txt'); - // get ID from JSON + // get ID from JSON - var jsonobj = utils.getJSONMp4(name, filePath); - let id = null; - if (jsonobj) id = jsonobj.id; + var jsonobj = utils.getJSONMp4(name, filePath); + let id = null; + if (jsonobj) id = jsonobj.id; - // use subscriptions API to remove video from the archive file, and write it to the blacklist - if (fs.existsSync(archive_path)) { - const line = id ? subscriptions_api.removeIDFromArchive(archive_path, id) : null; - if (blacklistMode && line) writeToBlacklist('video', line); - } else { - logger.info('Could not find archive file for videos. Creating...'); - fs.closeSync(fs.openSync(archive_path, 'w')); - } + // use subscriptions API to remove video from the archive file, and write it to the blacklist + if (await fs.pathExists(archive_path)) { + const line = id ? subscriptions_api.removeIDFromArchive(archive_path, id) : null; + if (blacklistMode && line) await writeToBlacklist('video', line); + } else { + logger.info('Could not find archive file for videos. Creating...'); + fs.closeSync(fs.openSync(archive_path, 'w')); } + } - if (jsonExists) fs.unlinkSync(jsonPath); - if (thumbnailExists) fs.unlinkSync(thumbnailPath); - if (videoFileExists) { - fs.unlink(videoFilePath, function(err) { - if (fs.existsSync(jsonPath) || fs.existsSync(videoFilePath)) { - resolve(false); - } else { - resolve(true); - } - }); + if (jsonExists) await fs.unlink(jsonPath); + if (thumbnailExists) await fs.unlink(thumbnailPath); + if (videoFileExists) { + await fs.unlink(videoFilePath); + if (await fs.pathExists(jsonPath) || await fs.pathExists(videoFilePath)) { + return false; } else { - // TODO: tell user that the file didn't exist - resolve(true); + return true; } - - }); + } else { + // TODO: tell user that the file didn't exist + return true; + } } // replaces .webm with appropriate extension @@ -1072,38 +1054,38 @@ function getTrueFileName(unfixed_path, type) { return fixed_path; } -function getAudioInfos(fileNames) { - let result = []; - for (let i = 0; i < fileNames.length; i++) { - let fileName = fileNames[i]; - let fileLocation = audioFolderPath+fileName+'.mp3.info.json'; - if (fs.existsSync(fileLocation)) { - let data = fs.readFileSync(fileLocation); - try { - result.push(JSON.parse(data)); - } catch(e) { - logger.error(`Could not find info for file ${fileName}.mp3`); - } +/** + * @param {'audio' | 'video'} type + * @param {string[]} fileNames + */ +async function getAudioOrVideoInfos(type, fileNames) { + let result = await Promise.all(fileNames.map(async fileName => { + let fileLocation = videoFolderPath+fileName; + if (type === 'audio') { + fileLocation += '.mp3.info.json'; + } else if (type === 'video') { + fileLocation += '.info.json'; } - } - return result; -} -function getVideoInfos(fileNames) { - let result = []; - for (let i = 0; i < fileNames.length; i++) { - let fileName = fileNames[i]; - let fileLocation = videoFolderPath+fileName+'.info.json'; - if (fs.existsSync(fileLocation)) { - let data = fs.readFileSync(fileLocation); + if (await fs.pathExists(fileLocation)) { + let data = await fs.readFile(fileLocation); try { - result.push(JSON.parse(data)); - } catch(e) { - logger.error(`Could not find info for file ${fileName}.mp4`); + return JSON.parse(data); + } catch (e) { + let suffix; + if (type === 'audio') { + suffix += '.mp3'; + } else if (type === 'video') { + suffix += '.mp4'; + } + + logger.error(`Could not find info for file ${fileName}${suffix}`); } } - } - return result; + return null; + })); + + return result.filter(data => data != null); } // downloads @@ -1401,133 +1383,131 @@ async function downloadFileByURL_normal(url, type, options, sessionID = null) { } async function generateArgs(url, type, options) { - return new Promise(async resolve => { - var videopath = '%(title)s'; - var globalArgs = config_api.getConfigItem('ytdl_custom_args'); - let useCookies = config_api.getConfigItem('ytdl_use_cookies'); - var is_audio = type === 'audio'; + var videopath = '%(title)s'; + var globalArgs = config_api.getConfigItem('ytdl_custom_args'); + let useCookies = config_api.getConfigItem('ytdl_use_cookies'); + var is_audio = type === 'audio'; - var fileFolderPath = is_audio ? audioFolderPath : videoFolderPath; + var fileFolderPath = is_audio ? audioFolderPath : videoFolderPath; - if (options.customFileFolderPath) fileFolderPath = options.customFileFolderPath; + if (options.customFileFolderPath) fileFolderPath = options.customFileFolderPath; - var customArgs = options.customArgs; - var customOutput = options.customOutput; - var customQualityConfiguration = options.customQualityConfiguration; + var customArgs = options.customArgs; + var customOutput = options.customOutput; + var customQualityConfiguration = options.customQualityConfiguration; - // video-specific args - var selectedHeight = options.selectedHeight; + // video-specific args + var selectedHeight = options.selectedHeight; - // audio-specific args - var maxBitrate = options.maxBitrate; + // audio-specific args + var maxBitrate = options.maxBitrate; - var youtubeUsername = options.youtubeUsername; - var youtubePassword = options.youtubePassword; + var youtubeUsername = options.youtubeUsername; + var youtubePassword = options.youtubePassword; + + let downloadConfig = null; + let qualityPath = (is_audio && !options.skip_audio_args) ? ['-f', 'bestaudio'] : ['-f', 'bestvideo+bestaudio', '--merge-output-format', 'mp4']; + const is_youtube = url.includes('youtu'); + if (!is_audio && !is_youtube) { + // tiktok videos fail when using the default format + qualityPath = null; + } else if (!is_audio && !is_youtube && (url.includes('reddit') || url.includes('pornhub'))) { + qualityPath = ['-f', 'bestvideo+bestaudio'] + } - let downloadConfig = null; - let qualityPath = (is_audio && !options.skip_audio_args) ? ['-f', 'bestaudio'] : ['-f', 'bestvideo+bestaudio', '--merge-output-format', 'mp4']; - const is_youtube = url.includes('youtu'); - if (!is_audio && !is_youtube) { - // tiktok videos fail when using the default format - qualityPath = null; - } else if (!is_audio && !is_youtube && (url.includes('reddit') || url.includes('pornhub'))) { - qualityPath = ['-f', 'bestvideo+bestaudio'] + if (customArgs) { + downloadConfig = customArgs.split(',,'); + } else { + if (customQualityConfiguration) { + qualityPath = ['-f', customQualityConfiguration]; + } else if (selectedHeight && selectedHeight !== '' && !is_audio) { + qualityPath = ['-f', `'(mp4)[height=${selectedHeight}'`]; + } else if (maxBitrate && is_audio) { + qualityPath = ['--audio-quality', maxBitrate] } - if (customArgs) { - downloadConfig = customArgs.split(',,'); + if (customOutput) { + downloadConfig = ['-o', path.join(fileFolderPath, customOutput) + ".%(ext)s", '--write-info-json', '--print-json']; } else { - if (customQualityConfiguration) { - qualityPath = ['-f', customQualityConfiguration]; - } else if (selectedHeight && selectedHeight !== '' && !is_audio) { - qualityPath = ['-f', `'(mp4)[height=${selectedHeight}'`]; - } else if (maxBitrate && is_audio) { - qualityPath = ['--audio-quality', maxBitrate] - } - - if (customOutput) { - downloadConfig = ['-o', path.join(fileFolderPath, customOutput) + ".%(ext)s", '--write-info-json', '--print-json']; - } else { - downloadConfig = ['-o', path.join(fileFolderPath, videopath + (is_audio ? '.%(ext)s' : '.mp4')), '--write-info-json', '--print-json']; - } + downloadConfig = ['-o', path.join(fileFolderPath, videopath + (is_audio ? '.%(ext)s' : '.mp4')), '--write-info-json', '--print-json']; + } - if (qualityPath && options.downloading_method === 'exec') downloadConfig.push(...qualityPath); + if (qualityPath && options.downloading_method === 'exec') downloadConfig.push(...qualityPath); - if (is_audio && !options.skip_audio_args) { - downloadConfig.push('-x'); - downloadConfig.push('--audio-format', 'mp3'); - } + if (is_audio && !options.skip_audio_args) { + downloadConfig.push('-x'); + downloadConfig.push('--audio-format', 'mp3'); + } - if (youtubeUsername && youtubePassword) { - downloadConfig.push('--username', youtubeUsername, '--password', youtubePassword); - } + if (youtubeUsername && youtubePassword) { + downloadConfig.push('--username', youtubeUsername, '--password', youtubePassword); + } - if (useCookies) { - if (fs.existsSync(path.join(__dirname, 'appdata', 'cookies.txt'))) { - downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt')); - } else { - logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.'); - } + if (useCookies) { + if (await fs.pathExists(path.join(__dirname, 'appdata', 'cookies.txt'))) { + downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt')); + } else { + logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.'); } + } - if (!useDefaultDownloadingAgent && customDownloadingAgent) { - downloadConfig.splice(0, 0, '--external-downloader', customDownloadingAgent); - } + if (!useDefaultDownloadingAgent && customDownloadingAgent) { + downloadConfig.splice(0, 0, '--external-downloader', customDownloadingAgent); + } - let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); - if (useYoutubeDLArchive) { - const archive_folder = options.user ? path.join(fileFolderPath, 'archives') : archivePath; - const archive_path = path.join(archive_folder, `archive_${type}.txt`); + let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); + if (useYoutubeDLArchive) { + const archive_folder = options.user ? path.join(fileFolderPath, 'archives') : archivePath; + const archive_path = path.join(archive_folder, `archive_${type}.txt`); - fs.ensureDirSync(archive_folder); + await fs.ensureDir(archive_folder); - // create archive file if it doesn't exist - if (!fs.existsSync(archive_path)) { - fs.closeSync(fs.openSync(archive_path, 'w')); - } + // create archive file if it doesn't exist + if (!(await fs.pathExists(archive_path))) { + await fs.close(await fs.open(archive_path, 'w')); + } - 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')); - } + 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 (!(await fs.pathExists(blacklist_path))) { + await fs.close(await fs.open(blacklist_path, 'w')); + } - let merged_path = path.join(fileFolderPath, `merged_${type}.txt`); - fs.ensureFileSync(merged_path); - // merges blacklist and regular archive - let inputPathList = [archive_path, blacklist_path]; - let status = await mergeFiles(inputPathList, merged_path); + let merged_path = path.join(fileFolderPath, `merged_${type}.txt`); + await fs.ensureFile(merged_path); + // merges blacklist and regular archive + let inputPathList = [archive_path, blacklist_path]; + let status = await mergeFiles(inputPathList, merged_path); - options.merged_string = fs.readFileSync(merged_path, "utf8"); + options.merged_string = await fs.readFile(merged_path, "utf8"); - downloadConfig.push('--download-archive', merged_path); - } + downloadConfig.push('--download-archive', merged_path); + } - if (config_api.getConfigItem('ytdl_include_thumbnail')) { - downloadConfig.push('--write-thumbnail'); - } + if (config_api.getConfigItem('ytdl_include_thumbnail')) { + downloadConfig.push('--write-thumbnail'); + } - if (globalArgs && globalArgs !== '') { - // adds global args - if (downloadConfig.indexOf('-o') !== -1 && globalArgs.split(',,').indexOf('-o') !== -1) { - // if global args has an output, replce the original output with that of global args - const original_output_index = downloadConfig.indexOf('-o'); - downloadConfig.splice(original_output_index, 2); - } - downloadConfig = downloadConfig.concat(globalArgs.split(',,')); + if (globalArgs && globalArgs !== '') { + // adds global args + if (downloadConfig.indexOf('-o') !== -1 && globalArgs.split(',,').indexOf('-o') !== -1) { + // if global args has an output, replce the original output with that of global args + const original_output_index = downloadConfig.indexOf('-o'); + downloadConfig.splice(original_output_index, 2); } - + downloadConfig = downloadConfig.concat(globalArgs.split(',,')); } - logger.verbose(`youtube-dl args being used: ${downloadConfig.join(',')}`); - resolve(downloadConfig); - }); + + } + logger.verbose(`youtube-dl args being used: ${downloadConfig.join(',')}`); + return downloadConfig; } async function getVideoInfoByURL(url, args = [], download = null) { return new Promise(resolve => { // remove bad args const new_args = [...args]; - + const archiveArgIndex = new_args.indexOf('--download-archive'); if (archiveArgIndex !== -1) { new_args.splice(archiveArgIndex, 2); @@ -1593,11 +1573,11 @@ async function convertFileToMp3(input_file, output_file) { }); } -function writeToBlacklist(type, line) { +async function writeToBlacklist(type, line) { let blacklistPath = path.join(archivePath, (type === 'audio') ? 'blacklist_audio.txt' : 'blacklist_video.txt'); // adds newline to the beginning of the line line = '\n' + line; - fs.appendFileSync(blacklistPath, line); + await fs.appendFile(blacklistPath, line); } // download management functions @@ -1741,21 +1721,6 @@ function removeFileExtension(filename) { return filename_parts.join('.'); } -// https://stackoverflow.com/a/32197381/8088021 -const deleteFolderRecursive = function(folder_to_delete) { - if (fs.existsSync(folder_to_delete)) { - fs.readdirSync(folder_to_delete).forEach((file, index) => { - const curPath = path.join(folder_to_delete, file); - if (fs.lstatSync(curPath).isDirectory()) { // recurse - deleteFolderRecursive(curPath); - } else { // delete file - fs.unlinkSync(curPath); - } - }); - fs.rmdirSync(folder_to_delete); - } -}; - app.use(function(req, res, next) { res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization"); res.header("Access-Control-Allow-Origin", getOrigin()); @@ -1771,8 +1736,12 @@ app.use(function(req, res, next) { next(); } else if (req.query.apiKey === admin_token) { next(); - } else if (req.query.apiKey && config_api.getConfigItem('ytdl_use_api_key') && req.query.apiKey === config_api.getConfigItem('ytdl_api_key')) { - next(); + } else if (req.query.apiKey && config_api.getConfigItem('ytdl_use_api_key')) { + if (req.query.apiKey === config_api.getConfigItem('ytdl_api_key')) { + next(); + } else { + res.status(401).send('Invalid API key'); + } } else if (req.path.includes('/api/video/') || req.path.includes('/api/audio/')) { next(); } else { @@ -1878,7 +1847,7 @@ app.post('/api/tomp4', optionalJwt, async function(req, res) { ui_uid: req.body.ui_uid, user: req.isAuthenticated() ? req.user.uid : null } - + const safeDownloadOverride = config_api.getConfigItem('ytdl_safe_download_override') || config_api.globalArgsRequiresSafeDownload(); if (safeDownloadOverride) logger.verbose('Download is running with the safe download override.'); const is_playlist = url.includes('playlist'); @@ -1900,8 +1869,21 @@ app.post('/api/killAllDownloads', optionalJwt, async function(req, res) { res.send(result_obj); }); +/** + * add thumbnails if present + * @param files - List of files with thumbnailPath property. + */ +async function addThumbnails(files) { + await Promise.all(files.map(async file => { + const thumbnailPath = file['thumbnailPath']; + if (thumbnailPath && (await fs.pathExists(thumbnailPath))) { + file['thumbnailBlob'] = await fs.readFile(thumbnailPath); + } + })); +} + // gets all download mp3s -app.get('/api/getMp3s', optionalJwt, function(req, res) { +app.get('/api/getMp3s', optionalJwt, async function(req, res) { var mp3s = db.get('files.audio').value(); // getMp3s(); var playlists = db.get('playlists.audio').value(); const is_authenticated = req.isAuthenticated(); @@ -1915,10 +1897,7 @@ app.get('/api/getMp3s', optionalJwt, function(req, res) { mp3s = JSON.parse(JSON.stringify(mp3s)); // add thumbnails if present - mp3s.forEach(mp3 => { - if (mp3['thumbnailPath'] && fs.existsSync(mp3['thumbnailPath'])) - mp3['thumbnailBlob'] = fs.readFileSync(mp3['thumbnailPath']); - }); + await addThumbnails(mp3s); res.send({ mp3s: mp3s, @@ -1927,7 +1906,7 @@ app.get('/api/getMp3s', optionalJwt, function(req, res) { }); // gets all download mp4s -app.get('/api/getMp4s', optionalJwt, function(req, res) { +app.get('/api/getMp4s', optionalJwt, async function(req, res) { var mp4s = db.get('files.video').value(); // getMp4s(); var playlists = db.get('playlists.video').value(); @@ -1942,10 +1921,7 @@ app.get('/api/getMp4s', optionalJwt, function(req, res) { mp4s = JSON.parse(JSON.stringify(mp4s)); // add thumbnails if present - mp4s.forEach(mp4 => { - if (mp4['thumbnailPath'] && fs.existsSync(mp4['thumbnailPath'])) - mp4['thumbnailBlob'] = fs.readFileSync(mp4['thumbnailPath']); - }); + await addThumbnails(mp4s); res.send({ mp4s: mp4s, @@ -2018,7 +1994,7 @@ app.post('/api/getAllFiles', optionalJwt, function (req, res) { files = videos.concat(audios); playlists = video_playlists.concat(audio_playlists); - + // loop through subscriptions and add videos for (let i = 0; i < subscriptions.length; i++) { sub = subscriptions[i]; @@ -2034,10 +2010,7 @@ app.post('/api/getAllFiles', optionalJwt, function (req, res) { files = JSON.parse(JSON.stringify(files)); // add thumbnails if present - files.forEach(file => { - if (file['thumbnailPath'] && fs.existsSync(file['thumbnailPath'])) - file['thumbnailBlob'] = fs.readFileSync(file['thumbnailPath']); - }); + await addThumbnails(files); res.send({ files: files, @@ -2465,7 +2438,7 @@ app.post('/api/deleteMp3', optionalJwt, async (req, res) => { var name = audio_obj.id; var fullpath = audioFolderPath + name + ".mp3"; var wasDeleted = false; - if (fs.existsSync(fullpath)) + if (await fs.pathExists(fullpath)) { deleteAudioFile(name, null, blacklistMode); db.get('files.audio').remove({uid: uid}).write(); @@ -2496,7 +2469,7 @@ app.post('/api/deleteMp4', optionalJwt, async (req, res) => { var name = video_obj.id; var fullpath = videoFolderPath + name + ".mp4"; var wasDeleted = false; - if (fs.existsSync(fullpath)) + if (await fs.pathExists(fullpath)) { wasDeleted = await deleteVideoFile(name, null, blacklistMode); db.get('files.video').remove({uid: uid}).write(); @@ -2582,7 +2555,7 @@ app.post('/api/downloadArchive', async (req, res) => { let full_archive_path = path.join(archive_dir, 'archive.txt'); - if (fs.existsSync(full_archive_path)) { + if (await fs.pathExists(full_archive_path)) { res.sendFile(full_archive_path); } else { res.sendStatus(404); @@ -2594,14 +2567,14 @@ var upload_multer = multer({ dest: __dirname + '/appdata/' }); app.post('/api/uploadCookies', upload_multer.single('cookies'), async (req, res) => { const new_path = path.join(__dirname, 'appdata', 'cookies.txt'); - if (fs.existsSync(req.file.path)) { - fs.renameSync(req.file.path, new_path); + if (await fs.pathExists(req.file.path)) { + await fs.rename(req.file.path, new_path); } else { res.sendStatus(500); return; } - if (fs.existsSync(new_path)) { + if (await fs.pathExists(new_path)) { res.send({success: true}); } else { res.sendStatus(500); @@ -2824,9 +2797,9 @@ app.post('/api/logs', async function(req, res) { let logs = null; let lines = req.body.lines; logs_path = path.join('appdata', 'logs', 'combined.log') - if (fs.existsSync(logs_path)) { + if (await fs.pathExists(logs_path)) { if (lines) logs = await read_last_lines.read(logs_path, lines); - else logs = fs.readFileSync(logs_path, 'utf8'); + else logs = await fs.readFile(logs_path, 'utf8'); } else logger.error(`Failed to find logs file at the expected location: ${logs_path}`) @@ -2842,8 +2815,10 @@ app.post('/api/clearAllLogs', async function(req, res) { logs_err_path = path.join('appdata', 'logs', 'error.log'); let success = false; try { - fs.writeFileSync(logs_path, ''); - fs.writeFileSync(logs_err_path, ''); + await Promise.all([ + fs.writeFile(logs_path, ''), + fs.writeFile(logs_err_path, '') + ]) success = true; } catch(e) { logger.error(e); @@ -2860,10 +2835,8 @@ app.post('/api/clearAllLogs', async function(req, res) { let type = req.body.type; let result = null; if (!urlMode) { - if (type === 'audio') { - result = getAudioInfos(fileNames) - } else if (type === 'video') { - result = getVideoInfos(fileNames); + if (type === 'audio' || type === 'video') { + result = await getAudioOrVideoInfos(type, fileNames); } } else { result = await getUrlInfos(fileNames); @@ -2936,7 +2909,7 @@ app.post('/api/deleteUser', optionalJwt, async (req, res) => { const user_db_obj = users_db.get('users').find({uid: uid}); if (user_db_obj.value()) { // user exists, let's delete - deleteFolderRecursive(user_folder); + await fs.remove(user_folder); users_db.get('users').remove({uid: uid}).write(); } res.send({success: true}); From f535d18cb900b3fcc211050b858ae31119acde83 Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Sat, 26 Sep 2020 15:14:37 -0700 Subject: [PATCH 2/5] Use async methods in auth and subscriptions --- backend/app.js | 8 +- backend/authentication/auth.js | 50 +++-- backend/subscriptions.js | 332 ++++++++++++++++----------------- 3 files changed, 185 insertions(+), 205 deletions(-) diff --git a/backend/app.js b/backend/app.js index f88e47b..7ffdb7a 100644 --- a/backend/app.js +++ b/backend/app.js @@ -940,7 +940,7 @@ async function deleteAudioFile(name, customPath = null, blacklistMode = false) { // use subscriptions API to remove video from the archive file, and write it to the blacklist if (await fs.pathExists(archive_path)) { - const line = id ? subscriptions_api.removeIDFromArchive(archive_path, id) : null; + const line = id ? await subscriptions_api.removeIDFromArchive(archive_path, id) : null; if (blacklistMode && line) await writeToBlacklist('audio', line); } else { logger.info('Could not find archive file for audio files. Creating...'); @@ -1015,7 +1015,7 @@ async function deleteVideoFile(name, customPath = null, blacklistMode = false) { // use subscriptions API to remove video from the archive file, and write it to the blacklist if (await fs.pathExists(archive_path)) { - const line = id ? subscriptions_api.removeIDFromArchive(archive_path, id) : null; + const line = id ? await subscriptions_api.removeIDFromArchive(archive_path, id) : null; if (blacklistMode && line) await writeToBlacklist('video', line); } else { logger.info('Could not find archive file for videos. Creating...'); @@ -2429,7 +2429,7 @@ app.post('/api/deleteMp3', optionalJwt, async (req, res) => { var blacklistMode = req.body.blacklistMode; if (req.isAuthenticated()) { - let success = auth_api.deleteUserFile(req.user.uid, uid, 'audio', blacklistMode); + let success = await auth_api.deleteUserFile(req.user.uid, uid, 'audio', blacklistMode); res.send(success); return; } @@ -2460,7 +2460,7 @@ app.post('/api/deleteMp4', optionalJwt, async (req, res) => { var blacklistMode = req.body.blacklistMode; if (req.isAuthenticated()) { - let success = auth_api.deleteUserFile(req.user.uid, uid, 'video', blacklistMode); + let success = await auth_api.deleteUserFile(req.user.uid, uid, 'video', blacklistMode); res.send(success); return; } diff --git a/backend/authentication/auth.js b/backend/authentication/auth.js index 173dd37..f16fbf1 100644 --- a/backend/authentication/auth.js +++ b/backend/authentication/auth.js @@ -139,12 +139,12 @@ exports.registerUser = function(req, res) { exports.passport.use(new LocalStrategy({ usernameField: 'username', passwordField: 'password'}, - function(username, password, done) { + async function(username, password, done) { const user = users_db.get('users').find({name: username}).value(); if (!user) { logger.error(`User ${username} not found`); return done(null, false); } if (user.auth_method && user.auth_method !== 'internal') { return done(null, false); } if (user) { - return done(null, bcrypt.compareSync(password, user.passhash) ? user : false); + return done(null, (await bcrypt.compare(password, user.passhash)) ? user : false); } } )); @@ -160,7 +160,7 @@ exports.passport.use(new LdapStrategy(getLDAPConfiguration, // check if ldap auth is enabled const ldap_enabled = config_api.getConfigItem('ytdl_auth_method') === 'ldap'; if (!ldap_enabled) return done(null, false); - + const user_uid = user.uid; let db_user = users_db.get('users').find({uid: user_uid}).value(); if (!db_user) { @@ -226,15 +226,13 @@ exports.ensureAuthenticatedElseError = function(req, res, next) { // change password exports.changeUserPassword = async function(user_uid, new_pass) { - return new Promise(resolve => { - bcrypt.hash(new_pass, saltRounds) - .then(function(hash) { - users_db.get('users').find({uid: user_uid}).assign({passhash: hash}).write(); - resolve(true); - }).catch(err => { - resolve(false); - }); - }); + try { + const hash = await bcrypt.hash(new_pass, saltRounds); + users_db.get('users').find({uid: user_uid}).assign({passhash: hash}).write(); + return true; + } catch (err) { + return false; + } } // change user permissions @@ -352,7 +350,7 @@ exports.registerUserFile = function(user_uid, file_object, type) { .write(); } -exports.deleteUserFile = function(user_uid, file_uid, type, blacklistMode = false) { +exports.deleteUserFile = async function(user_uid, file_uid, type, blacklistMode = false) { let success = false; const file_obj = users_db.get('users').find({uid: user_uid}).get(`files.${type}`).find({uid: file_uid}).value(); if (file_obj) { @@ -375,20 +373,20 @@ exports.deleteUserFile = function(user_uid, file_uid, type, blacklistMode = fals .remove({ uid: file_uid }).write(); - if (fs.existsSync(full_path)) { + if (await fs.pathExists(full_path)) { // remove json and file const json_path = path.join(usersFileFolder, user_uid, type, file_obj.id + '.info.json'); const alternate_json_path = path.join(usersFileFolder, user_uid, type, file_obj.id + ext + '.info.json'); let youtube_id = null; - if (fs.existsSync(json_path)) { - youtube_id = fs.readJSONSync(json_path).id; - fs.unlinkSync(json_path); - } else if (fs.existsSync(alternate_json_path)) { - youtube_id = fs.readJSONSync(alternate_json_path).id; - fs.unlinkSync(alternate_json_path); + if (await fs.pathExists(json_path)) { + youtube_id = await fs.readJSON(json_path).id; + await fs.unlink(json_path); + } else if (await fs.pathExists(alternate_json_path)) { + youtube_id = await fs.readJSON(alternate_json_path).id; + await fs.unlink(alternate_json_path); } - fs.unlinkSync(full_path); + await fs.unlink(full_path); // do archive stuff @@ -397,17 +395,17 @@ exports.deleteUserFile = function(user_uid, file_uid, type, blacklistMode = fals const archive_path = path.join(usersFileFolder, user_uid, 'archives', `archive_${type}.txt`); // use subscriptions API to remove video from the archive file, and write it to the blacklist - if (fs.existsSync(archive_path)) { - const line = youtube_id ? subscriptions_api.removeIDFromArchive(archive_path, youtube_id) : null; + if (await fs.pathExists(archive_path)) { + const line = youtube_id ? await 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 line = '\n' + line; - fs.appendFileSync(blacklistPath, line); + await fs.appendFile(blacklistPath, line); } } else { logger.info(`Could not find archive file for ${type} files. Creating...`); - fs.ensureFileSync(archive_path); + await fs.ensureFile(archive_path); } } } @@ -533,7 +531,7 @@ function generateUserObject(userid, username, hash, auth_method = 'internal') { role: userid === 'admin' && auth_method === 'internal' ? 'admin' : 'user', permissions: [], permission_overrides: [], - auth_method: auth_method + auth_method: auth_method }; return new_user; } diff --git a/backend/subscriptions.js b/backend/subscriptions.js index a17dc1d..104568d 100644 --- a/backend/subscriptions.js +++ b/backend/subscriptions.js @@ -79,17 +79,18 @@ async function getSubscriptionInfo(sub, user_uid = null) { else basePath = config_api.getConfigItem('ytdl_subscriptions_base_path'); - return new Promise(resolve => { - // get videos - let downloadConfig = ['--dump-json', '--playlist-end', '1']; - let useCookies = config_api.getConfigItem('ytdl_use_cookies'); - if (useCookies) { - if (fs.existsSync(path.join(__dirname, 'appdata', 'cookies.txt'))) { - downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt')); - } else { - logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.'); - } + // get videos + let downloadConfig = ['--dump-json', '--playlist-end', '1']; + let useCookies = config_api.getConfigItem('ytdl_use_cookies'); + if (useCookies) { + if (await fs.pathExists(path.join(__dirname, 'appdata', 'cookies.txt'))) { + downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt')); + } else { + logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.'); } + } + + return new Promise(resolve => { youtubedl.exec(sub.url, downloadConfig, {}, function(err, output) { if (debugMode) { logger.info('Subscribe: got info for subscription ' + sub.id); @@ -152,39 +153,36 @@ async function getSubscriptionInfo(sub, user_uid = null) { } async function unsubscribe(sub, deleteMode, user_uid = null) { - return new Promise(async resolve => { - let basePath = null; - if (user_uid) - basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions'); - else - basePath = config_api.getConfigItem('ytdl_subscriptions_base_path'); - let result_obj = { success: false, error: '' }; + let basePath = null; + if (user_uid) + basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions'); + else + basePath = config_api.getConfigItem('ytdl_subscriptions_base_path'); + let result_obj = { success: false, error: '' }; - let id = sub.id; - if (user_uid) - users_db.get('users').find({uid: user_uid}).get('subscriptions').remove({id: id}).write(); - else - db.get('subscriptions').remove({id: id}).write(); + let id = sub.id; + if (user_uid) + users_db.get('users').find({uid: user_uid}).get('subscriptions').remove({id: id}).write(); + else + db.get('subscriptions').remove({id: id}).write(); - // failed subs have no name, on unsubscribe they shouldn't error - if (!sub.name) { - return; - } + // failed subs have no name, on unsubscribe they shouldn't error + if (!sub.name) { + return; + } - const appendedBasePath = getAppendedBasePath(sub, basePath); - if (deleteMode && fs.existsSync(appendedBasePath)) { - if (sub.archive && fs.existsSync(sub.archive)) { - const archive_file_path = path.join(sub.archive, 'archive.txt'); - // deletes archive if it exists - if (fs.existsSync(archive_file_path)) { - fs.unlinkSync(archive_file_path); - } - fs.rmdirSync(sub.archive); + const appendedBasePath = getAppendedBasePath(sub, basePath); + if (deleteMode && (await fs.pathExists(appendedBasePath))) { + if (sub.archive && (await fs.pathExists(sub.archive))) { + const archive_file_path = path.join(sub.archive, 'archive.txt'); + // deletes archive if it exists + if (await fs.pathExists(archive_file_path)) { + await fs.unlink(archive_file_path); } - deleteFolderRecursive(appendedBasePath); + await fs.rmdir(sub.archive); } - }); - + await fs.remove(appendedBasePath); + } } async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null, user_uid = null) { @@ -202,155 +200,154 @@ async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null, const name = file; let retrievedID = null; sub_db.get('videos').remove({uid: file_uid}).write(); - return new Promise(resolve => { - let filePath = appendedBasePath; - const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4' - var jsonPath = path.join(__dirname,filePath,name+'.info.json'); - var videoFilePath = path.join(__dirname,filePath,name+ext); - var imageFilePath = path.join(__dirname,filePath,name+'.jpg'); - var altImageFilePath = path.join(__dirname,filePath,name+'.jpg'); - - jsonExists = fs.existsSync(jsonPath); - videoFileExists = fs.existsSync(videoFilePath); - imageFileExists = fs.existsSync(imageFilePath); - altImageFileExists = fs.existsSync(altImageFilePath); - - if (jsonExists) { - retrievedID = JSON.parse(fs.readFileSync(jsonPath, 'utf8'))['id']; - fs.unlinkSync(jsonPath); - } - if (imageFileExists) { - fs.unlinkSync(imageFilePath); - } + let filePath = appendedBasePath; + const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4' + var jsonPath = path.join(__dirname,filePath,name+'.info.json'); + var videoFilePath = path.join(__dirname,filePath,name+ext); + var imageFilePath = path.join(__dirname,filePath,name+'.jpg'); + var altImageFilePath = path.join(__dirname,filePath,name+'.jpg'); + + const [jsonExists, videoFileExists, imageFileExists, altImageFileExists] = await Promise.all([ + fs.pathExists(jsonPath), + fs.pathExists(videoFilePath), + fs.pathExists(imageFilePath), + fs.pathExists(altImageFilePath), + ]); + + if (jsonExists) { + retrievedID = JSON.parse(await fs.readFile(jsonPath, 'utf8'))['id']; + await fs.unlink(jsonPath); + } - if (altImageFileExists) { - fs.unlinkSync(altImageFilePath); - } + if (imageFileExists) { + await fs.unlink(imageFilePath); + } - if (videoFileExists) { - fs.unlink(videoFilePath, function(err) { - if (fs.existsSync(jsonPath) || fs.existsSync(videoFilePath)) { - resolve(false); - } else { - // check if the user wants the video to be redownloaded (deleteForever === false) - if (!deleteForever && useArchive && sub.archive && retrievedID) { - const archive_path = path.join(sub.archive, 'archive.txt') - // if archive exists, remove line with video ID - if (fs.existsSync(archive_path)) { - removeIDFromArchive(archive_path, retrievedID); - } - } - resolve(true); - } - }); + if (altImageFileExists) { + await fs.unlink(altImageFilePath); + } + + if (videoFileExists) { + await fs.unlink(videoFilePath); + if ((await fs.pathExists(jsonPath)) || (await fs.pathExists(videoFilePath))) { + return false; } else { - // TODO: tell user that the file didn't exist - resolve(true); + // check if the user wants the video to be redownloaded (deleteForever === false) + if (!deleteForever && useArchive && sub.archive && retrievedID) { + const archive_path = path.join(sub.archive, 'archive.txt') + // if archive exists, remove line with video ID + if (await fs.pathExists(archive_path)) { + await removeIDFromArchive(archive_path, retrievedID); + } + } + return true; } - - }); + } else { + // TODO: tell user that the file didn't exist + return true; + } } async function getVideosForSub(sub, user_uid = null) { - return new Promise(resolve => { - if (!subExists(sub.id, user_uid)) { - resolve(false); - return; - } + if (!subExists(sub.id, user_uid)) { + return false; + } - // get sub_db - let sub_db = null; - if (user_uid) - sub_db = users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id}); - else - sub_db = db.get('subscriptions').find({id: sub.id}); + // get sub_db + let sub_db = null; + if (user_uid) + sub_db = users_db.get('users').find({uid: user_uid}).get('subscriptions').find({id: sub.id}); + else + sub_db = db.get('subscriptions').find({id: sub.id}); - // get basePath - let basePath = null; - if (user_uid) - basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions'); - else - basePath = config_api.getConfigItem('ytdl_subscriptions_base_path'); + // get basePath + let basePath = null; + if (user_uid) + basePath = path.join(config_api.getConfigItem('ytdl_users_base_path'), user_uid, 'subscriptions'); + else + basePath = config_api.getConfigItem('ytdl_subscriptions_base_path'); - const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); + const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive'); - let appendedBasePath = null - appendedBasePath = getAppendedBasePath(sub, basePath); + let appendedBasePath = null + appendedBasePath = getAppendedBasePath(sub, basePath); - let multiUserMode = null; - if (user_uid) { - multiUserMode = { - user: user_uid, - file_path: appendedBasePath - } + let multiUserMode = null; + if (user_uid) { + multiUserMode = { + user: user_uid, + file_path: appendedBasePath } + } - const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4' + const ext = (sub.type && sub.type === 'audio') ? '.mp3' : '.mp4' - let fullOutput = `${appendedBasePath}/%(title)s.%(ext)s`; - if (sub.custom_output) { - fullOutput = `${appendedBasePath}/${sub.custom_output}.%(ext)s`; - } + let fullOutput = `${appendedBasePath}/%(title)s.%(ext)s`; + if (sub.custom_output) { + fullOutput = `${appendedBasePath}/${sub.custom_output}.%(ext)s`; + } - let downloadConfig = ['-o', fullOutput, '-ciw', '--write-info-json', '--print-json']; + let downloadConfig = ['-o', fullOutput, '-ciw', '--write-info-json', '--print-json']; - let qualityPath = null; - if (sub.type && sub.type === 'audio') { - qualityPath = ['-f', 'bestaudio'] - qualityPath.push('-x'); - qualityPath.push('--audio-format', 'mp3'); - } else { - qualityPath = ['-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4'] - } + let qualityPath = null; + if (sub.type && sub.type === 'audio') { + qualityPath = ['-f', 'bestaudio'] + qualityPath.push('-x'); + qualityPath.push('--audio-format', 'mp3'); + } else { + qualityPath = ['-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4'] + } - downloadConfig.push(...qualityPath) + downloadConfig.push(...qualityPath) - if (sub.custom_args) { - customArgsArray = sub.custom_args.split(',,'); - if (customArgsArray.indexOf('-f') !== -1) { - // if custom args has a custom quality, replce the original quality with that of custom args - const original_output_index = downloadConfig.indexOf('-f'); - downloadConfig.splice(original_output_index, 2); - } - downloadConfig.push(...customArgsArray); + if (sub.custom_args) { + customArgsArray = sub.custom_args.split(',,'); + if (customArgsArray.indexOf('-f') !== -1) { + // if custom args has a custom quality, replce the original quality with that of custom args + const original_output_index = downloadConfig.indexOf('-f'); + downloadConfig.splice(original_output_index, 2); } + downloadConfig.push(...customArgsArray); + } - let archive_dir = null; - let archive_path = null; + let archive_dir = null; + let archive_path = null; - if (useArchive) { - if (sub.archive) { - archive_dir = sub.archive; - archive_path = path.join(archive_dir, 'archive.txt') - } - downloadConfig.push('--download-archive', archive_path); + if (useArchive) { + if (sub.archive) { + archive_dir = sub.archive; + archive_path = path.join(archive_dir, 'archive.txt') } + downloadConfig.push('--download-archive', archive_path); + } - // if streaming only mode, just get the list of videos - if (sub.streamingOnly) { - downloadConfig = ['-f', 'best', '--dump-json']; - } + // if streaming only mode, just get the list of videos + if (sub.streamingOnly) { + downloadConfig = ['-f', 'best', '--dump-json']; + } - if (sub.timerange) { - downloadConfig.push('--dateafter', sub.timerange); - } + if (sub.timerange) { + downloadConfig.push('--dateafter', sub.timerange); + } - let useCookies = config_api.getConfigItem('ytdl_use_cookies'); - if (useCookies) { - if (fs.existsSync(path.join(__dirname, 'appdata', 'cookies.txt'))) { - downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt')); - } else { - logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.'); - } + let useCookies = config_api.getConfigItem('ytdl_use_cookies'); + if (useCookies) { + if (await fs.pathExists(path.join(__dirname, 'appdata', 'cookies.txt'))) { + downloadConfig.push('--cookies', path.join('appdata', 'cookies.txt')); + } else { + logger.warn('Cookies file could not be found. You can either upload one, or disable \'use cookies\' in the Advanced tab in the settings.'); } + } - if (config_api.getConfigItem('ytdl_include_thumbnail')) { - downloadConfig.push('--write-thumbnail'); - } + if (config_api.getConfigItem('ytdl_include_thumbnail')) { + downloadConfig.push('--write-thumbnail'); + } + + // get videos + logger.verbose('Subscription: getting videos for subscription ' + sub.name); - // get videos - logger.verbose('Subscription: getting videos for subscription ' + sub.name); + return new Promise(resolve => { youtubedl.exec(sub.url, downloadConfig, {}, function(err, output) { logger.verbose('Subscription: finished check for ' + sub.name); if (err && !output) { @@ -456,23 +453,8 @@ function getAppendedBasePath(sub, base_path) { return path.join(base_path, (sub.isPlaylist ? 'playlists/' : 'channels/'), sub.name); } -// https://stackoverflow.com/a/32197381/8088021 -const deleteFolderRecursive = function(folder_to_delete) { - if (fs.existsSync(folder_to_delete)) { - fs.readdirSync(folder_to_delete).forEach((file, index) => { - const curPath = path.join(folder_to_delete, file); - if (fs.lstatSync(curPath).isDirectory()) { // recurse - deleteFolderRecursive(curPath); - } else { // delete file - fs.unlinkSync(curPath); - } - }); - fs.rmdirSync(folder_to_delete); - } - }; - -function removeIDFromArchive(archive_path, id) { - let data = fs.readFileSync(archive_path, {encoding: 'utf-8'}); +async function removeIDFromArchive(archive_path, id) { + let data = await fs.readFile(archive_path, {encoding: 'utf-8'}); if (!data) { logger.error('Archive could not be found.'); return; @@ -493,7 +475,7 @@ function removeIDFromArchive(archive_path, id) { // UPDATE FILE WITH NEW DATA const updatedData = dataArray.join('\n'); - fs.writeFileSync(archive_path, updatedData); + await fs.writeFile(archive_path, updatedData); if (line) return line; if (err) throw err; } From 21eafeab22ee654f987c80061b04074d15537605 Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Sat, 26 Sep 2020 15:22:57 -0700 Subject: [PATCH 3/5] Make utils.recFindByExt and utils.getDownloadedFilesByType async --- backend/app.js | 111 +++++++++++++++++++---------------------------- backend/db.js | 2 +- backend/utils.js | 17 ++++---- 3 files changed, 55 insertions(+), 75 deletions(-) diff --git a/backend/app.js b/backend/app.js index 7ffdb7a..0f2090e 100644 --- a/backend/app.js +++ b/backend/app.js @@ -205,54 +205,49 @@ async function wait(ms) { } async function checkMigrations() { - return new Promise(async resolve => { - // 3.5->3.6 migration - const files_to_db_migration_complete = true; // migration phased out! previous code: db.get('files_to_db_migration_complete').value(); - - if (!files_to_db_migration_complete) { - logger.info('Beginning migration: 3.5->3.6+') - runFilesToDBMigration().then(success => { - if (success) { logger.info('3.5->3.6+ migration complete!'); } - else { logger.error('Migration failed: 3.5->3.6+'); } - }); - } + // 3.5->3.6 migration + const files_to_db_migration_complete = true; // migration phased out! previous code: db.get('files_to_db_migration_complete').value(); - resolve(true); - }); + if (!files_to_db_migration_complete) { + logger.info('Beginning migration: 3.5->3.6+') + const success = await runFilesToDBMigration() + if (success) { logger.info('3.5->3.6+ migration complete!'); } + else { logger.error('Migration failed: 3.5->3.6+'); } + } + + return true; } async function runFilesToDBMigration() { - return new Promise(async resolve => { - try { - let mp3s = getMp3s(); - let mp4s = getMp4s(); - - for (let i = 0; i < mp3s.length; i++) { - let file_obj = mp3s[i]; - const file_already_in_db = db.get('files.audio').find({id: file_obj.id}).value(); - if (!file_already_in_db) { - logger.verbose(`Migrating file ${file_obj.id}`); - db_api.registerFileDB(file_obj.id + '.mp3', 'audio'); - } + try { + let mp3s = await getMp3s(); + let mp4s = await getMp4s(); + + for (let i = 0; i < mp3s.length; i++) { + let file_obj = mp3s[i]; + const file_already_in_db = db.get('files.audio').find({id: file_obj.id}).value(); + if (!file_already_in_db) { + logger.verbose(`Migrating file ${file_obj.id}`); + await db_api.registerFileDB(file_obj.id + '.mp3', 'audio'); } + } - for (let i = 0; i < mp4s.length; i++) { - let file_obj = mp4s[i]; - const file_already_in_db = db.get('files.video').find({id: file_obj.id}).value(); - if (!file_already_in_db) { - logger.verbose(`Migrating file ${file_obj.id}`); - db_api.registerFileDB(file_obj.id + '.mp4', 'video'); - } + for (let i = 0; i < mp4s.length; i++) { + let file_obj = mp4s[i]; + const file_already_in_db = db.get('files.video').find({id: file_obj.id}).value(); + if (!file_already_in_db) { + logger.verbose(`Migrating file ${file_obj.id}`); + await db_api.registerFileDB(file_obj.id + '.mp4', 'video'); } - - // sets migration to complete - db.set('files_to_db_migration_complete', true).write(); - resolve(true); - } catch(err) { - logger.error(err); - resolve(false); } - }); + + // sets migration to complete + db.set('files_to_db_migration_complete', true).write(); + return true; + } catch(err) { + logger.error(err); + return false; + } } async function startServer() { @@ -701,17 +696,17 @@ function generateEnvVarConfigItem(key) { return {key: key, value: process['env'][key]}; } -function getMp3s() { +async function getMp3s() { let mp3s = []; - var files = utils.recFindByExt(audioFolderPath, 'mp3'); // fs.readdirSync(audioFolderPath); + var files = await utils.recFindByExt(audioFolderPath, 'mp3'); // fs.readdirSync(audioFolderPath); for (let i = 0; i < files.length; i++) { let file = files[i]; var file_path = file.substring(audioFolderPath.length, file.length); - var stats = fs.statSync(file); + var stats = await fs.stat(file); var id = file_path.substring(0, file_path.length-4); - var jsonobj = utils.getJSONMp3(id, audioFolderPath); + var jsonobj = await utils.getJSONMp3(id, audioFolderPath); if (!jsonobj) continue; var title = jsonobj.title; var url = jsonobj.webpage_url; @@ -730,9 +725,9 @@ function getMp3s() { return mp3s; } -function getMp4s(relative_path = true) { +async function getMp4s(relative_path = true) { let mp4s = []; - var files = utils.recFindByExt(videoFolderPath, 'mp4'); + var files = await utils.recFindByExt(videoFolderPath, 'mp4'); for (let i = 0; i < files.length; i++) { let file = files[i]; var file_path = file.substring(videoFolderPath.length, file.length); @@ -740,7 +735,7 @@ function getMp4s(relative_path = true) { var stats = fs.statSync(file); var id = file_path.substring(0, file_path.length-4); - var jsonobj = utils.getJSONMp4(id, videoFolderPath); + var jsonobj = await utils.getJSONMp4(id, videoFolderPath); if (!jsonobj) continue; var title = jsonobj.title; var url = jsonobj.webpage_url; @@ -934,7 +929,7 @@ async function deleteAudioFile(name, customPath = null, blacklistMode = false) { // get ID from JSON - var jsonobj = utils.getJSONMp3(name, filePath); + var jsonobj = await utils.getJSONMp3(name, filePath); let id = null; if (jsonobj) id = jsonobj.id; @@ -1009,7 +1004,7 @@ async function deleteVideoFile(name, customPath = null, blacklistMode = false) { // get ID from JSON - var jsonobj = utils.getJSONMp4(name, filePath); + var jsonobj = await utils.getJSONMp4(name, filePath); let id = null; if (jsonobj) id = jsonobj.id; @@ -1038,22 +1033,6 @@ async function deleteVideoFile(name, customPath = null, blacklistMode = false) { } } -// replaces .webm with appropriate extension -function getTrueFileName(unfixed_path, type) { - let fixed_path = unfixed_path; - - const new_ext = (type === 'audio' ? 'mp3' : 'mp4'); - let unfixed_parts = unfixed_path.split('.'); - const old_ext = unfixed_parts[unfixed_parts.length-1]; - - - if (old_ext !== new_ext) { - unfixed_parts[unfixed_parts.length-1] = new_ext; - fixed_path = unfixed_parts.join('.'); - } - return fixed_path; -} - /** * @param {'audio' | 'video'} type * @param {string[]} fileNames @@ -2214,7 +2193,7 @@ app.post('/api/getSubscription', optionalJwt, async (req, res) => { let appended_base_path = path.join(base_path, (subscription.isPlaylist ? 'playlists' : 'channels'), subscription.name, '/'); let files; try { - files = utils.recFindByExt(appended_base_path, 'mp4'); + files = await utils.recFindByExt(appended_base_path, 'mp4'); } catch(e) { files = null; logger.info('Failed to get folder for subscription: ' + subscription.name + ' at path ' + appended_base_path); diff --git a/backend/db.js b/backend/db.js index c46cfd8..81524aa 100644 --- a/backend/db.js +++ b/backend/db.js @@ -184,7 +184,7 @@ async function importUnregisteredFiles() { // run through check list and check each file to see if it's missing from the db dirs_to_check.forEach(dir_to_check => { // recursively get all files in dir's path - const files = utils.getDownloadedFilesByType(dir_to_check.basePath, dir_to_check.type); + const files = await utils.getDownloadedFilesByType(dir_to_check.basePath, dir_to_check.type); files.forEach(file => { // check if file exists in db, if not add it diff --git a/backend/utils.js b/backend/utils.js index 73156f3..d7ac82d 100644 --- a/backend/utils.js +++ b/backend/utils.js @@ -4,6 +4,7 @@ const config_api = require('./config'); const is_windows = process.platform === 'win32'; +// replaces .webm with appropriate extension function getTrueFileName(unfixed_path, type) { let fixed_path = unfixed_path; @@ -19,21 +20,21 @@ function getTrueFileName(unfixed_path, type) { return fixed_path; } -function getDownloadedFilesByType(basePath, type) { +async function getDownloadedFilesByType(basePath, type) { // return empty array if the path doesn't exist - if (!fs.existsSync(basePath)) return []; + if (!(await fs.pathExists(basePath))) return []; let files = []; const ext = type === 'audio' ? 'mp3' : 'mp4'; - var located_files = recFindByExt(basePath, ext); + var located_files = await recFindByExt(basePath, ext); for (let i = 0; i < located_files.length; i++) { let file = located_files[i]; var file_path = file.substring(basePath.includes('\\') ? basePath.length+1 : basePath.length, file.length); - var stats = fs.statSync(file); + var stats = await fs.stat(file); var id = file_path.substring(0, file_path.length-4); - var jsonobj = getJSONByType(type, id, basePath); + var jsonobj = await getJSONByType(type, id, basePath); if (!jsonobj) continue; var title = jsonobj.title; var url = jsonobj.webpage_url; @@ -129,7 +130,7 @@ function fixVideoMetadataPerms(name, type, customPath = null) { : config_api.getConfigItem('ytdl_video_folder_path'); const ext = type === 'audio' ? '.mp3' : '.mp4'; - + const files_to_fix = [ // JSONs path.join(customPath, name + '.info.json'), @@ -158,7 +159,7 @@ function deleteJSONFile(name, type, customPath = null) { } -function recFindByExt(base,ext,files,result) +async function recFindByExt(base,ext,files,result) { files = files || fs.readdirSync(base) result = result || [] @@ -168,7 +169,7 @@ function recFindByExt(base,ext,files,result) var newbase = path.join(base,file) if ( fs.statSync(newbase).isDirectory() ) { - result = recFindByExt(newbase,ext,fs.readdirSync(newbase),result) + result = await recFindByExt(newbase,ext,fs.readdirSync(newbase),result) } else { From e26ac82c6634aca0cc06f86f69370104b6697634 Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Tue, 29 Sep 2020 08:53:36 -0700 Subject: [PATCH 4/5] Fix missing keywords --- backend/app.js | 2 +- backend/db.js | 4 ++-- backend/utils.js | 26 ++++++++++++-------------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/backend/app.js b/backend/app.js index 0f2090e..d58e350 100644 --- a/backend/app.js +++ b/backend/app.js @@ -1946,7 +1946,7 @@ app.post('/api/getFile', optionalJwt, function (req, res) { } }); -app.post('/api/getAllFiles', optionalJwt, function (req, res) { +app.post('/api/getAllFiles', optionalJwt, async function (req, res) { // these are returned let files = []; let playlists = []; diff --git a/backend/db.js b/backend/db.js index 81524aa..6f12be1 100644 --- a/backend/db.js +++ b/backend/db.js @@ -182,7 +182,7 @@ async function importUnregisteredFiles() { } // run through check list and check each file to see if it's missing from the db - dirs_to_check.forEach(dir_to_check => { + for (const dir_to_check of dirs_to_check) { // recursively get all files in dir's path const files = await utils.getDownloadedFilesByType(dir_to_check.basePath, dir_to_check.type); @@ -195,7 +195,7 @@ async function importUnregisteredFiles() { logger.verbose(`Added discovered file to the database: ${file.id}`); } }); - }); + } } diff --git a/backend/utils.js b/backend/utils.js index d7ac82d..4bfad5e 100644 --- a/backend/utils.js +++ b/backend/utils.js @@ -161,25 +161,23 @@ function deleteJSONFile(name, type, customPath = null) { async function recFindByExt(base,ext,files,result) { - files = files || fs.readdirSync(base) + files = files || (await fs.readdir(base)) result = result || [] - files.forEach( - function (file) { - var newbase = path.join(base,file) - if ( fs.statSync(newbase).isDirectory() ) - { - result = await recFindByExt(newbase,ext,fs.readdirSync(newbase),result) - } - else + for (const file in files) { + var newbase = path.join(base,file) + if ( (await fs.stat(newbase)).isDirectory() ) + { + result = await recFindByExt(newbase,ext,await fs.readdir(newbase),result) + } + else + { + if ( file.substr(-1*(ext.length+1)) == '.' + ext ) { - if ( file.substr(-1*(ext.length+1)) == '.' + ext ) - { - result.push(newbase) - } + result.push(newbase) } } - ) + } return result } From 3e4e7edd900c483f2af62e150629704bde730718 Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Tue, 29 Sep 2020 14:32:28 -0700 Subject: [PATCH 5/5] Oops. for in -> for of --- backend/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/utils.js b/backend/utils.js index 4bfad5e..411a7da 100644 --- a/backend/utils.js +++ b/backend/utils.js @@ -164,7 +164,7 @@ async function recFindByExt(base,ext,files,result) files = files || (await fs.readdir(base)) result = result || [] - for (const file in files) { + for (const file of files) { var newbase = path.join(base,file) if ( (await fs.stat(newbase)).isDirectory() ) {