csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

fix cron end

Browse Source
This commit is contained in:
jr-k 2024-05-27 19:48:38 +02:00
parent fd8df06cb5
commit 150382aa5a
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
data/www/js/utils.js
View File

@ -4,14 +4,23 @@ const validateCronDateTime = function(cronExpression) {
};
const cronToDateTimeObject = function(cronExpression) {
const parts = cronExpression.split(' ');
if (!validateCronDateTime(cronExpression)) {
return null;
}
[minutes, hours, day, month, _, year] = expression.split(' ')
return "{}-{}-{} at {}:{}".format(
year,
month.zfill(2),
day.zfill(2),
hours.zfill(2),
minutes.zfill(2)
)
}
let [minutes, hours, day, month, _, year] = cronExpression.split(' ');
minutes = parseInt(minutes, 10);
hours = parseInt(hours, 10);
day = parseInt(day, 10);
month = parseInt(month, 10) - 1;
year = parseInt(year, 10);
return new Date(year, month, day, hours, minutes);
};
const modifyDate = function(date, seconds) {
const clone = new Date(date.getTime());
clone.setSeconds(clone.getSeconds() + seconds);
return clone;
};

25
views/player/player.jinja.html
View File

@ -372,21 +372,36 @@
for (let i = 0; i < items.cron.length; i++) {
const item = items.cron[i];
const now = new Date();
const isFullyElapsedMinute = (new Date()).getSeconds() === 0;
const hasCron = item.cron_schedule && item.cron_schedule.length > 0;
const hasCronEnd = item.cron_schedule_end && item.cron_schedule_end.length > 0;
const hasDateTime = hasCron && validateCronDateTime(item.cron_schedule);
const hasDateTimeEnd = hasCronEnd && validateCronDateTime(item.cron_schedule_end);
console.log(hasDateTime)
if (hasDateTime && cronItemIndex !== i) {
console.log('coo')
if (cronItemIndex !== i && hasDateTime) {
const startDate = cronToDateTimeObject(item.cron_schedule);
const endDate = hasDateTimeEnd ? cronToDateTimeObject(item.cron_schedule_end) : modifyDate(startDate, item.duration);
} else if (isFullyElapsedMinute && cron.isActive(item.cron_schedule) && cronItemIndex !== i) {
if (now >= startDate && now < endDate) {
moveToCronSlide(i);
}
}
if (cronItemIndex === i && hasDateTime) {
const startDate = cronToDateTimeObject(item.cron_schedule);
const endDate = hasDateTimeEnd ? cronToDateTimeObject(item.cron_schedule_end) : modifyDate(startDate, item.duration);
if (now >= endDate) {
stopCronSlide();
}
}
if (cronItemIndex !== i && isFullyElapsedMinute && hasCron && cron.isActive(item.cron_schedule)) {
moveToCronSlide(i);
}
if (isFullyElapsedMinute && cron.isActive(item.cron_schedule_end) && cronItemIndex === i) {
if (cronItemIndex === i && isFullyElapsedMinute && hasCronEnd && cron.isActive(item.cron_schedule_end)) {
stopCronSlide();
}
}