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

Fixed issue where setting sub downloads as 'fresh' was not working properly (#567)

Browse Source
This commit is contained in:
Isaac Abadi
2022-04-30 00:58:12 -04:00
parent 4dd3b97515
commit 5e3eb68b03
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
backend/subscriptions.js
View File

@@ -266,11 +266,17 @@ async function getVideosForSub(sub, user_uid = null) {
} }
resolve(false); resolve(false);
} else if (output) { } else if (output) {
if (config_api.getConfigItem('ytdl_subscriptions_redownload_fresh_uploads')) {
await setFreshUploads(sub, user_uid);
checkVideosForFreshUploads(sub, user_uid);
}
if (output.length === 0 || (output.length === 1 && output[0] === '')) { if (output.length === 0 || (output.length === 1 && output[0] === '')) {
logger.verbose('No additional videos to download for ' + sub.name); logger.verbose('No additional videos to download for ' + sub.name);
resolve(true); resolve(true);
return; return;
} }
const output_jsons = []; const output_jsons = [];
for (let i = 0; i < output.length; i++) { for (let i = 0; i < output.length; i++) {
let output_json = null; let output_json = null;
@@ -294,13 +300,6 @@ async function getVideosForSub(sub, user_uid = null) {
} }
resolve(files_to_download); resolve(files_to_download);
if (config_api.getConfigItem('ytdl_subscriptions_redownload_fresh_uploads')) {
await setFreshUploads(sub, user_uid);
checkVideosForFreshUploads(sub, user_uid);
}
resolve(true);
} }
}); });
}, err => { }, err => {
@@ -473,22 +472,24 @@ async function updateSubscriptionProperty(sub, assignment_obj) {
return true; return true;
} }
async function setFreshUploads(sub, user_uid) { async function setFreshUploads(sub) {
const sub_files = await db_api.getRecords('files', {sub_id: sub.id});
const current_date = new Date().toISOString().split('T')[0].replace(/-/g, ''); const current_date = new Date().toISOString().split('T')[0].replace(/-/g, '');
sub.videos.forEach(async video => { sub_files.forEach(async file => {
if (current_date === video['upload_date'].replace(/-/g, '')) { if (current_date === file['upload_date'].replace(/-/g, '')) {
// set upload as fresh // set upload as fresh
const video_uid = video['uid']; const file_uid = file['uid'];
await db_api.setVideoProperty(video_uid, {'fresh_upload': true}, user_uid, sub['id']); await db_api.setVideoProperty(file_uid, {'fresh_upload': true});
} }
}); });
} }
async function checkVideosForFreshUploads(sub, user_uid) { async function checkVideosForFreshUploads(sub, user_uid) {
const sub_files = await db_api.getRecords('files', {sub_id: sub.id});
const current_date = new Date().toISOString().split('T')[0].replace(/-/g, ''); const current_date = new Date().toISOString().split('T')[0].replace(/-/g, '');
sub.videos.forEach(async video => { sub_files.forEach(async file => {
if (video['fresh_upload'] && current_date > video['upload_date'].replace(/-/g, '')) { if (file['fresh_upload'] && current_date > file['upload_date'].replace(/-/g, '')) {
await checkVideoIfBetterExists(video, sub, user_uid) await checkVideoIfBetterExists(file, sub, user_uid)
} }
}); });
} }
@@ -510,13 +511,13 @@ async function checkVideoIfBetterExists(file_obj, sub, user_uid) {
logger.verbose(`Failed to download better version of video ${file_obj['id']}`); logger.verbose(`Failed to download better version of video ${file_obj['id']}`);
} else if (output) { } else if (output) {
logger.verbose(`Successfully upgraded video ${file_obj['id']}'s ${metric_to_compare} from ${file_obj[metric_to_compare]} to ${output[metric_to_compare]}`); logger.verbose(`Successfully upgraded video ${file_obj['id']}'s ${metric_to_compare} from ${file_obj[metric_to_compare]} to ${output[metric_to_compare]}`);
await db_api.setVideoProperty(file_obj['uid'], {[metric_to_compare]: output[metric_to_compare]}, user_uid, sub['id']); await db_api.setVideoProperty(file_obj['uid'], {[metric_to_compare]: output[metric_to_compare]});
} }
}); });
} }
} }
}); });
await db_api.setVideoProperty(file_obj['uid'], {'fresh_upload': false}, user_uid, sub['id']); await db_api.setVideoProperty(file_obj['uid'], {'fresh_upload': false});
} }
// helper functions // helper functions