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

Config: New option for genres: 'ignore'.

Browse Source
pull/93/head
desimaniac 6 years ago
parent 8d02d56297
commit c0f34f60c2
4 changed files with 75 additions and 26 deletions
Show Stats Download Patch File Download Diff File

12
README.md
Unescape View File

@ -588,6 +588,12 @@ Use filters to specify the movie/shows's country of origin or blacklist (i.e. fi
- For an updated list, visit [here](https://trakt.docs.apiary.io/#reference/genres/list/get-genres). - For an updated list, visit [here](https://trakt.docs.apiary.io/#reference/genres/list/get-genres).
- Special Keywords:
- Blank list (i.e. `[]`) - Add movies from any genre.
- `ignore` (used as the only list item) - Add movies from any genre, including ones with no genre specified.
`blacklisted_max_year` - Blacklist release dates after specified year. `blacklisted_max_year` - Blacklist release dates after specified year.
`blacklisted_min_runtime` - Blacklist runtime duration lower than specified time (in minutes). `blacklisted_min_runtime` - Blacklist runtime duration lower than specified time (in minutes).
@ -690,6 +696,12 @@ Use filters to specify the movie/shows's country of origin or blacklist (i.e. fi
- For an updated list, visit [here](https://trakt.docs.apiary.io/#reference/genres/list/get-genres). - For an updated list, visit [here](https://trakt.docs.apiary.io/#reference/genres/list/get-genres).
- Special Keywords:
- Blank list (i.e. `[]`) - Add shows from any genre.
- `ignore` (used as the only list item) - Add shows from any genre, including ones with no genre specified.
`blacklisted_max_year` - Blacklist release dates after specified year. `blacklisted_max_year` - Blacklist release dates after specified year.
`blacklisted_min_runtime` - Blacklist runtime duration lower than specified time (in minutes). `blacklisted_min_runtime` - Blacklist runtime duration lower than specified time (in minutes).

2
helpers/misc.py
Unescape View File

@ -61,7 +61,7 @@ def allowed_genres(genre, object_type, trakt_object):
genres = genre.split(',') genres = genre.split(',')
for item in genres: for item in genres:
if item.lower() in trakt_object[object_type]['genres']: if (item.lower() == 'ignore') or (item.lower() in trakt_object[object_type]['genres']):
allowed_object = True allowed_object = True
break break
return allowed_object return allowed_object

18
helpers/trakt.py
Unescape View File

@ -7,9 +7,14 @@ log = logger.get_logger(__name__)
def blacklisted_show_genre(show, genres): def blacklisted_show_genre(show, genres):
blacklisted = False blacklisted = False
try: try:
if not show['show']['genres']: # ["ignore"] - add show item even if it is missing a genre
if len(genres) == 1 and genres[0].lower() == 'ignore':
log.debug("Skipping valid genres check for %s.", show['show']['title'])
# [] - add show item with any valid genre
elif not show['show']['genres']:
log.debug("%s was blacklisted because it had no genres", show['show']['title']) log.debug("%s was blacklisted because it had no genres", show['show']['title'])
blacklisted = True blacklisted = True
# List provided - skip adding show item if the genre is blacklisted
else: else:
for genre in genres: for genre in genres:
if genre.lower() in show['show']['genres']: if genre.lower() in show['show']['genres']:
@ -43,7 +48,7 @@ def blacklisted_show_country(show, allowed_countries):
try: try:
# [] or ["ignore"] - add show item even if it is missing a country # [] or ["ignore"] - add show item even if it is missing a country
if (not allowed_countries) or (len(allowed_countries) == 1 and allowed_countries[0].lower() == 'ignore'): if (not allowed_countries) or (len(allowed_countries) == 1 and allowed_countries[0].lower() == 'ignore'):
log.debug("Skipping valid countries check.") log.debug("Skipping valid countries check for %s.", show['show']['title'])
# List provided - skip adding show item because it is missing a country # List provided - skip adding show item because it is missing a country
elif not show['show']['country']: elif not show['show']['country']:
log.debug("%s was blacklisted because it had no country", show['show']['title']) log.debug("%s was blacklisted because it had no country", show['show']['title'])
@ -145,9 +150,14 @@ def is_show_blacklisted(show, blacklist_settings, ignore_blacklist, callback=Non
def blacklisted_movie_genre(movie, genres): def blacklisted_movie_genre(movie, genres):
blacklisted = False blacklisted = False
try: try:
if not movie['movie']['genres']: # ["ignore"] - add movie item even if it is missing a genre
if len(genres) == 1 and genres[0].lower() == 'ignore':
log.debug("Skipping valid genres check for %s.", movie['movie']['title'])
# [] - add movie item with any valid genre
elif not movie['movie']['genres']:
log.debug("%s was blacklisted because it had no genres", movie['movie']['title']) log.debug("%s was blacklisted because it had no genres", movie['movie']['title'])
blacklisted = True blacklisted = True
# List provided - skip adding movie item if the genre is blacklisted
else: else:
for genre in genres: for genre in genres:
if genre.lower() in movie['movie']['genres']: if genre.lower() in movie['movie']['genres']:
@ -181,7 +191,7 @@ def blacklisted_movie_country(movie, allowed_countries):
try: try:
# [] or ["ignore"] - add movie item even if it is missing a country # [] or ["ignore"] - add movie item even if it is missing a country
if (not allowed_countries) or (len(allowed_countries) == 1 and allowed_countries[0].lower() == 'ignore'): if (not allowed_countries) or (len(allowed_countries) == 1 and allowed_countries[0].lower() == 'ignore'):
log.debug("Skipping valid countries check.") log.debug("Skipping valid countries check for %s.", movie['movie']['title'])
# List provided - skip adding movie item because it is missing a country # List provided - skip adding movie item because it is missing a country
elif not movie['movie']['country']: elif not movie['movie']['country']:
log.debug("%s was blacklisted because it had no country", movie['movie']['title']) log.debug("%s was blacklisted because it had no country", movie['movie']['title'])

69
traktarr.py
Unescape View File

@ -179,7 +179,9 @@ def show(show_id, folder=None, no_search=False):
@click.option('--add-delay', '-d', default=2.5, help='Seconds between each add request to Sonarr.', show_default=True) @click.option('--add-delay', '-d', default=2.5, help='Seconds between each add request to Sonarr.', show_default=True)
@click.option('--sort', '-s', default='votes', type=click.Choice(['rating', 'release', 'votes']), @click.option('--sort', '-s', default='votes', type=click.Choice(['rating', 'release', 'votes']),
help='Sort list to process.', show_default=True) help='Sort list to process.', show_default=True)
@click.option('--genre', '-g', default=None, help='Only add shows from this genre to Sonarr.') @click.option('--genre', '-g', default=None, help='Only add shows from this genre to Sonarr. '
'Use \'ignore\' to add shows from any genre, '
'including ones with no genre specified.')
@click.option('--folder', '-f', default=None, help='Add shows with this root folder to Sonarr.') @click.option('--folder', '-f', default=None, help='Add shows with this root folder to Sonarr.')
@click.option('--actor', '-a', default=None, help='Only add movies from this actor to Radarr.') @click.option('--actor', '-a', default=None, help='Only add movies from this actor to Radarr.')
@click.option('--no-search', is_flag=True, help='Disable search when adding shows to Sonarr.') @click.option('--no-search', is_flag=True, help='Disable search when adding shows to Sonarr.')
@ -200,8 +202,11 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde
added_shows = 0 added_shows = 0
# set special genre keyword 'ignore' if supplied
if genre and genre.lower == 'ignore':
cfg['filters']['shows']['blacklisted_genres'] = ['ignore']
# remove genre from shows blacklisted_genres if supplied # remove genre from shows blacklisted_genres if supplied
if genre: elif genre:
misc_helper.unblacklist_genres(genre, cfg['filters']['shows']['blacklisted_genres']) misc_helper.unblacklist_genres(genre, cfg['filters']['shows']['blacklisted_genres'])
# replace sonarr root_folder if folder is supplied # replace sonarr root_folder if folder is supplied
@ -222,27 +227,34 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde
# get trakt series list # get trakt series list
if list_type.lower() == 'anticipated': if list_type.lower() == 'anticipated':
trakt_objects_list = trakt.get_anticipated_shows(genres=genre, languages=cfg.filters.shows.allowed_languages) trakt_objects_list = trakt.get_anticipated_shows(genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.shows.allowed_languages)
elif list_type.lower() == 'trending': elif list_type.lower() == 'trending':
trakt_objects_list = trakt.get_trending_shows(genres=genre, languages=cfg.filters.shows.allowed_languages) trakt_objects_list = trakt.get_trending_shows(genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.shows.allowed_languages)
elif list_type.lower() == 'popular': elif list_type.lower() == 'popular':
trakt_objects_list = trakt.get_popular_shows(genres=genre, languages=cfg.filters.shows.allowed_languages) trakt_objects_list = trakt.get_popular_shows(genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.shows.allowed_languages)
elif list_type.lower() == 'person': elif list_type.lower() == 'person':
if not actor: if not actor:
log.error("You must specify an actor with the --actor / -a parameter when using the person list type!") log.error("You must specify an actor with the --actor / -a parameter when using the person list type!")
return None return None
trakt_objects_list = trakt.get_person_shows(person=actor, genres=genre, trakt_objects_list = trakt.get_person_shows(person=actor,
genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.shows.allowed_languages) languages=cfg.filters.shows.allowed_languages)
elif list_type.lower() == 'recommended': elif list_type.lower() == 'recommended':
trakt_objects_list = trakt.get_recommended_shows(authenticate_user, genres=genre, trakt_objects_list = trakt.get_recommended_shows(authenticate_user,
genres=genre if 'ignore' not in genre else None,
languages=cfg.filters.shows.allowed_languages) languages=cfg.filters.shows.allowed_languages)
elif list_type.lower().startswith('played'): elif list_type.lower().startswith('played'):
most_type = misc_helper.substring_after(list_type.lower(), "_") most_type = misc_helper.substring_after(list_type.lower(), "_")
trakt_objects_list = trakt.get_most_played_shows(genres=genre, languages=cfg.filters.shows.allowed_languages, trakt_objects_list = trakt.get_most_played_shows(genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.shows.allowed_languages,
most_type=most_type if most_type else None) most_type=most_type if most_type else None)
elif list_type.lower().startswith('watched'): elif list_type.lower().startswith('watched'):
most_type = misc_helper.substring_after(list_type.lower(), "_") most_type = misc_helper.substring_after(list_type.lower(), "_")
trakt_objects_list = trakt.get_most_watched_shows(genres=genre, languages=cfg.filters.shows.allowed_languages, trakt_objects_list = trakt.get_most_watched_shows(genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.shows.allowed_languages,
most_type=most_type if most_type else None) most_type=most_type if most_type else None)
elif list_type.lower() == 'watchlist': elif list_type.lower() == 'watchlist':
trakt_objects_list = trakt.get_watchlist_shows(authenticate_user) trakt_objects_list = trakt.get_watchlist_shows(authenticate_user)
@ -304,7 +316,8 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde
callback_remove_recommended callback_remove_recommended
if remove_rejected_from_recommended else None): if remove_rejected_from_recommended else None):
log.info("Adding: %s | Genres: %s | Network: %s | Country: %s", series['show']['title'], log.info("Adding: %s | Genres: %s | Network: %s | Country: %s", series['show']['title'],
', '.join(series['show']['genres']), series['show']['network'], (', '.join(series['show']['genres'])) if series['show']['genres'] else 'N/A',
series['show']['network'],
(series['show']['country'] or 'N/A').upper()) (series['show']['country'] or 'N/A').upper())
# determine which tags to use when adding this series # determine which tags to use when adding this series
@ -320,7 +333,8 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde
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 (%d)\' with tags: %s", series['show']['title'], series['show']['year'], log.error("FAILED adding \'%s (%d)\' with tags: %s", series['show']['title'],
series['show']['year'],
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
@ -407,7 +421,9 @@ def movie(movie_id, folder=None, minimum_availability='released', no_search=Fals
help='Sort list to process.', show_default=True) help='Sort list to process.', show_default=True)
@click.option('--rating', '-r', default=None, type=int, @click.option('--rating', '-r', default=None, type=int,
help='Set a minimum rating threshold (according to Rotten Tomatoes)') help='Set a minimum rating threshold (according to Rotten Tomatoes)')
@click.option('--genre', '-g', default=None, help='Only add movies from this genre to Radarr.') @click.option('--genre', '-g', default=None, help='Only add movies from this genre to Radarr.'
'Use \'ignore\' to add movies from any genre, '
'including ones with no genre specified.')
@click.option('--folder', '-f', default=None, help='Add movies with this root folder to Radarr.') @click.option('--folder', '-f', default=None, help='Add movies with this root folder to Radarr.')
@click.option('--minimum-availability', '-ma', default='released', @click.option('--minimum-availability', '-ma', default='released',
type=click.Choice(['announced', 'in_cinemas', 'released', 'predb']), type=click.Choice(['announced', 'in_cinemas', 'released', 'predb']),
@ -433,8 +449,11 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rating=None, gen
added_movies = 0 added_movies = 0
# set special genre keyword 'ignore' if supplied
if genre and genre.lower() == 'ignore':
cfg['filters']['movies']['blacklisted_genres'] = ['ignore']
# remove genre from movies blacklisted_genres if supplied # remove genre from movies blacklisted_genres if supplied
if genre: elif genre:
misc_helper.unblacklist_genres(genre, cfg['filters']['movies']['blacklisted_genres']) misc_helper.unblacklist_genres(genre, cfg['filters']['movies']['blacklisted_genres'])
# replace radarr root_folder if folder is supplied # replace radarr root_folder if folder is supplied
@ -460,30 +479,37 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rating=None, gen
# get trakt movies list # get trakt movies list
if list_type.lower() == 'anticipated': if list_type.lower() == 'anticipated':
trakt_objects_list = trakt.get_anticipated_movies(genres=genre, languages=cfg.filters.movies.allowed_languages) trakt_objects_list = trakt.get_anticipated_movies(genres=genre if 'ignore' not in genre else None,
languages=cfg.filters.movies.allowed_languages)
elif list_type.lower() == 'trending': elif list_type.lower() == 'trending':
trakt_objects_list = trakt.get_trending_movies(genres=genre, languages=cfg.filters.movies.allowed_languages) trakt_objects_list = trakt.get_trending_movies(genres=genre if 'ignore' not in genre else None,
languages=cfg.filters.movies.allowed_languages)
elif list_type.lower() == 'popular': elif list_type.lower() == 'popular':
trakt_objects_list = trakt.get_popular_movies(genres=genre, languages=cfg.filters.movies.allowed_languages) trakt_objects_list = trakt.get_popular_movies(genres=genre if 'ignore' not in genre else None,
languages=cfg.filters.movies.allowed_languages)
elif list_type.lower() == 'boxoffice': elif list_type.lower() == 'boxoffice':
trakt_objects_list = trakt.get_boxoffice_movies() trakt_objects_list = trakt.get_boxoffice_movies()
elif list_type.lower() == 'person': elif list_type.lower() == 'person':
if not actor: if not actor:
log.error("You must specify an actor with the --actor / -a parameter when using the person list type!") log.error("You must specify an actor with the --actor / -a parameter when using the person list type!")
return None return None
trakt_objects_list = trakt.get_person_movies(person=actor, genres=genre, trakt_objects_list = trakt.get_person_movies(person=actor,
genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.movies.allowed_languages) languages=cfg.filters.movies.allowed_languages)
elif list_type.lower() == 'recommended': elif list_type.lower() == 'recommended':
trakt_objects_list = trakt.get_recommended_movies(authenticate_user, genres=genre, trakt_objects_list = trakt.get_recommended_movies(authenticate_user,
genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.movies.allowed_languages) languages=cfg.filters.movies.allowed_languages)
elif list_type.lower().startswith('played'): elif list_type.lower().startswith('played'):
most_type = misc_helper.substring_after(list_type.lower(), "_") most_type = misc_helper.substring_after(list_type.lower(), "_")
trakt_objects_list = trakt.get_most_played_movies(genres=genre, languages=cfg.filters.movies.allowed_languages, trakt_objects_list = trakt.get_most_played_movies(genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.movies.allowed_languages,
most_type=most_type if most_type else None) most_type=most_type if most_type else None)
elif list_type.lower().startswith('watched'): elif list_type.lower().startswith('watched'):
most_type = misc_helper.substring_after(list_type.lower(), "_") most_type = misc_helper.substring_after(list_type.lower(), "_")
trakt_objects_list = trakt.get_most_watched_movies(genres=genre, languages=cfg.filters.movies.allowed_languages, trakt_objects_list = trakt.get_most_watched_movies(genres=genre if 'ignore' not in genre.lower() else None,
languages=cfg.filters.movies.allowed_languages,
most_type=most_type if most_type else None) most_type=most_type if most_type else None)
elif list_type.lower() == 'watchlist': elif list_type.lower() == 'watchlist':
trakt_objects_list = trakt.get_watchlist_movies(authenticate_user) trakt_objects_list = trakt.get_watchlist_movies(authenticate_user)
@ -558,7 +584,8 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rating=None, gen
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 (%d)\' | Genres: %s | Country: %s", sorted_movie['movie']['title'], log.info("Adding: \'%s (%d)\' | Genres: %s | Country: %s", sorted_movie['movie']['title'],
sorted_movie['movie']['year'], ', '.join(sorted_movie['movie']['genres']), sorted_movie['movie']['year'],
(', '.join(sorted_movie['movie']['genres']) if sorted_movie['movie']['genres'] else 'N/A'),
(sorted_movie['movie']['country'] or 'N/A').upper()) (sorted_movie['movie']['country'] or 'N/A').upper())
# 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'],

Write Preview
Loading…
Cancel
Save