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

Trakt: Don't error 0 additions from lists

Browse Source
pull/105/head
desimaniac 5 years ago
parent 9926555d0f
commit fabb41ddaf
2 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File

16
helpers/radarr.py
Unescape View File

@ -55,10 +55,12 @@ def remove_existing_movies(radarr_movies, trakt_movies, callback=None):
continue continue
new_movies_list.append(tmp) new_movies_list.append(tmp)
removal_successful = True if len(new_movies_list) <= len(trakt_movies) else False
movies_removed_count = len(trakt_movies) - len(new_movies_list) movies_removed_count = len(trakt_movies) - len(new_movies_list)
log.debug("Filtered %d movies from Trakt list that were already in Radarr.", movies_removed_count) log.debug("Filtered %d movies from Trakt list that were already in Radarr.", movies_removed_count)
return new_movies_list return new_movies_list, removal_successful
except Exception: except Exception:
log.exception("Exception removing existing movies from Trakt list: ") log.exception("Exception removing existing movies from Trakt list: ")
return None return None
@ -111,29 +113,27 @@ def remove_existing_exclusions(radarr_exclusions, trakt_movies, callback=None):
def remove_existing_and_excluded_movies(radarr_movies, radarr_exclusions, trakt_movies, callback=None): def remove_existing_and_excluded_movies(radarr_movies, radarr_exclusions, trakt_movies, callback=None):
if not radarr_movies or not trakt_movies: if not radarr_movies or not trakt_movies:
log.error("Inappropriate parameters were supplied.") log.error("Inappropriate parameters were supplied.")
return None return None, False
try: try:
# clean up trakt_movies list # clean up trakt_movies list
trakt_movies = filter_trakt_movies_list(trakt_movies, callback) trakt_movies = filter_trakt_movies_list(trakt_movies, callback)
if not trakt_movies: if not trakt_movies:
return None return None, False
# filter out existing movies in radarr from new trakt list # filter out existing movies in radarr from new trakt list
processed_movies_list = remove_existing_movies(radarr_movies, trakt_movies, callback) processed_movies_list, removal_successful = remove_existing_movies(radarr_movies, trakt_movies, callback)
if not processed_movies_list: if not processed_movies_list:
return None return None, removal_successful
# filter out radarr exclusions from the list above # filter out radarr exclusions from the list above
if radarr_exclusions: if radarr_exclusions:
processed_movies_list = remove_existing_exclusions(radarr_exclusions, processed_movies_list, callback) processed_movies_list = remove_existing_exclusions(radarr_exclusions, processed_movies_list, callback)
if not processed_movies_list:
return None
movies_removed_count = len(trakt_movies) - len(processed_movies_list) movies_removed_count = len(trakt_movies) - len(processed_movies_list)
log.debug("Filtered a total of %d movies from the Trakt movies list.", movies_removed_count) log.debug("Filtered a total of %d movies from the Trakt movies list.", movies_removed_count)
log.debug("New Trakt movies list count: %d", len(processed_movies_list)) log.debug("New Trakt movies list count: %d", len(processed_movies_list))
return processed_movies_list return processed_movies_list, removal_successful
except Exception: except Exception:
log.exception("Exception removing existing and excluded movies from Trakt list: ") log.exception("Exception removing existing and excluded movies from Trakt list: ")
return None return None

61
traktarr.py
Unescape View File

