Plex
/
traktarr
mirror of https://github.com/l3uddz/traktarr
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Logs: Cleaned up year to string conversion

Browse Source
pull/105/head
desimaniac 5 years ago
parent d7554c403d
commit 484c8601a5
3 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
helpers/radarr.py
Unescape View File

@ -39,8 +39,8 @@ def remove_existing_movies(radarr_movies, trakt_movies, callback=None):
continue continue
# check if movie exists in processed_movies # check if movie exists in processed_movies
if tmp['movie']['ids']['tmdb'] in processed_movies: if tmp['movie']['ids']['tmdb'] in processed_movies:
log.debug("Removing existing movie: \'%s (%s)\'", tmp['movie']['title'], movie_year = str(tmp['movie']['year']) if tmp['movie']['year'] else '????'
str(tmp['movie']['year']) if tmp['movie']['year'] else '????') log.debug("Removing existing movie: \'%s (%s)\'", tmp['movie']['title'], movie_year)
if callback: if callback:
callback('movie', tmp) callback('movie', tmp)
continue continue

4
helpers/sonarr.py
Unescape View File

@ -70,8 +70,8 @@ def remove_existing_series(sonarr_series, trakt_series, callback=None):
continue continue
# check if show exists in processed_series # check if show exists in processed_series
if tmp['show']['ids']['tvdb'] in processed_series: if tmp['show']['ids']['tvdb'] in processed_series:
log.debug("Removing existing show: \'%s (%s)\'", tmp['show']['title'], show_year = str(tmp['show']['year']) if tmp['show']['year'] else '????'
str(tmp['show']['year']) if tmp['show']['year'] else '????') log.debug("Removing existing show: \'%s (%s)\'", tmp['show']['title'], show_year)
if callback: if callback:
callback('show', tmp) callback('show', tmp)
continue continue

84
traktarr.py
Unescape View File

