mirror of
https://github.com/nwithan8/plex-prerolls
synced 2024-08-30 16:52:17 +00:00
formatting cleanup to aide future debugging
This commit is contained in:
Brian Lindner
parent
260df79ca6
commit
4486051441
@ -33,17 +33,16 @@ Raises:
|
||||
FileNotFoundError: [description]
|
||||
"""
|
||||
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
import logging
|
||||
from argparse import ArgumentParser, Namespace
|
||||
from datetime import date, datetime, timedelta
|
||||
from typing import Dict, List, NamedTuple, Optional, Tuple, Union
|
||||
|
||||
import requests
|
||||
from datetime import datetime, date, timedelta
|
||||
import yaml
|
||||
from typing import NamedTuple, Union, Optional, Tuple, List, Dict
|
||||
from argparse import Namespace, ArgumentParser
|
||||
from configparser import ConfigParser
|
||||
from configparser import Error as ConfigError
|
||||
from plexapi.server import PlexServer, CONFIG
|
||||
from plexapi.server import PlexServer
|
||||
|
||||
# import local util modules
|
||||
import plexutil
|
||||
@ -53,6 +52,7 @@ logger = logging.getLogger(__name__)
|
||||
filename = os.path.basename(sys.argv[0])
|
||||
SCRIPT_NAME = os.path.splitext(filename)[0]
|
||||
|
||||
|
||||
class ScheduleEntry(NamedTuple):
|
||||
type: str
|
||||
startdate: datetime
|
||||
@ -60,8 +60,10 @@ class ScheduleEntry(NamedTuple):
|
||||
force: bool
|
||||
path: str
|
||||
|
||||
|
||||
ScheduleType = Dict[str, List[ScheduleEntry]]
|
||||
|
||||
|
||||
def arguments() -> Namespace:
|
||||
"""Setup and Return command line arguments
|
||||
See https://docs.python.org/3/howto/argparse.html
|
||||
@ -69,41 +71,55 @@ def arguments() -> Namespace:
|
||||
Returns:
|
||||
argparse.Namespace: Namespace object
|
||||
"""
|
||||
description = 'Automate scheduling of pre-roll intros for Plex'
|
||||
version = '0.10.1'
|
||||
description = "Automate scheduling of pre-roll intros for Plex"
|
||||
version = "0.10.1"
|
||||
|
||||
config_default = './config.ini'
|
||||
log_config_default = './logging.conf'
|
||||
schedule_default = './preroll_schedules.yaml'
|
||||
parser = ArgumentParser(description='{}'.format(description))
|
||||
parser.add_argument('-v', '--version', action='version', version='%(prog)s {}'.format(version),
|
||||
help='show the version number and exit'
|
||||
config_default = "./config.ini"
|
||||
log_config_default = "./logging.conf"
|
||||
schedule_default = "./preroll_schedules.yaml"
|
||||
parser = ArgumentParser(description=f"{description}")
|
||||
parser.add_argument(
|
||||
"-v",
|
||||
"--version",
|
||||
action="version",
|
||||
version=f"%(prog)s {version}",
|
||||
help="show the version number and exit",
|
||||
)
|
||||
parser.add_argument('-lc', '--logconfig-file',
|
||||
dest='log_config_file', action='store',
|
||||
parser.add_argument(
|
||||
"-lc",
|
||||
"--logconfig-file",
|
||||
dest="log_config_file",
|
||||
action="store",
|
||||
default=log_config_default,
|
||||
help='Path to logging config file. [Default: {}]' \
|
||||
.format(log_config_default)
|
||||
help=f"Path to logging config file. [Default: {log_config_default}]",
|
||||
)
|
||||
parser.add_argument('-t', '--test-run',
|
||||
dest='do_test_run', action='store_true',
|
||||
parser.add_argument(
|
||||
"-t",
|
||||
"--test-run",
|
||||
dest="do_test_run",
|
||||
action="store_true",
|
||||
default=False,
|
||||
help='Perform a test run, display output but dont save'
|
||||
help="Perform a test run, display output but dont save",
|
||||
)
|
||||
parser.add_argument('-c', '--config-file',
|
||||
dest='config_file', action='store',
|
||||
help='Path to Config.ini to use for Plex Server info. [Default: {}]' \
|
||||
.format(config_default)
|
||||
parser.add_argument(
|
||||
"-c",
|
||||
"--config-file",
|
||||
dest="config_file",
|
||||
action="store",
|
||||
help=f"Path to Config.ini to use for Plex Server info. [Default: {config_default}]",
|
||||
)
|
||||
parser.add_argument('-s', '--schedule-file',
|
||||
dest='schedule_file', action='store',
|
||||
help='Path to pre-roll schedule file (YAML) to be use. [Default: {}]' \
|
||||
.format(schedule_default)
|
||||
parser.add_argument(
|
||||
"-s",
|
||||
"--schedule-file",
|
||||
dest="schedule_file",
|
||||
action="store",
|
||||
help=f"Path to pre-roll schedule file (YAML) to be use. [Default: {schedule_default}]",
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
return args
|
||||
|
||||
|
||||
def schedule_types() -> ScheduleType:
|
||||
"""Return the main types of schedules to be used for storage processing
|
||||
|
||||
@ -111,14 +127,15 @@ def schedule_types() -> ScheduleType:
|
||||
ScheduleType: Dict of main schema items
|
||||
"""
|
||||
schema: ScheduleType = {
|
||||
'default': [],
|
||||
'monthly': [],
|
||||
'weekly': [],
|
||||
'date_range': [],
|
||||
'misc': []
|
||||
"default": [],
|
||||
"monthly": [],
|
||||
"weekly": [],
|
||||
"date_range": [],
|
||||
"misc": [],
|
||||
}
|
||||
return schema
|
||||
|
||||
|
||||
def week_range(year: int, weeknum: int) -> Tuple[datetime, datetime]:
|
||||
"""Return the starting/ending date range of a given year/week
|
||||
|
||||
@ -130,8 +147,7 @@ def week_range(year:int, weeknum:int) -> Tuple[datetime, datetime]:
|
||||
DateTime: Start date of the Year/Month
|
||||
DateTime: End date of the Year/Month
|
||||
"""
|
||||
start = datetime.strptime('{}-W{}-0'.format(year, int(weeknum)-1),
|
||||
"%Y-W%W-%w").date()
|
||||
start = datetime.strptime(f"{year}-W{int(weeknum) - 1}-0", "%Y-W%W-%w").date()
|
||||
end = start + timedelta(days=6)
|
||||
|
||||
start = datetime.combine(start, datetime.min.time())
|
||||
@ -139,6 +155,7 @@ def week_range(year:int, weeknum:int) -> Tuple[datetime, datetime]:
|
||||
|
||||
return (start, end)
|
||||
|
||||
|
||||
def month_range(year: int, monthnum: int) -> Tuple[datetime, datetime]:
|
||||
"""Return the starting/ending date range of a given year/month
|
||||
|
||||
@ -159,6 +176,7 @@ def month_range(year:int, monthnum:int) -> Tuple[datetime, datetime]:
|
||||
|
||||
return (start, end)
|
||||
|
||||
|
||||
def duration_seconds(start: Union[date, datetime], end: Union[date, datetime]) -> float:
|
||||
"""Return length of time between two date/datetime in seconds
|
||||
|
||||
@ -176,12 +194,10 @@ def duration_seconds(start:Union[date,datetime], end:Union[date,datetime]) -> fl
|
||||
|
||||
delta = end - start
|
||||
|
||||
logger.debug('duration_second[] Start: {} End: {} Duration: {}'.format(start,
|
||||
end,
|
||||
delta.total_seconds()
|
||||
))
|
||||
logger.debug(f"duration_second[] Start: {start} End: {end} Duration: {delta.total_seconds()}")
|
||||
return delta.total_seconds()
|
||||
|
||||
|
||||
def make_datetime(value: Union[str, date, datetime], lowtime: bool = True) -> datetime:
|
||||
"""Returns a DateTime object with a calculated Time component if none provided
|
||||
converts:
|
||||
@ -210,16 +226,15 @@ def make_datetime(value: Union[str, date, datetime], lowtime: bool=True) -> date
|
||||
time = datetime.max.time()
|
||||
|
||||
# determine how to translate the input value
|
||||
if isinstance(value, datetime):
|
||||
if isinstance(value, datetime): # type: ignore
|
||||
dt_val = value
|
||||
elif isinstance(value, date):
|
||||
elif isinstance(value, date): # type: ignore
|
||||
dt_val = datetime.combine(value, time)
|
||||
elif isinstance(value, str):
|
||||
elif isinstance(value, str): # type: ignore
|
||||
try:
|
||||
# Expect format of DateType string to be (YYYY-MM-DD or YYYY-MM-DD HH:MM:SS)
|
||||
# allow 'xx' to denote 'every' similar to Cron "*"
|
||||
msg = 'Translating string value="{}" to datetime (LowTime={})'.format(value,
|
||||
lowtime)
|
||||
msg = f'Translating string value="{value}" to datetime (LowTime={lowtime})'
|
||||
logger.debug(msg)
|
||||
|
||||
# default to today and the time period (low/high)
|
||||
@ -227,38 +242,37 @@ def make_datetime(value: Union[str, date, datetime], lowtime: bool=True) -> date
|
||||
hour, minute, second = time.hour, time.minute, time.second
|
||||
|
||||
# start parsing the Time out, for later additional processing
|
||||
dateparts = value.lower().split('-')
|
||||
dateparts = value.lower().split("-")
|
||||
|
||||
year = today.year if dateparts[0] == 'xxxx' else int(dateparts[0])
|
||||
month = today.month if dateparts[1] == 'xx' else int(dateparts[1])
|
||||
year = today.year if dateparts[0] == "xxxx" else int(dateparts[0])
|
||||
month = today.month if dateparts[1] == "xx" else int(dateparts[1])
|
||||
|
||||
dateparts_day = dateparts[2].split(' ')
|
||||
dateparts_day = dateparts[2].split(" ")
|
||||
|
||||
day = today.day if dateparts_day[0] == 'xx' else int(dateparts_day[0])
|
||||
day = today.day if dateparts_day[0] == "xx" else int(dateparts_day[0])
|
||||
|
||||
# attempt to parse out Time components
|
||||
if len(dateparts_day) > 1:
|
||||
timeparts = dateparts_day[1].split(':')
|
||||
timeparts = dateparts_day[1].split(":")
|
||||
if len(timeparts) > 1:
|
||||
hour = now.hour if timeparts[0] == 'xx' else int(timeparts[0])
|
||||
minute = now.minute if timeparts[1] == 'xx' else int(timeparts[1])
|
||||
second = now.second + 1 if timeparts[2] == 'xx' else int(timeparts[2])
|
||||
hour = now.hour if timeparts[0] == "xx" else int(timeparts[0])
|
||||
minute = now.minute if timeparts[1] == "xx" else int(timeparts[1])
|
||||
second = now.second + 1 if timeparts[2] == "xx" else int(timeparts[2])
|
||||
|
||||
dt_val = datetime(year, month, day, hour, minute, second)
|
||||
logger.debug('Datetime-> "{}"'.format(dt_val))
|
||||
logger.debug(f'Datetime-> "{dt_val}"')
|
||||
except Exception as e:
|
||||
msg = 'Unable to parse date string "{}"'.format(value)
|
||||
msg = f'Unable to parse date string "{value}"'
|
||||
logger.error(msg, exc_info=e)
|
||||
raise
|
||||
else:
|
||||
msg = 'UnknownType: Unable to parse date string "{}" for type "{}"'.format(value,
|
||||
type(value)
|
||||
)
|
||||
msg = f'UnknownType: Unable to parse date string "{value}" for type "{type(value)}"'
|
||||
logger.error(msg)
|
||||
raise TypeError(msg)
|
||||
|
||||
return dt_val
|
||||
|
||||
|
||||
def preroll_schedule(schedule_file: Optional[str] = None) -> List[ScheduleEntry]:
|
||||
"""Return a listing of defined preroll schedules for searching/use
|
||||
|
||||
@ -271,14 +285,14 @@ def preroll_schedule(schedule_file: Optional[str]=None) -> List[ScheduleEntry]:
|
||||
Returns:
|
||||
list: list of ScheduleEntries
|
||||
"""
|
||||
default_files = ['preroll_schedules.yaml', 'preroll_schedules.yml']
|
||||
default_files = ["preroll_schedules.yaml", "preroll_schedules.yml"]
|
||||
|
||||
filename = None
|
||||
if schedule_file != '' and schedule_file != None:
|
||||
if schedule_file not in ("", None):
|
||||
if os.path.exists(str(schedule_file)):
|
||||
filename = schedule_file
|
||||
else:
|
||||
msg = 'Pre-roll Schedule file "{}" not found'.format(schedule_file)
|
||||
msg = f'Pre-roll Schedule file "{schedule_file}" not found'
|
||||
raise FileNotFoundError(msg)
|
||||
else:
|
||||
for f in default_files:
|
||||
@ -288,19 +302,20 @@ def preroll_schedule(schedule_file: Optional[str]=None) -> List[ScheduleEntry]:
|
||||
|
||||
# if we still cant find a schedule file, we abort
|
||||
if not filename:
|
||||
msg = 'Missing schedule file: "{}"'.format('" / "'.join(default_files))
|
||||
filestr = '" / "'.join(default_files)
|
||||
msg = f'Missing schedule file: "{filestr}"'
|
||||
logger.critical(msg)
|
||||
raise FileNotFoundError(msg)
|
||||
|
||||
with open(filename, 'r') as file:
|
||||
contents = yaml.load(file, Loader=yaml.SafeLoader)
|
||||
with open(filename, "r") as file:
|
||||
contents = yaml.load(file, Loader=yaml.SafeLoader) # type: ignore
|
||||
|
||||
today = date.today()
|
||||
schedule: List[ScheduleEntry] = []
|
||||
for schedule_section in schedule_types():
|
||||
if schedule_section == 'weekly':
|
||||
if schedule_section == "weekly":
|
||||
try:
|
||||
use = contents[schedule_section]['enabled']
|
||||
use = contents[schedule_section]["enabled"]
|
||||
|
||||
if use:
|
||||
for i in range(1, 53):
|
||||
@ -310,139 +325,143 @@ def preroll_schedule(schedule_file: Optional[str]=None) -> List[ScheduleEntry]:
|
||||
if path:
|
||||
start, end = week_range(today.year, i)
|
||||
|
||||
entry = ScheduleEntry(type=schedule_section,
|
||||
entry = ScheduleEntry(
|
||||
type=schedule_section,
|
||||
force=False,
|
||||
startdate=start,
|
||||
enddate=end,
|
||||
path=path)
|
||||
path=path,
|
||||
)
|
||||
|
||||
schedule.append(entry)
|
||||
except KeyError as ke:
|
||||
# skip KeyError for missing Weeks
|
||||
msg = 'Key Value not found: "{}"->"{}", skipping week'.format(schedule_section,
|
||||
i)
|
||||
msg = f'Key Value not found: "{schedule_section}"->"{i}", skipping week'
|
||||
logger.debug(msg)
|
||||
pass
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found in "{}" section'.format(schedule_section)
|
||||
msg = f'Key Value not found in "{schedule_section}" section'
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
elif schedule_section == 'monthly':
|
||||
elif schedule_section == "monthly":
|
||||
try:
|
||||
use = contents[schedule_section]['enabled']
|
||||
use = contents[schedule_section]["enabled"]
|
||||
|
||||
if use:
|
||||
for i in range(1, 13):
|
||||
month_abrev = date(today.year, i, 1).strftime('%b').lower()
|
||||
month_abrev = date(today.year, i, 1).strftime("%b").lower()
|
||||
try:
|
||||
path = contents[schedule_section][month_abrev]
|
||||
|
||||
if path:
|
||||
start, end = month_range(today.year, i)
|
||||
|
||||
entry = ScheduleEntry(type=schedule_section,
|
||||
entry = ScheduleEntry(
|
||||
type=schedule_section,
|
||||
force=False,
|
||||
startdate=start,
|
||||
enddate=end,
|
||||
path=path)
|
||||
path=path,
|
||||
)
|
||||
|
||||
schedule.append(entry)
|
||||
except KeyError as ke:
|
||||
# skip KeyError for missing Months
|
||||
msg = 'Key Value not found: "{}"->"{}", skipping month'.format(schedule_section,
|
||||
month_abrev)
|
||||
msg = 'Key Value not found: "{schedule_section}"->"{month_abrev}", skipping month'
|
||||
logger.warning(msg)
|
||||
pass
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found in "{}" section'.format(schedule_section)
|
||||
msg = f'Key Value not found in "{schedule_section}" section'
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
elif schedule_section == 'date_range':
|
||||
elif schedule_section == "date_range":
|
||||
try:
|
||||
use = contents[schedule_section]['enabled']
|
||||
use = contents[schedule_section]["enabled"]
|
||||
if use:
|
||||
for r in contents[schedule_section]['ranges']:
|
||||
for r in contents[schedule_section]["ranges"]:
|
||||
try:
|
||||
path = r['path']
|
||||
path = r["path"]
|
||||
|
||||
if path:
|
||||
try:
|
||||
force = r['force']
|
||||
force = r["force"]
|
||||
except KeyError as ke:
|
||||
# special case Optional, ignore
|
||||
force = False
|
||||
pass
|
||||
|
||||
start = make_datetime(r['start_date'], lowtime=True)
|
||||
end = make_datetime(r['end_date'], lowtime=False)
|
||||
start = make_datetime(r["start_date"], lowtime=True)
|
||||
end = make_datetime(r["end_date"], lowtime=False)
|
||||
|
||||
entry = ScheduleEntry(type=schedule_section,
|
||||
entry = ScheduleEntry(
|
||||
type=schedule_section,
|
||||
force=force,
|
||||
startdate=start,
|
||||
enddate=end,
|
||||
path=path)
|
||||
path=path,
|
||||
)
|
||||
|
||||
schedule.append(entry)
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found for entry: "{}"'.format(entry)
|
||||
msg = f'Key Value not found for entry: "{entry}"' # type: ignore
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found in "{}" section'.format(schedule_section)
|
||||
msg = f'Key Value not found in "{schedule_section}" section'
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
elif schedule_section == 'misc':
|
||||
elif schedule_section == "misc":
|
||||
try:
|
||||
use = contents[schedule_section]['enabled']
|
||||
use = contents[schedule_section]["enabled"]
|
||||
if use:
|
||||
try:
|
||||
path = contents[schedule_section]['always_use']
|
||||
path = contents[schedule_section]["always_use"]
|
||||
|
||||
if path:
|
||||
entry = ScheduleEntry(type=schedule_section,
|
||||
entry = ScheduleEntry(
|
||||
type=schedule_section,
|
||||
force=False,
|
||||
startdate=datetime(today.year, today.month, today.day,
|
||||
0, 0, 0),
|
||||
enddate=datetime(today.year, today.month, today.day,
|
||||
23,59,59),
|
||||
path=path)
|
||||
startdate=datetime(today.year, today.month, today.day, 0, 0, 0),
|
||||
enddate=datetime(today.year, today.month, today.day, 23, 59, 59),
|
||||
path=path,
|
||||
)
|
||||
|
||||
schedule.append(entry)
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found for entry: "{}"'.format(entry)
|
||||
msg = f'Key Value not found for entry: "{entry}"' # type: ignore
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found in "{}" section'.format(schedule_section)
|
||||
msg = f'Key Value not found in "{schedule_section}" section'
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
elif schedule_section == 'default':
|
||||
elif schedule_section == "default":
|
||||
try:
|
||||
use = contents[schedule_section]['enabled']
|
||||
use = contents[schedule_section]["enabled"]
|
||||
if use:
|
||||
try:
|
||||
path = contents[schedule_section]['path']
|
||||
path = contents[schedule_section]["path"]
|
||||
|
||||
if path:
|
||||
entry = ScheduleEntry(type=schedule_section,
|
||||
entry = ScheduleEntry(
|
||||
type=schedule_section,
|
||||
force=False,
|
||||
startdate=datetime(today.year, today.month, today.day,
|
||||
0, 0, 0),
|
||||
enddate=datetime(today.year, today.month, today.day,
|
||||
23,59,59),
|
||||
path=path)
|
||||
startdate=datetime(today.year, today.month, today.day, 0, 0, 0),
|
||||
enddate=datetime(today.year, today.month, today.day, 23, 59, 59),
|
||||
path=path,
|
||||
)
|
||||
|
||||
schedule.append(entry)
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found for entry: "{}"'.format(entry)
|
||||
msg = f'Key Value not found for entry: "{entry}"' # type: ignore
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
except KeyError as ke:
|
||||
msg = 'Key Value not found in "{}" section'.format(schedule_section)
|
||||
msg = f'Key Value not found in "{schedule_section}" section'
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
else:
|
||||
msg = 'Unknown schedule_section "{}" detected'.format(schedule_section)
|
||||
msg = f'Unknown schedule_section "{schedule_section}" detected'
|
||||
logger.error(msg)
|
||||
raise ValueError(msg)
|
||||
|
||||
@ -451,6 +470,7 @@ def preroll_schedule(schedule_file: Optional[str]=None) -> List[ScheduleEntry]:
|
||||
|
||||
return schedule
|
||||
|
||||
|
||||
def build_listing_string(items: List[str], play_all: bool = False) -> str:
|
||||
"""Build the Plex formatted string of preroll paths
|
||||
|
||||
@ -463,13 +483,14 @@ def build_listing_string(items: List[str], play_all: bool=False) -> str:
|
||||
"""
|
||||
if play_all:
|
||||
# use , to play all entries
|
||||
listing = ','.join(items)
|
||||
listing = ",".join(items)
|
||||
else:
|
||||
# use ; to play random selection
|
||||
listing = ';'.join(items)
|
||||
listing = ";".join(items)
|
||||
|
||||
return listing
|
||||
|
||||
|
||||
def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[datetime] = None) -> str:
|
||||
"""Return listing of preroll videos to be used by Plex
|
||||
|
||||
@ -481,12 +502,12 @@ def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[dateti
|
||||
Returns:
|
||||
string: listing of preroll video paths to be used for Extras. CSV style: (;|,)
|
||||
"""
|
||||
listing = ''
|
||||
listing = ""
|
||||
entries = schedule_types()
|
||||
|
||||
# determine which date to build the listing for
|
||||
if for_datetime:
|
||||
if isinstance(for_datetime, datetime):
|
||||
if isinstance(for_datetime, datetime): # type: ignore
|
||||
check_datetime = for_datetime
|
||||
else:
|
||||
check_datetime = datetime.combine(for_datetime, datetime.now().time())
|
||||
@ -498,14 +519,12 @@ def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[dateti
|
||||
try:
|
||||
entry_start = entry.startdate
|
||||
entry_end = entry.enddate
|
||||
if not isinstance(entry_start, datetime):
|
||||
if not isinstance(entry_start, datetime): # type: ignore
|
||||
entry_start = datetime.combine(entry_start, datetime.min.time())
|
||||
if not isinstance(entry_end, datetime):
|
||||
if not isinstance(entry_end, datetime): # type: ignore
|
||||
entry_end = datetime.combine(entry_end, datetime.max.time())
|
||||
|
||||
msg = 'checking "{}" against: "{}" - "{}"'.format(check_datetime,
|
||||
entry_start,
|
||||
entry_end)
|
||||
msg = f'checking "{check_datetime}" against: "{entry_start}" - "{entry_end}"'
|
||||
logger.debug(msg)
|
||||
|
||||
if entry_start <= check_datetime <= entry_end:
|
||||
@ -518,7 +537,7 @@ def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[dateti
|
||||
# special case Optional, ignore
|
||||
pass
|
||||
|
||||
msg = 'Check PASS: Using "{}" - "{}"'.format(entry_start, entry_end)
|
||||
msg = f'Check PASS: Using "{entry_start}" - "{entry_end}"'
|
||||
logger.debug(msg)
|
||||
|
||||
if entry_path:
|
||||
@ -539,29 +558,33 @@ def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[dateti
|
||||
if not found or entry_force == True:
|
||||
entries[entry_type].append(entry)
|
||||
except KeyError as ke:
|
||||
msg = 'KeyError with entry "{}"'.format(entry)
|
||||
msg = f'KeyError with entry "{entry}"'
|
||||
logger.error(msg, exc_info=ke)
|
||||
raise
|
||||
|
||||
# Build the merged output based or order of Priority
|
||||
merged_list = []
|
||||
if entries['misc']:
|
||||
merged_list.extend([p.path for p in entries['misc']])
|
||||
if entries['date_range']:
|
||||
merged_list.extend([p.path for p in entries['date_range']])
|
||||
if entries['weekly'] and not entries['date_range']:
|
||||
merged_list.extend([p.path for p in entries['weekly']])
|
||||
if entries['monthly'] \
|
||||
and not entries['weekly'] and not entries['date_range']:
|
||||
merged_list.extend([p.path for p in entries['monthly']])
|
||||
if entries['default'] \
|
||||
and not entries['monthly'] and not entries['weekly'] and not entries['date_range']:
|
||||
merged_list.extend([p.path for p in entries['default']])
|
||||
if entries["misc"]:
|
||||
merged_list.extend([p.path for p in entries["misc"]]) # type: ignore
|
||||
if entries["date_range"]:
|
||||
merged_list.extend([p.path for p in entries["date_range"]]) # type: ignore
|
||||
if entries["weekly"] and not entries["date_range"]:
|
||||
merged_list.extend([p.path for p in entries["weekly"]]) # type: ignore
|
||||
if entries["monthly"] and not entries["weekly"] and not entries["date_range"]:
|
||||
merged_list.extend([p.path for p in entries["monthly"]]) # type: ignore
|
||||
if (
|
||||
entries["default"]
|
||||
and not entries["monthly"]
|
||||
and not entries["weekly"]
|
||||
and not entries["date_range"]
|
||||
):
|
||||
merged_list.extend([p.path for p in entries["default"]]) # type: ignore
|
||||
|
||||
listing = build_listing_string(merged_list)
|
||||
|
||||
return listing
|
||||
|
||||
|
||||
def save_preroll_listing(plex: PlexServer, preroll_listing: Union[str, List[str]]) -> None:
|
||||
"""Save Plex Preroll info to PlexServer settings
|
||||
|
||||
@ -570,20 +593,20 @@ def save_preroll_listing(plex: PlexServer, preroll_listing: Union[str, List[str]
|
||||
preroll_listing (str, list[str]): csv listing or List of preroll paths to save
|
||||
"""
|
||||
# if happend to send in an Iterable List, merge to a string
|
||||
if type(preroll_listing) is list:
|
||||
if isinstance(preroll_listing, list):
|
||||
preroll_listing = build_listing_string(list(preroll_listing))
|
||||
|
||||
msg = 'Attempting save of pre-rolls: "{}"'.format(preroll_listing)
|
||||
msg = f'Attempting save of pre-rolls: "{preroll_listing}"'
|
||||
logger.debug(msg)
|
||||
|
||||
plex.settings.get('cinemaTrailersPrerollID').set(preroll_listing)
|
||||
plex.settings.get("cinemaTrailersPrerollID").set(preroll_listing) # type: ignore
|
||||
plex.settings.save()
|
||||
|
||||
msg = 'Saved Pre-Rolls: Server: "{}" Pre-Rolls: "{}"'.format(plex.friendlyName,
|
||||
preroll_listing)
|
||||
msg = f'Saved Pre-Rolls: Server: "{plex.friendlyName}" Pre-Rolls: "{preroll_listing}"' # type: ignore
|
||||
logger.info(msg)
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
if __name__ == "__main__":
|
||||
args = arguments()
|
||||
|
||||
plexutil.init_logger(args.log_config_file)
|
||||
@ -600,12 +623,13 @@ if __name__ == '__main__':
|
||||
if sess.verify is False:
|
||||
# Disable the warning that the request is insecure, we know that...
|
||||
import urllib3
|
||||
|
||||
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
||||
|
||||
try:
|
||||
plex = PlexServer(cfg['PLEX_URL'], cfg['PLEX_TOKEN'], session=sess)
|
||||
plex = PlexServer(cfg["PLEX_URL"], cfg["PLEX_TOKEN"], session=sess)
|
||||
except Exception as e:
|
||||
msg = 'Error connecting to Plex'
|
||||
msg = "Error connecting to Plex"
|
||||
logger.error(msg, exc_info=e)
|
||||
raise e
|
||||
|
||||
@ -613,7 +637,7 @@ if __name__ == '__main__':
|
||||
prerolls = preroll_listing(schedule)
|
||||
|
||||
if args.do_test_run:
|
||||
msg = 'Test Run of Plex Pre-Rolls: **Nothing being saved**\n{}\n'.format(prerolls)
|
||||
msg = f"Test Run of Plex Pre-Rolls: **Nothing being saved**\n{prerolls}\n"
|
||||
logger.debug(msg)
|
||||
print(msg)
|
||||
else:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user