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

Fixed issue where backend would crash if the details bin did not exist for youtube-dl

Browse Source
This commit is contained in:
Isaac Abadi
2021-07-22 02:10:14 -06:00
parent f0e73c1708
commit 8469ae10ad
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
backend/app.js
View File

@@ -4,7 +4,6 @@ var { promisify } = require('util');
var auth_api = require('./authentication/auth'); var auth_api = require('./authentication/auth');
var winston = require('winston'); var winston = require('winston');
var path = require('path'); var path = require('path');
var youtubedl = require('youtube-dl');
var ffmpeg = require('fluent-ffmpeg'); var ffmpeg = require('fluent-ffmpeg');
var compression = require('compression'); var compression = require('compression');
var glob = require("glob") var glob = require("glob")
@@ -24,15 +23,22 @@ const fetch = require('node-fetch');
var URL = require('url').URL; var URL = require('url').URL;
const shortid = require('shortid') const shortid = require('shortid')
const url_api = require('url'); const url_api = require('url');
var config_api = require('./config.js');
var subscriptions_api = require('./subscriptions')
var categories_api = require('./categories');
var twitch_api = require('./twitch');
const CONSTS = require('./consts') const CONSTS = require('./consts')
const { spawn } = require('child_process') const { spawn } = require('child_process')
const read_last_lines = require('read-last-lines'); const read_last_lines = require('read-last-lines');
var ps = require('ps-node'); var ps = require('ps-node');
// needed if bin/details somehow gets deleted
const DETAILS_BIN_PATH = 'node_modules/youtube-dl/bin/details'
if (!fs.existsSync(DETAILS_BIN_PATH)) fs.writeJSONSync(DETAILS_BIN_PATH, {"version":"2000.06.06","path":"node_modules\\youtube-dl\\bin\\youtube-dl.exe","exec":"youtube-dl.exe","downloader":"youtube-dl"})
var youtubedl = require('youtube-dl');
var config_api = require('./config.js');
var subscriptions_api = require('./subscriptions')
var categories_api = require('./categories');
var twitch_api = require('./twitch');
const is_windows = process.platform === 'win32'; const is_windows = process.platform === 'win32';
var app = express(); var app = express();
@@ -1366,18 +1372,17 @@ async function autoUpdateYoutubeDL() {
const default_downloader = config_api.getConfigItem('ytdl_default_downloader'); const default_downloader = config_api.getConfigItem('ytdl_default_downloader');
const tags_url = download_sources[default_downloader]['tags_url']; const tags_url = download_sources[default_downloader]['tags_url'];
// get current version // get current version
let current_app_details_path = 'node_modules/youtube-dl/bin/details'; let current_app_details_exists = fs.existsSync(DETAILS_BIN_PATH);
let current_app_details_exists = fs.existsSync(current_app_details_path);
if (!current_app_details_exists) { if (!current_app_details_exists) {
logger.warn(`Failed to get youtube-dl binary details at location '${current_app_details_path}'. Generating file...`); logger.warn(`Failed to get youtube-dl binary details at location '${DETAILS_BIN_PATH}'. Generating file...`);
fs.writeJSONSync('node_modules/youtube-dl/bin/details', {"version":"2020.00.00", "downloader": default_downloader}); fs.writeJSONSync(DETAILS_BIN_PATH, {"version":"2020.00.00", "downloader": default_downloader});
} }
let current_app_details = JSON.parse(fs.readFileSync(current_app_details_path)); let current_app_details = JSON.parse(fs.readFileSync(DETAILS_BIN_PATH));
let current_version = current_app_details['version']; let current_version = current_app_details['version'];
let current_downloader = current_app_details['downloader']; let current_downloader = current_app_details['downloader'];
let stored_binary_path = current_app_details['path']; let stored_binary_path = current_app_details['path'];
if (!stored_binary_path || typeof stored_binary_path !== 'string') { if (!stored_binary_path || typeof stored_binary_path !== 'string') {
// logger.info(`INFO: Failed to get youtube-dl binary path at location: ${current_app_details_path}, attempting to guess actual path...`); // logger.info(`INFO: Failed to get youtube-dl binary path at location: ${DETAILS_BIN_PATH}, attempting to guess actual path...`);
const guessed_base_path = 'node_modules/youtube-dl/bin/'; const guessed_base_path = 'node_modules/youtube-dl/bin/';
const guessed_file_path = guessed_base_path + 'youtube-dl' + (is_windows ? '.exe' : ''); const guessed_file_path = guessed_base_path + 'youtube-dl' + (is_windows ? '.exe' : '');
if (fs.existsSync(guessed_file_path)) { if (fs.existsSync(guessed_file_path)) {
@@ -1460,16 +1465,14 @@ async function downloadLatestYoutubeDLPBinary(new_version) {
} }
function updateDetailsJSON(new_version, downloader) { function updateDetailsJSON(new_version, downloader) {
const details_path = 'node_modules/youtube-dl/bin/details'; const details_json = fs.readJSONSync(DETAILS_BIN_PATH);
const details_json = fs.readJSONSync(details_path);
if (new_version) details_json['version'] = new_version; if (new_version) details_json['version'] = new_version;
details_json['downloader'] = downloader; details_json['downloader'] = downloader;
fs.writeJSONSync(details_path, details_json); fs.writeJSONSync(DETAILS_BIN_PATH, details_json);
} }
function getCurrentDownloader() { function getCurrentDownloader() {
const details_path = 'node_modules/youtube-dl/bin/details'; const details_json = fs.readJSONSync(DETAILS_BIN_PATH);
const details_json = fs.readJSONSync(details_path);
return details_json['downloader']; return details_json['downloader'];
} }