Plex
/
Plex-Meta-Manager
mirror of https://github.com/meisnate12/Plex-Meta-Manager.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[52] add `all` option to schedule

Browse Source
pull/858/head
meisnate12 3 years ago
parent 16be7a9d70
commit 2b6e6f1cec
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
VERSION
Unescape View File

@ -1 +1 @@
1.16.5-develop51 1.16.5-develop52

19
docs/metadata/details/schedule.md
Unescape View File

@ -66,15 +66,16 @@ collections:
The scheduling options are: The scheduling options are:
| Name | Description | Format | Example | | Name | Description | Format | Example |
|:--------|:------------------------------------------------|:----------------------|:---------------------| |:--------|:-----------------------------------------------------------------------------------------------------|:----------------------|:---------------------|
| Hourly | Update only when the script is run in that hour | hourly(Hour of Day) | `hourly(17)` | | Hourly | Update only when the script is run in that hour | hourly(Hour of Day) | `hourly(17)` |
| Daily | Update once a day | daily | `daily` | | Daily | Update once a day | daily | `daily` |
| Weekly | Update once a week on the specified day | weekly(Day of Week) | `weekly(sunday)` | | Weekly | Update once a week on the specified day | weekly(Day of Week) | `weekly(sunday)` |
| Monthly | Update once a month on the specified day | monthly(Day of Month) | `monthly(1)` | | Monthly | Update once a month on the specified day | monthly(Day of Month) | `monthly(1)` |
| Yearly | Update once a year on the specified day | yearly(MM/DD) | `yearly(01/30)` | | Yearly | Update once a year on the specified day | yearly(MM/DD) | `yearly(01/30)` |
| Range | Updates whenever the date is within the range | range(MM/DD-MM/DD) | `range(12/01-12/31)` | | Range | Updates whenever the date is within the range | range(MM/DD-MM/DD) | `range(12/01-12/31)` |
| Never | Never updates | never | `never` | | Never | Never updates | never | `never` |
| All | Requires that all scheduling option be meet in order to run<br>ex. `all, weekly(sunday), hourly(17)` | all | `all` |
* `daily` is the default when `schedule` isn't specified. * `daily` is the default when `schedule` isn't specified.
* You can run the script multiple times per day but using the `--time` command line argument detailed on the [Run Commands & Environmental Variables Page](../../home/environmental.md#time-to-run). * You can run the script multiple times per day but using the `--time` command line argument detailed on the [Run Commands & Environmental Variables Page](../../home/environmental.md#time-to-run).

36
modules/util.py
Unescape View File

@ -422,17 +422,22 @@ def check_day(_m, _d):
return _m, _d return _m, _d
def schedule_check(attribute, data, current_time, run_hour): def schedule_check(attribute, data, current_time, run_hour):
skip_collection = True
range_collection = False range_collection = False
schedule_list = get_list(data) all_check = 0
schedules_run = 0
is_all = False
next_month = current_time.replace(day=28) + timedelta(days=4) next_month = current_time.replace(day=28) + timedelta(days=4)
last_day = next_month - timedelta(days=next_month.day) last_day = next_month - timedelta(days=next_month.day)
schedule_str = "" schedule_str = ""
for schedule in schedule_list: for schedule in get_list(data):
run_time = str(schedule).lower() run_time = str(schedule).lower()
display = f"{attribute} attribute {schedule} invalid" display = f"{attribute} attribute {schedule} invalid"
if run_time.startswith(("day", "daily")): schedules_run += 1
skip_collection = False if run_time == "all":
is_all = True
all_check += 1
elif run_time.startswith(("day", "daily")):
all_check += 1
elif run_time == "never": elif run_time == "never":
schedule_str += f"\nNever scheduled to run" schedule_str += f"\nNever scheduled to run"
elif run_time.startswith(("hour", "week", "month", "year", "range")): elif run_time.startswith(("hour", "week", "month", "year", "range")):
@ -446,7 +451,7 @@ def schedule_check(attribute, data, current_time, run_hour):
if 0 <= int(param) <= 23: if 0 <= int(param) <= 23:
schedule_str += f"\nScheduled to run only on the {make_ordinal(int(param))} hour" schedule_str += f"\nScheduled to run only on the {make_ordinal(int(param))} hour"
if run_hour == int(param): if run_hour == int(param):
skip_collection = False all_check += 1
else: else:
raise ValueError raise ValueError
except ValueError: except ValueError:
@ -458,14 +463,14 @@ def schedule_check(attribute, data, current_time, run_hour):
weekday = days_alias[param.lower()] weekday = days_alias[param.lower()]
schedule_str += f"\nScheduled weekly on {pretty_days[weekday]}" schedule_str += f"\nScheduled weekly on {pretty_days[weekday]}"
if weekday == current_time.weekday(): if weekday == current_time.weekday():
skip_collection = False all_check += 1
elif run_time.startswith("month"): elif run_time.startswith("month"):
try: try:
if 1 <= int(param) <= 31: if 1 <= int(param) <= 31:
schedule_str += f"\nScheduled monthly on the {make_ordinal(int(param))}" schedule_str += f"\nScheduled monthly on the {make_ordinal(int(param))}"
if current_time.day == int(param) or ( if current_time.day == int(param) or (
current_time.day == last_day.day and int(param) > last_day.day): current_time.day == last_day.day and int(param) > last_day.day):
skip_collection = False all_check += 1
else: else:
raise ValueError raise ValueError
except ValueError: except ValueError:
@ -479,7 +484,7 @@ def schedule_check(attribute, data, current_time, run_hour):
schedule_str += f"\nScheduled yearly on {pretty_months[month]} {make_ordinal(day)}" schedule_str += f"\nScheduled yearly on {pretty_months[month]} {make_ordinal(day)}"
if current_time.month == month and (current_time.day == day or ( if current_time.month == month and (current_time.day == day or (
current_time.day == last_day.day and day > last_day.day)): current_time.day == last_day.day and day > last_day.day)):
skip_collection = False all_check += 1
else: else:
raise ValueError raise ValueError
except ValueError: except ValueError:
@ -498,15 +503,14 @@ def schedule_check(attribute, data, current_time, run_hour):
range_collection = True range_collection = True
schedule_str += f"\nScheduled between {pretty_months[month_start]} {make_ordinal(day_start)} and {pretty_months[month_end]} {make_ordinal(day_end)}" schedule_str += f"\nScheduled between {pretty_months[month_start]} {make_ordinal(day_start)} and {pretty_months[month_end]} {make_ordinal(day_end)}"
if start <= check <= end if start < end else (check <= end or check >= start): if start <= check <= end if start < end else (check <= end or check >= start):
skip_collection = False all_check += 1
else: else:
logger.error(f"Schedule Error: {display}") logger.error(f"Schedule Error: {display}")
if len(schedule_str) == 0: if all_check == 0 or (is_all and schedules_run != all_check):
skip_collection = False if range_collection:
if skip_collection and range_collection: raise NotScheduledRange(schedule_str)
raise NotScheduledRange(schedule_str) else:
elif skip_collection: raise NotScheduled(schedule_str)
raise NotScheduled(schedule_str)
def check_int(value, datatype="int", minimum=1, maximum=None): def check_int(value, datatype="int", minimum=1, maximum=None):
try: try:

Write Preview
Loading…
Cancel
Save