@ -143,7 +143,7 @@ def get_objects(pvr, pvr_type, notifications):
if not objects_list: if not objects_list:
log.error("Aborting due to failure to retrieve %s list from %s", objects_type, pvr_type) log.error("Aborting due to failure to retrieve %s list from %s", objects_type, pvr_type)
if notifications: if notifications:
callback_notify({'event': 'error', 'reason': 'Failure to retrieve %s list from %s' % (objects_type, callback_notify({'event': 'error', 'reason': 'Failure to retrieve \'%s\' list from %s' % (objects_type,
pvr_type)}) pvr_type)})
exit() exit()
log.info("Retrieved %s %s list, %s found: %d", pvr_type, objects_type, objects_type, len(objects_list)) log.info("Retrieved %s %s list, %s found: %d", pvr_type, objects_type, objects_type, len(objects_list))
@ -450,11 +450,11 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genres=None, fold
trakt_objects_list = trakt.get_user_list_shows(list_type, authenticate_user) trakt_objects_list = trakt.get_user_list_shows(list_type, authenticate_user)
if not trakt_objects_list: if not trakt_objects_list:
log.error("Aborting due to failure to retrieve Trakt \'%s\' shows list", list_type.capitalize()) log.error("Aborting due to failure to retrieve Trakt \'%s\' shows list.", list_type.capitalize())
if notifications: if notifications:
callback_notify( callback_notify(
{'event': 'abort', 'type': 'shows', 'list_type': list_type, {'event': 'abort', 'type': 'shows', 'list_type': list_type,
'reason': 'Failure to retrieve Trakt %s shows list' % list_type.capitalize()}) 'reason': 'Failure to retrieve Trakt \'%s\' shows list.' % list_type.capitalize()})
return None return None
else: else:
log.info("Retrieved Trakt \'%s\' shows list, shows found: %d", list_type.capitalize(), len(trakt_objects_list)) log.info("Retrieved Trakt \'%s\' shows list, shows found: %d", list_type.capitalize(), len(trakt_objects_list))
@ -468,10 +468,10 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genres=None, fold
callback_remove_recommended callback_remove_recommended
if remove_rejected_from_recommended else None) if remove_rejected_from_recommended else None)
if processed_series_list is None: if processed_series_list is None:
log.error("Aborting due to failure to remove existing Sonarr shows from retrieved Trakt shows list") log.error("Aborting due to failure to remove existing Sonarr shows from retrieved Trakt shows list.")
if notifications: if notifications:
callback_notify({'event': 'abort', 'type': 'shows', 'list_type': list_type, callback_notify({'event': 'abort', 'type': 'shows', 'list_type': list_type,
'reason': 'Failure to remove existing Sonarr shows from retrieved Trakt %s shows list' 'reason': 'Failure to remove existing Sonarr shows from retrieved Trakt \'%s\' shows list.'
% list_type.capitalize()}) % list_type.capitalize()})
return None return None
else: else:
@ -481,13 +481,13 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genres=None, fold
# sort filtered series list # sort filtered series list
if sort == 'release': if sort == 'release':
sorted_series_list = misc_helper.sorted_list(processed_series_list, 'show', 'first_aired') sorted_series_list = misc_helper.sorted_list(processed_series_list, 'show', 'first_aired')
log.info("Sorted shows list to process by recent 'release' date") log.info("Sorted shows list to process by recent 'release' date.")
elif sort == 'rating': elif sort == 'rating':
sorted_series_list = misc_helper.sorted_list(processed_series_list, 'show', 'rating') sorted_series_list = misc_helper.sorted_list(processed_series_list, 'show', 'rating')
log.info("Sorted shows list to process by highest 'rating'") log.info("Sorted shows list to process by highest 'rating'.")
else: else:
sorted_series_list = misc_helper.sorted_list(processed_series_list, 'show', 'votes') sorted_series_list = misc_helper.sorted_list(processed_series_list, 'show', 'votes')
log.info("Sorted shows list to process by highest 'votes'") log.info("Sorted shows list to process by highest 'votes'.")
# loop series_list # loop series_list
log.info("Processing list now...") log.info("Processing list now...")
@ -894,11 +894,11 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rotten_tomatoes=
trakt_objects_list = trakt.get_user_list_movies(list_type, authenticate_user) trakt_objects_list = trakt.get_user_list_movies(list_type, authenticate_user)
if not trakt_objects_list: if not trakt_objects_list:
log.error("Aborting due to failure to retrieve Trakt \'%s\' movies list", list_type.capitalize()) log.error("Aborting due to failure to retrieve Trakt \'%s\' movies list.", list_type.capitalize())
if notifications: if notifications:
callback_notify( callback_notify(
{'event': 'abort', 'type': 'movies', 'list_type': list_type, {'event': 'abort', 'type': 'movies', 'list_type': list_type,
'reason': 'Failure to retrieve Trakt \'%s\' movies list' % list_type.capitalize()}) 'reason': 'Failure to retrieve Trakt \'%s\' movies list.' % list_type.capitalize()})
return None return None
else: else:
log.info("Retrieved Trakt \'%s\' movies list, movies found: %d", list_type.capitalize(), log.info("Retrieved Trakt \'%s\' movies list, movies found: %d", list_type.capitalize(),
@ -909,33 +909,36 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rotten_tomatoes=
remove_rejected_from_recommended = False remove_rejected_from_recommended = False
# build filtered movie list without movies that exist in radarr # build filtered movie list without movies that exist in radarr
processed_movies_list = radarr_helper.remove_existing_and_excluded_movies(pvr_objects_list, processed_movies_list, removal_successful = radarr_helper.remove_existing_and_excluded_movies(
pvr_objects_list,
pvr_exclusions_list, pvr_exclusions_list,
trakt_objects_list, trakt_objects_list,
callback_remove_recommended callback_remove_recommended if remove_rejected_from_recommended else None)
if remove_rejected_from_recommended else
None)
if processed_movies_list is None: if processed_movies_list is None:
log.error("Aborting due to failure to remove existing Radarr movies from retrieved Trakt movies list") if not removal_successful:
log.error("Aborting due to failure to remove existing Radarr movies from retrieved Trakt movies list.")
if notifications: if notifications:
callback_notify({'event': 'abort', 'type': 'movies', 'list_type': list_type, callback_notify({'event': 'abort', 'type': 'movies', 'list_type': list_type,
'reason': 'Failure to remove existing Radarr movies from retrieved ' 'reason': 'Failure to remove existing Radarr movies from retrieved '
'Trakt %s movies list' % list_type.capitalize()}) 'Trakt \'%s\' movies list.' % list_type.capitalize()})
else:
log.info("No more movies left to process in \'%s\' movies list.", list_type.capitalize())
return None return None
else: else:
log.info("Removed existing Radarr movies from Trakt movies list, movies left to process: %d", log.info("Removed existing and excluded Radarr movies from Trakt movies list. Movies left to process: %d",
len(processed_movies_list)) len(processed_movies_list))
# sort filtered movie list # sort filtered movie list
if sort == 'release': if sort == 'release':
sorted_movies_list = misc_helper.sorted_list(processed_movies_list, 'movie', 'released') sorted_movies_list = misc_helper.sorted_list(processed_movies_list, 'movie', 'released')
log.info("Sorted movies list to process by recent 'release' date") log.info("Sorted movies list to process by recent 'release' date.")
elif sort == 'rating': elif sort == 'rating':
sorted_movies_list = misc_helper.sorted_list(processed_movies_list, 'movie', 'rating') sorted_movies_list = misc_helper.sorted_list(processed_movies_list, 'movie', 'rating')
log.info("Sorted movies list to process by highest 'rating'") log.info("Sorted movies list to process by highest 'rating'.")
else: else:
sorted_movies_list = misc_helper.sorted_list(processed_movies_list, 'movie', 'votes') sorted_movies_list = misc_helper.sorted_list(processed_movies_list, 'movie', 'votes')
log.info("Sorted movies list to process by highest 'votes'") log.info("Sorted movies list to process by highest 'votes'.")
# display specified min RT score # display specified min RT score
if rotten_tomatoes is not None: if rotten_tomatoes is not None:
@ -1126,10 +1129,10 @@ def automatic_shows(add_delay=2.5, sort='votes', no_search=False, notifications=
limit = value limit = value
if limit <= 0: if limit <= 0:
log.info("SKIPPED Trakt's \'%s\' shows list", list_type.capitalize()) log.info("SKIPPED Trakt's \'%s\' shows list.", list_type.capitalize())
continue continue
else: else:
log.info("ADDING %d show(s) from Trakt's \'%s\' list", limit, list_type.capitalize()) log.info("ADDING %d show(s) from Trakt's \'%s\' list.", limit, list_type.capitalize())
local_ignore_blacklist = ignore_blacklist local_ignore_blacklist = ignore_blacklist
@ -1162,7 +1165,7 @@ def automatic_shows(add_delay=2.5, sort='votes', no_search=False, notifications=
elif list_type.lower() == 'lists': elif list_type.lower() == 'lists':
if len(value.items()) == 0: if len(value.items()) == 0:
log.info("SKIPPED Trakt's \'%s\' shows list", list_type.capitalize()) log.info("SKIPPED Trakt's \'%s\' shows list.", list_type.capitalize())
continue continue
for list_, v in value.items(): for list_, v in value.items():
@ -1174,7 +1177,7 @@ def automatic_shows(add_delay=2.5, sort='votes', no_search=False, notifications=
limit = v limit = v
if limit <= 0: if limit <= 0:
log.info("SKIPPED Trakt's \'%s\' shows list", list_) log.info("SKIPPED Trakt's \'%s\' shows list.", list_)
continue continue
local_ignore_blacklist = ignore_blacklist local_ignore_blacklist = ignore_blacklist
@ -1190,7 +1193,7 @@ def automatic_shows(add_delay=2.5, sort='votes', no_search=False, notifications=
if added_shows is None: if added_shows is None:
if not list_type.lower() == 'lists': if not list_type.lower() == 'lists':
log.error("FAILED ADDING shows from Trakt's \'%s\' list", list_type) log.info("FAILED ADDING shows from Trakt's \'%s\' list.", list_type)
time.sleep(10) time.sleep(10)
continue continue
total_shows_added += added_shows total_shows_added += added_shows
@ -1232,10 +1235,10 @@ def automatic_movies(add_delay=2.5, sort='votes', no_search=False, notifications
limit = value limit = value
if limit <= 0: if limit <= 0:
log.info("SKIPPED Trakt's \'%s\' movies list", list_type.capitalize()) log.info("SKIPPED Trakt's \'%s\' movies list.", list_type.capitalize())
continue continue
else: else:
log.info("ADDING %d movie(s) from Trakt's \'%s\' list", limit, list_type.capitalize()) log.info("ADDING %d movie(s) from Trakt's \'%s\' list.", limit, list_type.capitalize())
local_ignore_blacklist = ignore_blacklist local_ignore_blacklist = ignore_blacklist
@ -1282,7 +1285,7 @@ def automatic_movies(add_delay=2.5, sort='votes', no_search=False, notifications
limit = v limit = v
if limit <= 0: if limit <= 0:
log.info("SKIPPED Trakt's \'%s\' movies list", list_) log.info("SKIPPED Trakt's \'%s\' movies list.", list_)
continue continue
local_ignore_blacklist = ignore_blacklist local_ignore_blacklist = ignore_blacklist
@ -1299,7 +1302,7 @@ def automatic_movies(add_delay=2.5, sort='votes', no_search=False, notifications
if added_movies is None: if added_movies is None:
if not list_type.lower() == 'lists': if not list_type.lower() == 'lists':
log.error("FAILED ADDING movies from Trakt's \'%s\' list", list_type.capitalize()) log.info("FAILED ADDING movies from Trakt's \'%s\' list.", list_type.capitalize())
time.sleep(10) time.sleep(10)
continue continue
total_movies_added += added_movies total_movies_added += added_movies

Write Preview
Loading…
Cancel
Save