aiden
/
YoutubeDL-Material
mirror of https://github.com/Tzahi12345/YoutubeDL-Material
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Tzahi12345/YoutubeDL-Material

Browse Source
python3-docker-test
Isaac Abadi 4 years ago
parent 2876cf55db 375d3b4f38
commit bbf94ef982
2 changed files with 63 additions and 34 deletions
Show Stats Download Patch File Download Diff File

94
backend/app.js
Unescape Escape View File

@ -1185,6 +1185,11 @@ async function generateArgs(url, type, options) {
downloadConfig = downloadConfig.concat(globalArgs.split(',,'));
}
const default_downloader = getCurrentDownloader() || config_api.getConfigItem('ytdl_default_downloader');
if (default_downloader === 'yt-dlp') {
downloadConfig.push('--no-clean-infojson');
}
}
// filter out incompatible args
@ -1343,21 +1348,33 @@ async function startYoutubeDL() {
// auto updates the underlying youtube-dl binary, not YoutubeDL-Material
async function autoUpdateYoutubeDL() {
const download_sources = {
'youtube-dl': {
'tags_url': 'https://api.github.com/repos/ytdl-org/youtube-dl/tags',
'func': downloadLatestYoutubeDLBinary
},
'youtube-dlc': {
'tags_url': 'https://api.github.com/repos/blackjack4494/yt-dlc/tags',
'func': downloadLatestYoutubeDLCBinary
},
'yt-dlp': {
'tags_url': 'https://api.github.com/repos/yt-dlp/yt-dlp/tags',
'func': downloadLatestYoutubeDLPBinary
}
}
return new Promise(async resolve => {
const default_downloader = config_api.getConfigItem('ytdl_default_downloader');
const using_youtube_dlc = default_downloader === 'youtube-dlc';
const youtube_dl_tags_url = 'https://api.github.com/repos/ytdl-org/youtube-dl/tags'
const youtube_dlc_tags_url = 'https://api.github.com/repos/blackjack4494/yt-dlc/tags'
const tags_url = download_sources[default_downloader]['tags_url'];
// get current version
let current_app_details_path = 'node_modules/youtube-dl/bin/details';
let current_app_details_exists = fs.existsSync(current_app_details_path);
if (!current_app_details_exists) {
logger.error(`Failed to get youtube-dl binary details at location '${current_app_details_path}'. Cancelling update check.`);
resolve(false);
return;
logger.warn(`Failed to get youtube-dl binary details at location '${current_app_details_path}'. Generating file...`);
fs.writeJSONSync('node_modules/youtube-dl/bin/details', {"version":"2020.00.00", "downloader": default_downloader});
}
let current_app_details = JSON.parse(fs.readFileSync(current_app_details_path));
let current_version = current_app_details['version'];
let current_downloader = current_app_details['downloader'];
let stored_binary_path = current_app_details['path'];
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...`);
@ -1374,15 +1391,9 @@ async function autoUpdateYoutubeDL() {
}
// got version, now let's check the latest version from the youtube-dl API
let youtubedl_api_path = using_youtube_dlc ? youtube_dlc_tags_url : youtube_dl_tags_url;
if (default_downloader === 'youtube-dl') {
await downloadLatestYoutubeDLBinary('unknown', 'unknown');
resolve(true);
return;
}
fetch(youtubedl_api_path, {method: 'Get'})
fetch(tags_url, {method: 'Get'})
.then(async res => res.json())
.then(async (json) => {
// check if the versions are different
@ -1392,16 +1403,16 @@ async function autoUpdateYoutubeDL() {
return false;
}
const latest_update_version = json[0]['name'];
if (current_version !== latest_update_version) {
// versions different, download new update
if (current_version !== latest_update_version || default_downloader !== current_downloader) {
// versions different or different downloader is being used, download new update
logger.info(`Found new update for ${default_downloader}. Updating binary...`);
try {
await checkExistsWithTimeout(stored_binary_path, 10000);
} catch(e) {
logger.error(`Failed to update ${default_downloader} - ${e}`);
}
if (using_youtube_dlc) await downloadLatestYoutubeDLCBinary(latest_update_version);
else await downloadLatestYoutubeDLBinary(current_version, latest_update_version);
await download_sources[default_downloader]['func'](latest_update_version);
resolve(true);
} else {
@ -1415,19 +1426,15 @@ async function autoUpdateYoutubeDL() {
});
}
async function downloadLatestYoutubeDLBinary(current_version, new_version) {
return new Promise(resolve => {
let binary_path = 'node_modules/youtube-dl/bin';
downloader(binary_path, function error(err, done) {
if (err) {
logger.error(`youtube-dl failed to update. Restart the server to try again.`);
logger.error(err);
resolve(false);
}
logger.info(`youtube-dl successfully updated!`);
resolve(true);
});
});
async function downloadLatestYoutubeDLBinary(new_version) {
const file_ext = is_windows ? '.exe' : '';
const download_url = `https://github.com/ytdl-org/youtube-dl/releases/latest/download/youtube-dl${file_ext}`;
const output_path = `node_modules/youtube-dl/bin/youtube-dl${file_ext}`;
await fetchFile(download_url, output_path, `youtube-dl ${new_version}`);
updateDetailsJSON(new_version, 'youtube-dl');
}
async function downloadLatestYoutubeDLCBinary(new_version) {
@ -1438,13 +1445,34 @@ async function downloadLatestYoutubeDLCBinary(new_version) {
await fetchFile(download_url, output_path, `youtube-dlc ${new_version}`);
const details_path = 'node_modules/youtube-dl/bin/details';
const details_json = fs.readJSONSync('node_modules/youtube-dl/bin/details');
details_json['version'] = new_version;
updateDetailsJSON(new_version, 'youtube-dlc');
}
async function downloadLatestYoutubeDLPBinary(new_version) {
const file_ext = is_windows ? '.exe' : '';
const download_url = `https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp${file_ext}`;
const output_path = `node_modules/youtube-dl/bin/youtube-dl${file_ext}`;
await fetchFile(download_url, output_path, `yt-dlp ${new_version}`);
updateDetailsJSON(new_version, 'yt-dlp');
}
function updateDetailsJSON(new_version, downloader) {
const details_path = 'node_modules/youtube-dl/bin/details';
const details_json = fs.readJSONSync(details_path);
if (new_version) details_json['version'] = new_version;
details_json['downloader'] = downloader;
fs.writeJSONSync(details_path, details_json);
}
function getCurrentDownloader() {
const details_path = 'node_modules/youtube-dl/bin/details';
const details_json = fs.readJSONSync(details_path);
return details_json['downloader'];
}
async function checkExistsWithTimeout(filePath, timeout) {
return new Promise(function (resolve, reject) {

3
src/app/settings/settings.component.html
Unescape Escape View File

@ -326,8 +326,9 @@
<mat-form-field>
<mat-label><ng-container i18n="Default downloader select label">Select a downloader</ng-container></mat-label>
<mat-select color="accent" [(ngModel)]="new_config['Advanced']['default_downloader']">
<mat-option value="youtube-dlc">youtube-dlc</mat-option>
<mat-option value="youtube-dl">youtube-dl</mat-option>
<mat-option value="youtube-dlc">youtube-dlc</mat-option>
<mat-option value="yt-dlp">yt-dlp</mat-option>
</mat-select>
</mat-form-field>
</div>

Write Preview
Loading…
Cancel
Save