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

Filters: Tweaked special keyword behavior for genre and country

Browse Source
pull/105/head
desimaniac 5 years ago
parent 4abf1a1eba
commit ba4e84cdff
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File

28
README.md
Unescape View File

@ -569,9 +569,11 @@ Use filters to specify the movie/shows's country of origin or blacklist (i.e. fi
- Special keywords (used as the only list item): - Special keywords (used as the only list item):
- `any` - Add movies from any country. - Blank list (i.e. `[]`) - Add movies from any country.
- `ignore` (also empty list i.e. `[]`) - Like `any`, but also add movies even if it is missing a country. - `ignore` (i.e. `["ignore"]`) Add movies from any country, including ones with no country specified.
- No other list item should be present.
`allowed_languages` - Only add movies with these languages. Listed as two-letter language codes. `allowed_languages` - Only add movies with these languages. Listed as two-letter language codes.
@ -585,15 +587,17 @@ Use filters to specify the movie/shows's country of origin or blacklist (i.e. fi
`blacklisted_genres` - Blacklist certain genres. `blacklisted_genres` - Blacklist certain genres.
- [List of available movie genres](assets/list_of_movie_genres.md). - [List of available movie genres](assets/list_of_movie_genres.md).
- 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:
- Special Keywords: - Blank list (i.e. `[]`) - Add movies from any genre.
- Blank list (i.e. `[]`) - Add movies from any genre. - `ignore` (i.e. `["ignore"]`) - Add movies from any genre, including ones with no genre specified.
- `ignore` (used as the only list item) - Add movies from any genre, including ones with no genre specified. - No other list item should be present.
`blacklisted_max_year` - Blacklist release dates after specified year. `blacklisted_max_year` - Blacklist release dates after specified year.
@ -679,9 +683,11 @@ Use filters to specify the movie/shows's country of origin or blacklist (i.e. fi
- Special keywords (used as the only list item): - Special keywords (used as the only list item):
- `any` - Add shows from any country. - Blank list (i.e. `[]`) - Add shows from any country.
- `ignore` (i.e. `["ignore"]`) Add shows from any country, including ones with no country specified.
- `ignore` (also empty list i.e. `[]`) - Like `any`, but also add shows even if it is missing a country. - No other list item should be present.
`allowed_languages` - Only add shows with these languages. `allowed_languages` - Only add shows with these languages.
@ -701,7 +707,9 @@ Use filters to specify the movie/shows's country of origin or blacklist (i.e. fi
- Blank list (i.e. `[]`) - Add shows from any genre. - 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. - `ignore` (i.e. `["ignore"]`) - Add shows from any genre, including ones with no genre specified.
- No other list item should be present.
`blacklisted_max_year` - Blacklist release dates after specified year. `blacklisted_max_year` - Blacklist release dates after specified year.

28
helpers/trakt.py
Unescape View File

@ -10,10 +10,12 @@ def blacklisted_show_genre(show, genres):
# ["ignore"] - add show item even if it is missing a genre # ["ignore"] - add show item even if it is missing a genre
if len(genres) == 1 and genres[0].lower() == 'ignore': if len(genres) == 1 and genres[0].lower() == 'ignore':
log.debug("Skipping valid genre check for: \'%s\'", show['show']['title']) log.debug("Skipping valid genre check for: \'%s\'", show['show']['title'])
# [] - add show item with any valid genre
elif not show['show']['genres']: elif not show['show']['genres']:
log.debug("\'%s\' was blacklisted because it had no genre", show['show']['title']) log.debug("\'%s\' was blacklisted because it had no genre", show['show']['title'])
blacklisted = True blacklisted = True
# [] - add show item with any valid genre
elif not genres:
log.debug("Skipping blacklisted genre check for: \'%s\'", show['show']['title'])
# List provided - skip adding show item if the genre is blacklisted # List provided - skip adding show item if the genre is blacklisted
else: else:
for genre in genres: for genre in genres:
@ -47,16 +49,16 @@ def blacklisted_show_year(show, earliest_year, latest_year):
def blacklisted_show_country(show, allowed_countries): def blacklisted_show_country(show, allowed_countries):
blacklisted = False blacklisted = False
try: try:
# [] or ["ignore"] - add show item even if it is missing a country # ["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 len(allowed_countries) == 1 and allowed_countries[0].lower() == 'ignore':
log.debug("Skipping valid countries check for: \'%s\'", show['show']['title']) 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'])
blacklisted = True blacklisted = True
# ["any"] - add show item with any valid country # [] - add show item from any valid country
elif len(allowed_countries) == 1 and allowed_countries[0].lower() == 'any': elif not allowed_countries:
log.debug("Skipping allowed countries check for: \'%s\'") log.debug("Skipping allowed countries check for: \'%s\'", show['show']['title'])
# List provided - skip adding show item if the country is blacklisted # List provided - skip adding show item if the country is blacklisted
elif show['show']['country'].lower() not in allowed_countries: elif show['show']['country'].lower() not in allowed_countries:
log.debug("\'%s\' was blacklisted because it's from the country: %s", show['show']['title'], log.debug("\'%s\' was blacklisted because it's from the country: %s", show['show']['title'],
@ -154,10 +156,12 @@ def blacklisted_movie_genre(movie, genres):
# ["ignore"] - add movie item even if it is missing a genre # ["ignore"] - add movie item even if it is missing a genre
if len(genres) == 1 and genres[0].lower() == 'ignore': if len(genres) == 1 and genres[0].lower() == 'ignore':
log.debug("Skipping valid genre check for: \'%s\'", movie['movie']['title']) log.debug("Skipping valid genre check for: \'%s\'", movie['movie']['title'])
# [] - add movie item with any valid genre
elif not movie['movie']['genres']: elif not movie['movie']['genres']:
log.debug("\'%s\' was blacklisted because it had no genre", movie['movie']['title']) log.debug("\'%s\' was blacklisted because it had no genre", movie['movie']['title'])
blacklisted = True blacklisted = True
# [] - add movie item with any valid genre
elif not genres:
log.debug("Skipping blacklisted genre check for: \'%s\'", movie['movie']['title'])
# List provided - skip adding movie item if the genre is blacklisted # List provided - skip adding movie item if the genre is blacklisted
else: else:
for genre in genres: for genre in genres:
@ -191,16 +195,16 @@ def blacklisted_movie_year(movie, earliest_year, latest_year):
def blacklisted_movie_country(movie, allowed_countries): def blacklisted_movie_country(movie, allowed_countries):
blacklisted = False blacklisted = False
try: try:
# [] or ["ignore"] - add movie item even if it is missing a country # ["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 len(allowed_countries) == 1 and allowed_countries[0].lower() == 'ignore':
log.debug("Skipping valid countries check for: \'%s\'", movie['movie']['title']) 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'])
blacklisted = True blacklisted = True
# ["any"] - add movie item with any valid country # [] - add movie item with from any valid country
elif len(allowed_countries) == 1 and allowed_countries[0].lower() == 'any': elif not allowed_countries:
log.debug("Skipping allowed countries check.") log.debug("Skipping allowed countries check for: \'%s\'", movie['movie']['title'])
# List provided - skip adding movie item if the country is blacklisted # List provided - skip adding movie item if the country is blacklisted
elif movie['movie']['country'].lower() not in allowed_countries: elif movie['movie']['country'].lower() not in allowed_countries:
log.debug("\'%s\' was blacklisted because it's from the country: %s", movie['movie']['title'], log.debug("\'%s\' was blacklisted because it's from the country: %s", movie['movie']['title'],

Write Preview
Loading…
Cancel
Save