@ -169,9 +169,12 @@ def show(show_id, folder=None, no_search=False):
if not trakt_show: if not trakt_show:
log.error("Aborting due to failure to retrieve Trakt show") log.error("Aborting due to failure to retrieve Trakt show")
return None return None
else:
# convert series year to string
series_year = str(trakt_show['year']) if trakt_show['year'] else '????'
log.info("Retrieved Trakt show information for \'%s\': \'%s (%s)\'", show_id, trakt_show['title'], log.info("Retrieved Trakt show information for \'%s\': \'%s (%s)\'", show_id, trakt_show['title'],
str(trakt_show['year']) if trakt_show['year'] else '????') series_year)
# determine which tags to use when adding this series # determine which tags to use when adding this series
use_tags = sonarr_helper.series_tag_id_from_network(profile_tags, cfg.sonarr.tags, trakt_show['network']) use_tags = sonarr_helper.series_tag_id_from_network(profile_tags, cfg.sonarr.tags, trakt_show['network'])
@ -179,12 +182,10 @@ def show(show_id, folder=None, no_search=False):
# add show to sonarr # add show to sonarr
if sonarr.add_series(trakt_show['ids']['tvdb'], trakt_show['title'], trakt_show['ids']['slug'], profile_id, if sonarr.add_series(trakt_show['ids']['tvdb'], trakt_show['title'], trakt_show['ids']['slug'], profile_id,
cfg.sonarr.root_folder, use_tags, not no_search): cfg.sonarr.root_folder, use_tags, not no_search):
log.info("ADDED: \'%s (%s)\' with Sonarr Tags: %s", trakt_show['title'], log.info("ADDED: \'%s (%s)\' with Sonarr Tags: %s", trakt_show['title'], series_year,
str(trakt_show['year']) if trakt_show['year'] else '????',
sonarr_helper.readable_tag_from_ids(profile_tags, use_tags)) sonarr_helper.readable_tag_from_ids(profile_tags, use_tags))
else: else:
log.error("FAILED ADDING: \'%s (%s)\' with Sonarr Tags: %s", trakt_show['title'], log.error("FAILED ADDING: \'%s (%s)\' with Sonarr Tags: %s", trakt_show['title'], series_year,
str(trakt_show['year']) if trakt_show['year'] else '????',
sonarr_helper.readable_tag_from_ids(profile_tags, use_tags)) sonarr_helper.readable_tag_from_ids(profile_tags, use_tags))
return return
@ -366,6 +367,11 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde
log.info("Processing list now...") log.info("Processing list now...")
for series in sorted_series_list: for series in sorted_series_list:
# noinspection PyBroadException # noinspection PyBroadException
# convert series year to string
series_year = str(series['show']['year']) \
if series['show']['year'] else '????'
try: try:
# check if genre matches genre supplied via argument # check if genre matches genre supplied via argument
if genre and not misc_helper.allowed_genres(genre, 'show', series): if genre and not misc_helper.allowed_genres(genre, 'show', series):
@ -379,7 +385,7 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde
if remove_rejected_from_recommended else None): if remove_rejected_from_recommended else None):
log.info("Adding: %s (%s) | Country: %s | Language: %s | Genre: %s | Network: %s", log.info("Adding: %s (%s) | Country: %s | Language: %s | Genre: %s | Network: %s",
series['show']['title'], series['show']['title'],
str(series['show']['year']) if series['show']['year'] else '????', series_year,
(series['show']['country'] or 'N/A').upper(), (series['show']['country'] or 'N/A').upper(),
(series['show']['language'] or 'N/A').upper(), (series['show']['language'] or 'N/A').upper(),
(', '.join(series['show']['genres'])).title() if series['show']['genres'] else 'N/A', (', '.join(series['show']['genres'])).title() if series['show']['genres'] else 'N/A',
@ -392,15 +398,13 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde
if sonarr.add_series(series['show']['ids']['tvdb'], series['show']['title'], if sonarr.add_series(series['show']['ids']['tvdb'], series['show']['title'],
series['show']['ids']['slug'], profile_id, cfg.sonarr.root_folder, use_tags, series['show']['ids']['slug'], profile_id, cfg.sonarr.root_folder, use_tags,
not no_search): not no_search):
log.info("ADDED: \'%s (%s)\' with tags: %s", series['show']['title'], log.info("ADDED: \'%s (%s)\' with tags: %s", series['show']['title'], series_year,
str(series['show']['year']) if series['show']['year'] else '????',
sonarr_helper.readable_tag_from_ids(profile_tags, use_tags)) sonarr_helper.readable_tag_from_ids(profile_tags, use_tags))
if notifications: if notifications:
callback_notify({'event': 'add_show', 'list_type': list_type, 'show': series['show']}) callback_notify({'event': 'add_show', 'list_type': list_type, 'show': series['show']})
added_shows += 1 added_shows += 1
else: else:
log.error("FAILED ADDING: \'%s (%s)\' with tags: %s", series['show']['title'], log.error("FAILED ADDING: \'%s (%s)\' with tags: %s", series['show']['title'], series_year,
str(series['show']['year']) if series['show']['year'] else '????',
sonarr_helper.readable_tag_from_ids(profile_tags, use_tags)) sonarr_helper.readable_tag_from_ids(profile_tags, use_tags))
# stop adding shows, if added_shows >= add_limit # stop adding shows, if added_shows >= add_limit
@ -477,19 +481,19 @@ def movie(movie_id, folder=None, minimum_availability=None, no_search=False):
if not trakt_movie: if not trakt_movie:
log.error("Aborting due to failure to retrieve Trakt movie") log.error("Aborting due to failure to retrieve Trakt movie")
return None return None
else:
log.info("Retrieved Trakt movie information for \'%s\': \'%s (%s)\'", movie_id, trakt_movie['title'], # convert movie year to string
str(trakt_movie['year']) if trakt_movie['year'] else '????') movie_year = str(trakt_movie['year']) if trakt_movie['year'] else '????'
log.info("Retrieved Trakt movie information for \'%s\': \'%s (%s)\'", movie_id, trakt_movie['title'], movie_year)
# add movie to radarr # add movie to radarr
if radarr.add_movie(trakt_movie['ids']['tmdb'], trakt_movie['title'], trakt_movie['year'], if radarr.add_movie(trakt_movie['ids']['tmdb'], trakt_movie['title'], trakt_movie['year'],
trakt_movie['ids']['slug'], profile_id, cfg.radarr.root_folder, trakt_movie['ids']['slug'], profile_id, cfg.radarr.root_folder,
cfg.radarr.minimum_availability, not no_search): cfg.radarr.minimum_availability, not no_search):
log.info("ADDED \'%s (%s)\'", trakt_movie['title'], log.info("ADDED \'%s (%s)\'", trakt_movie['title'], movie_year)
str(trakt_movie['year']) if trakt_movie['year'] else '????')
else: else:
log.error("FAILED adding \'%s (%s)\'", trakt_movie['title'], log.error("FAILED adding \'%s (%s)\'", trakt_movie['title'], movie_year)
str(trakt_movie['year']) if trakt_movie['year'] else '????')
return return
@ -698,11 +702,16 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rating=None, gen
log.info("Processing list now...") log.info("Processing list now...")
for sorted_movie in sorted_movies_list: for sorted_movie in sorted_movies_list:
# noinspection PyBroadException # noinspection PyBroadException
# convert movie year to string
movie_year = str(sorted_movie['movie']['year']) \
if sorted_movie['movie']['year'] else '????'
try: try:
# check if genre matches genre supplied via argument # check if genre matches genre supplied via argument
if genre and not misc_helper.allowed_genres(genre, 'movie', sorted_movie): if genre and not misc_helper.allowed_genres(genre, 'movie', sorted_movie):
log.debug("Skipping: \'%s\' because it was not from genre: %s", sorted_movie['movie']['title'], log.debug("Skipping: \'%s (%s)\' because it was not from genre: %s", sorted_movie['movie']['title'],
genre.title()) movie_year, genre.title())
continue continue
# check if movie passes out blacklist criteria inspection # check if movie passes out blacklist criteria inspection
@ -715,34 +724,32 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rating=None, gen
movie_rating = rating_helper.get_rating(cfg['omdb']['api_key'], sorted_movie) movie_rating = rating_helper.get_rating(cfg['omdb']['api_key'], sorted_movie)
if movie_rating == -1: if movie_rating == -1:
log.info("SKIPPED: \'%s (%s)\'", sorted_movie['movie']['title'], log.info("SKIPPED: \'%s (%s)\'", sorted_movie['movie']['title'],
str(sorted_movie['movie']['year']) if sorted_movie['movie']['year'] else '????') movie_year)
continue continue
if (rating is None or movie_rating is None) or movie_rating >= rating: if (rating is None or movie_rating is None) or movie_rating >= rating:
log.info("Adding: \'%s (%s)\' | Country: %s | Language: %s | Genre: %s ", log.info("Adding: \'%s (%s)\' | Country: %s | Language: %s | Genre: %s ",
sorted_movie['movie']['title'], sorted_movie['movie']['title'],
str(sorted_movie['movie']['year']) if sorted_movie['movie']['year'] else '????', movie_year,
(sorted_movie['movie']['country'] or 'N/A').upper(), (sorted_movie['movie']['country'] or 'N/A').upper(),
(sorted_movie['movie']['language'] or 'N/A').upper(), (sorted_movie['movie']['language'] or 'N/A').upper(),
(', '.join(sorted_movie['movie']['genres'])).title() (', '.join(sorted_movie['movie']['genres'])).title()
if sorted_movie['movie']['genres'] else 'N/A') if sorted_movie['movie']['genres'] else 'N/A')
# add movie to radarr # add movie to radarr
if radarr.add_movie(sorted_movie['movie']['ids']['tmdb'], sorted_movie['movie']['title'], if radarr.add_movie(sorted_movie['movie']['ids']['tmdb'], sorted_movie['movie']['title'],
str(sorted_movie['movie']['year']) if sorted_movie['movie']['year'] else '????', movie_year,
sorted_movie['movie']['ids']['slug'], profile_id, sorted_movie['movie']['ids']['slug'], profile_id,
cfg.radarr.root_folder, cfg.radarr.minimum_availability, not no_search): cfg.radarr.root_folder, cfg.radarr.minimum_availability, not no_search):
log.info("ADDED: \'%s (%s)\'", sorted_movie['movie']['title'], log.info("ADDED: \'%s (%s)\'", sorted_movie['movie']['title'],
str(sorted_movie['movie']['year']) if sorted_movie['movie']['year'] else '????') movie_year)
if notifications: if notifications:
callback_notify({'event': 'add_movie', 'list_type': list_type, callback_notify({'event': 'add_movie', 'list_type': list_type,
'movie': sorted_movie['movie']}) 'movie': sorted_movie['movie']})
added_movies += 1 added_movies += 1
else: else:
log.error("FAILED ADDING: \'%s (%s)\'", sorted_movie['movie']['title'], log.error("FAILED ADDING: \'%s (%s)\'", sorted_movie['movie']['title'], movie_year)
str(sorted_movie['movie']['year']) if sorted_movie['movie']['year'] else '????')
else: else:
log.debug("Minimum Rotten Tomatoes score of %d%% was not met.", rating) log.debug("Minimum Rotten Tomatoes score of %d%% was not met.", rating)
log.info("SKIPPED: \'%s (%s)\'", sorted_movie['movie']['title'], log.info("SKIPPED: \'%s (%s)\'", sorted_movie['movie']['title'], movie_year)
str(sorted_movie['movie']['year']) if sorted_movie['movie']['year'] else '????')
# stop adding movies, if added_movies >= add_limit # stop adding movies, if added_movies >= add_limit
if add_limit and added_movies >= add_limit: if add_limit and added_movies >= add_limit:
break break
@ -777,8 +784,10 @@ def callback_remove_recommended(media_type, media_info):
media_info) media_info)
return return
media_name = '\'%s (%s)\'' % (media_info[media_type]['title'], # convert media year to string
str(media_info[media_type]['year']) if media_info[media_type]['year'] else '????') media_year = str(media_info[media_type]['year']) if media_info[media_type]['year'] else '????'
media_name = '\'%s (%s)\'' % (media_info[media_type]['title'], media_year)
if trakt.remove_recommended_item(media_type, media_info[media_type]['ids']['trakt']): if trakt.remove_recommended_item(media_type, media_info[media_type]['ids']['trakt']):
log.info("Removed rejected recommended %s: \'%s\'", media_type, media_name) log.info("Removed rejected recommended %s: \'%s\'", media_type, media_name)
@ -791,18 +800,25 @@ def callback_notify(data):
# handle event # handle event
if data['event'] == 'add_movie': if data['event'] == 'add_movie':
# convert movie year to string
movie_year = str(data['movie']['year']) \
if data['movie']['year'] else '????'
if cfg.notifications.verbose: if cfg.notifications.verbose:
notify.send( notify.send(
message="Added \'%s\' movie: \'%s (%s)\'" % (data['list_type'].capitalize(), data['movie']['title'], message="Added \'%s\' movie: \'%s (%s)\'" % (data['list_type'].capitalize(), data['movie']['title'],
str(data['movie']['year']) movie_year))
if data['movie']['year'] else '????'))
return return
elif data['event'] == 'add_show': elif data['event'] == 'add_show':
# convert series year to string
series_year = str(data['show']['year']) if data['show']['year'] else '????'
if cfg.notifications.verbose: if cfg.notifications.verbose:
notify.send( notify.send(
message="Added \'%s\' show: \'%s (%s)\'" % (data['list_type'].capitalize(), data['show']['title'], message="Added \'%s\' show: \'%s (%s)\'" % (data['list_type'].capitalize(), data['show']['title'],
str(data['show']['year']) series_year))
if data['show']['year'] else '????'))
return return
elif data['event'] == 'abort': elif data['event'] == 'abort':
notify.send(message="Aborted adding Trakt \'%s\' %s due to: %s" % (data['list_type'].capitalize(), data['type'], notify.send(message="Aborted adding Trakt \'%s\' %s due to: %s" % (data['list_type'].capitalize(), data['type'],

Write Preview
Loading…
Cancel
Save