Mirrored_Repos/plex-prerolls
1
0
Fork 0
mirror of https://github.com/nwithan8/plex-prerolls synced 2024-08-30 16:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated logging messages/format

Browse Source
This commit is contained in:
Brian Lindner 2022-10-08 17:46:41 -04:00
parent c45421746c
commit bf36f91dfb
No known key found for this signature in database
1 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
schedule_preroll.py
View File

@ -41,6 +41,7 @@ from datetime import date, datetime, timedelta
from typing import Dict, List, NamedTuple, Optional, Tuple, Union from typing import Dict, List, NamedTuple, Optional, Tuple, Union
import requests import requests
import urllib3
import yaml import yaml
from plexapi.server import PlexServer from plexapi.server import PlexServer
@ -194,7 +195,9 @@ def duration_seconds(start: Union[date, datetime], end: Union[date, datetime]) -
delta = end - start delta = end - start
logger.debug(f"duration_second[] Start: {start} End: {end} Duration: {delta.total_seconds()}") logger.debug(
"duration_second[] Start: %s End: %s Duration: %s}", start, end, delta.total_seconds()
)
return delta.total_seconds() return delta.total_seconds()
@ -234,8 +237,7 @@ def make_datetime(value: Union[str, date, datetime], lowtime: bool = True) -> da
try: try:
# Expect format of DateType string to be (YYYY-MM-DD or YYYY-MM-DD HH:MM:SS) # 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 "*" # allow 'xx' to denote 'every' similar to Cron "*"
msg = f'Translating string value="{value}" to datetime (LowTime={lowtime})' logger.debug('Translating string value="%s" to datetime (LowTime=%s)', value, lowtime)
logger.debug(msg)
# default to today and the time period (low/high) # default to today and the time period (low/high)
year, month, day = today.year, today.month, today.day year, month, day = today.year, today.month, today.day
@ -260,14 +262,13 @@ def make_datetime(value: Union[str, date, datetime], lowtime: bool = True) -> da
second = now.second + 1 if timeparts[2] == "xx" else int(timeparts[2]) second = now.second + 1 if timeparts[2] == "xx" else int(timeparts[2])
dt_val = datetime(year, month, day, hour, minute, second) dt_val = datetime(year, month, day, hour, minute, second)
logger.debug(f'Datetime-> "{dt_val}"') logger.debug("Datetime-> '%s'", dt_val)
except Exception as e: except Exception as e:
msg = f'Unable to parse date string "{value}"' logger.error('Unable to parse date string "%s"', value, exc_info=e)
logger.error(msg, exc_info=e)
raise raise
else: else:
msg = f'UnknownType: Unable to parse date string "{value}" for type "{type(value)}"' msg = 'UnknownType: Unable to parse date string "%s" for type "%s"'
logger.error(msg) logger.error(msg, value, type(value))
raise TypeError(msg) raise TypeError(msg)
return dt_val return dt_val
@ -303,9 +304,8 @@ def preroll_schedule(schedule_file: Optional[str] = None) -> List[ScheduleEntry]
# if we still cant find a schedule file, we abort # if we still cant find a schedule file, we abort
if not filename: if not filename:
filestr = '" / "'.join(default_files) filestr = '" / "'.join(default_files)
msg = f'Missing schedule file: "{filestr}"' logger.critical('Missing schedule file: "%s"', filestr)
logger.critical(msg) raise FileNotFoundError(filestr)
raise FileNotFoundError(msg)
with open(filename, "r") as file: with open(filename, "r") as file:
contents = yaml.load(file, Loader=yaml.SafeLoader) # type: ignore contents = yaml.load(file, Loader=yaml.SafeLoader) # type: ignore
@ -334,14 +334,16 @@ def preroll_schedule(schedule_file: Optional[str] = None) -> List[ScheduleEntry]
) )
schedule.append(entry) schedule.append(entry)
except KeyError as ke: except KeyError:
# skip KeyError for missing Weeks # skip KeyError for missing Weeks
msg = f'Key Value not found: "{schedule_section}"->"{i}", skipping week' logger.debug(
logger.debug(msg) 'Key Value not found: "%s"->"%s", skipping week',
schedule_section,
i,
)
pass pass
except KeyError as ke: except KeyError as ke:
msg = f'Key Value not found in "{schedule_section}" section' logger.error('Key Value not found in "%s" section', schedule_section, exc_info=ke)
logger.error(msg, exc_info=ke)
raise raise
elif schedule_section == "monthly": elif schedule_section == "monthly":
try: try:
@ -365,14 +367,16 @@ def preroll_schedule(schedule_file: Optional[str] = None) -> List[ScheduleEntry]
) )
schedule.append(entry) schedule.append(entry)
except KeyError as ke: except KeyError:
# skip KeyError for missing Months # skip KeyError for missing Months
msg = 'Key Value not found: "{schedule_section}"->"{month_abrev}", skipping month' logger.warning(
logger.warning(msg) 'Key Value not found: "%s"->"%s", skipping month',
schedule_section,
month_abrev,
)
pass pass
except KeyError as ke: except KeyError as ke:
msg = f'Key Value not found in "{schedule_section}" section' logger.error('Key Value not found in "%s" section', schedule_section, exc_info=ke)
logger.error(msg, exc_info=ke)
raise raise
elif schedule_section == "date_range": elif schedule_section == "date_range":
try: try:
@ -403,12 +407,10 @@ def preroll_schedule(schedule_file: Optional[str] = None) -> List[ScheduleEntry]
schedule.append(entry) schedule.append(entry)
except KeyError as ke: except KeyError as ke:
msg = f'Key Value not found for entry: "{entry}"' # type: ignore logger.error('Key Value not found for entry: "%s"', entry, exc_info=ke) # type: ignore
logger.error(msg, exc_info=ke)
raise raise
except KeyError as ke: except KeyError as ke:
msg = f'Key Value not found in "{schedule_section}" section' logger.error('Key Value not found in "%s" section', schedule_section, exc_info=ke)
logger.error(msg, exc_info=ke)
raise raise
elif schedule_section == "misc": elif schedule_section == "misc":
try: try:
@ -432,8 +434,7 @@ def preroll_schedule(schedule_file: Optional[str] = None) -> List[ScheduleEntry]
logger.error(msg, exc_info=ke) logger.error(msg, exc_info=ke)
raise raise
except KeyError as ke: except KeyError as ke:
msg = f'Key Value not found in "{schedule_section}" section' logger.error('Key Value not found in "%s" section', schedule_section, exc_info=ke)
logger.error(msg, exc_info=ke)
raise raise
elif schedule_section == "default": elif schedule_section == "default":
try: try:
@ -453,12 +454,10 @@ def preroll_schedule(schedule_file: Optional[str] = None) -> List[ScheduleEntry]
schedule.append(entry) schedule.append(entry)
except KeyError as ke: except KeyError as ke:
msg = f'Key Value not found for entry: "{entry}"' # type: ignore logger.error('Key Value not found for entry: "%s"', entry, exc_info=ke) # type: ignore
logger.error(msg, exc_info=ke)
raise raise
except KeyError as ke: except KeyError as ke:
msg = f'Key Value not found in "{schedule_section}" section' logger.error('Key Value not found in "%s" section', schedule_section, exc_info=ke)
logger.error(msg, exc_info=ke)
raise raise
else: else:
msg = f'Unknown schedule_section "{schedule_section}" detected' msg = f'Unknown schedule_section "{schedule_section}" detected'
@ -524,8 +523,9 @@ def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[dateti
if not isinstance(entry_end, datetime): # type: ignore if not isinstance(entry_end, datetime): # type: ignore
entry_end = datetime.combine(entry_end, datetime.max.time()) entry_end = datetime.combine(entry_end, datetime.max.time())
msg = f'checking "{check_datetime}" against: "{entry_start}" - "{entry_end}"' logger.debug(
logger.debug(msg) 'checking "%s" against: "%s" - "%s"', check_datetime, entry_start, entry_end
)
if entry_start <= check_datetime <= entry_end: if entry_start <= check_datetime <= entry_end:
entry_type = entry.type entry_type = entry.type
@ -533,12 +533,11 @@ def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[dateti
entry_force = False entry_force = False
try: try:
entry_force = entry.force entry_force = entry.force
except KeyError as ke: except KeyError:
# special case Optional, ignore # special case Optional, ignore
pass pass
msg = f'Check PASS: Using "{entry_start}" - "{entry_end}"' logger.debug('Check PASS: Using "%s" - "%s"', entry_start, entry_end)
logger.debug(msg)
if entry_path: if entry_path:
found = False found = False
@ -558,8 +557,7 @@ def preroll_listing(schedule: List[ScheduleEntry], for_datetime: Optional[dateti
if not found or entry_force == True: if not found or entry_force == True:
entries[entry_type].append(entry) entries[entry_type].append(entry)
except KeyError as ke: except KeyError as ke:
msg = f'KeyError with entry "{entry}"' logger.error('KeyError with entry "%s"', entry, exc_info=ke)
logger.error(msg, exc_info=ke)
raise raise
# Build the merged output based or order of Priority # Build the merged output based or order of Priority
@ -596,14 +594,12 @@ def save_preroll_listing(plex: PlexServer, preroll_listing: Union[str, List[str]
if isinstance(preroll_listing, list): if isinstance(preroll_listing, list):
preroll_listing = build_listing_string(list(preroll_listing)) preroll_listing = build_listing_string(list(preroll_listing))
msg = f'Attempting save of pre-rolls: "{preroll_listing}"' logger.debug('Attempting save of pre-rolls: "%s"', preroll_listing)
logger.debug(msg)
plex.settings.get("cinemaTrailersPrerollID").set(preroll_listing) # type: ignore plex.settings.get("cinemaTrailersPrerollID").set(preroll_listing) # type: ignore
plex.settings.save() plex.settings.save() # type: ignore
msg = f'Saved Pre-Rolls: Server: "{plex.friendlyName}" Pre-Rolls: "{preroll_listing}"' # type: ignore logger.info('Saved Pre-Rolls: Server: "%s" Pre-Rolls: "%s"', plex.friendlyName, preroll_listing) # type: ignore
logger.info(msg)
if __name__ == "__main__": if __name__ == "__main__":
@ -622,15 +618,14 @@ if __name__ == "__main__":
# from OpenSSL. # from OpenSSL.
if sess.verify is False: if sess.verify is False:
# Disable the warning that the request is insecure, we know that... # Disable the warning that the request is insecure, we know that...
import urllib3 # import urllib3
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) # type: ignore
try: 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: except Exception as e:
msg = "Error connecting to Plex" logger.error("Error connecting to Plex", exc_info=e)
logger.error(msg, exc_info=e)
raise e raise e
schedule = preroll_schedule(args.schedule_file) schedule = preroll_schedule(args.schedule_file)