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

Fixed issue where subscriptions check interval would only update after restart

Browse Source
This commit is contained in:
Isaac Abadi
2021-07-22 20:56:42 -06:00
parent 21b97911e8
commit 6e084bd94a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/app.js
View File

@@ -136,7 +136,6 @@ var downloadOnlyMode = null;
var useDefaultDownloadingAgent = null; var useDefaultDownloadingAgent = null;
var customDownloadingAgent = null; var customDownloadingAgent = null;
var allowSubscriptions = null; var allowSubscriptions = null;
var subscriptionsCheckInterval = null;
var archivePath = path.join(__dirname, 'appdata', 'archives'); var archivePath = path.join(__dirname, 'appdata', 'archives');
// other needed values // other needed values
@@ -627,10 +626,13 @@ async function loadConfig() {
let subscriptions = await subscriptions_api.getAllSubscriptions(); let subscriptions = await subscriptions_api.getAllSubscriptions();
subscriptions_api.updateSubscriptionPropertyMultiple(subscriptions, {downloading: false}); subscriptions_api.updateSubscriptionPropertyMultiple(subscriptions, {downloading: false});
// runs initially, then runs every ${subscriptionCheckInterval} seconds // runs initially, then runs every ${subscriptionCheckInterval} seconds
watchSubscriptions(); const watchSubscriptionsInterval = function() {
setInterval(() => {
watchSubscriptions(); watchSubscriptions();
}, subscriptionsCheckInterval * 1000); const subscriptionsCheckInterval = config_api.getConfigItem('ytdl_subscriptions_check_interval');
setTimeout(watchSubscriptionsInterval, subscriptionsCheckInterval*1000);
}
watchSubscriptionsInterval();
} }
await db_api.importUnregisteredFiles(); await db_api.importUnregisteredFiles();
@@ -653,7 +655,6 @@ function loadConfigValues() {
useDefaultDownloadingAgent = config_api.getConfigItem('ytdl_use_default_downloading_agent'); useDefaultDownloadingAgent = config_api.getConfigItem('ytdl_use_default_downloading_agent');
customDownloadingAgent = config_api.getConfigItem('ytdl_custom_downloading_agent'); customDownloadingAgent = config_api.getConfigItem('ytdl_custom_downloading_agent');
allowSubscriptions = config_api.getConfigItem('ytdl_allow_subscriptions'); allowSubscriptions = config_api.getConfigItem('ytdl_allow_subscriptions');
subscriptionsCheckInterval = config_api.getConfigItem('ytdl_subscriptions_check_interval');
if (!useDefaultDownloadingAgent && validDownloadingAgents.indexOf(customDownloadingAgent) !== -1 ) { if (!useDefaultDownloadingAgent && validDownloadingAgents.indexOf(customDownloadingAgent) !== -1 ) {
logger.info(`Using non-default downloading agent \'${customDownloadingAgent}\'`) logger.info(`Using non-default downloading agent \'${customDownloadingAgent}\'`)
@@ -678,6 +679,7 @@ function loadConfigValues() {
function calculateSubcriptionRetrievalDelay(subscriptions_amount) { function calculateSubcriptionRetrievalDelay(subscriptions_amount) {
// frequency is once every 5 mins by default // frequency is once every 5 mins by default
const subscriptionsCheckInterval = config_api.getConfigItem('ytdl_subscriptions_check_interval');
let interval_in_ms = subscriptionsCheckInterval * 1000; let interval_in_ms = subscriptionsCheckInterval * 1000;
const subinterval_in_ms = interval_in_ms/subscriptions_amount; const subinterval_in_ms = interval_in_ms/subscriptions_amount;
return subinterval_in_ms; return subinterval_in_ms;
@@ -722,6 +724,7 @@ async function watchSubscriptions() {
}, current_delay); }, current_delay);
subscription_timeouts[sub.id] = true; subscription_timeouts[sub.id] = true;
current_delay += delay_interval; current_delay += delay_interval;
const subscriptionsCheckInterval = config_api.getConfigItem('ytdl_subscriptions_check_interval');
if (current_delay >= subscriptionsCheckInterval * 1000) current_delay = 0; if (current_delay >= subscriptionsCheckInterval * 1000) current_delay = 0;
} }
} }