From a4a6807bed7ed104944abb7fdaf8a5177162d67a Mon Sep 17 00:00:00 2001 From: desimaniac <5501908+desimaniac@users.noreply.github.com> Date: Fri, 12 Jul 2019 12:36:16 -0500 Subject: [PATCH] Movies: Min Avail from config works again. It will still be overwritten with arg. https://markdownshare.com/view/9dc68caa-3c76-4f4e-8c18-ccd96e09bc33 Closes #85 --- traktarr.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/traktarr.py b/traktarr.py index 3ac7d43..bfcd944 100755 --- a/traktarr.py +++ b/traktarr.py @@ -429,14 +429,13 @@ def shows(list_type, add_limit=0, add_delay=2.5, sort='votes', genre=None, folde help='Add movie with this root folder to Radarr.') @click.option( '--minimum-availability', '-ma', - default='released', type=click.Choice(['announced', 'in_cinemas', 'released', 'predb']), - help='Add movies with this minimum availability to Radarr.', show_default=True) + help='Add movies with this minimum availability to Radarr. Default is \'released\'.') @click.option( '--no-search', is_flag=True, help='Disable search when adding movie to Radarr.') -def movie(movie_id, folder=None, minimum_availability='released', no_search=False): +def movie(movie_id, folder=None, minimum_availability=None, no_search=False): from media.radarr import Radarr from media.trakt import Trakt @@ -446,6 +445,8 @@ def movie(movie_id, folder=None, minimum_availability='released', no_search=Fals log.debug('Set root folder to: \'%s\'', cfg['radarr']['root_folder']) # replace radarr.minimum_availability if minimum_availability is supplied + if cfg['radarr']['minimum_availability'].strip() == '': + cfg['radarr']['minimum_availability'] = 'released' if minimum_availability: cfg['radarr']['minimum_availability'] = minimum_availability log.debug('Set minimum availability to: \'%s\'', cfg['radarr']['minimum_availability']) @@ -519,10 +520,8 @@ def movie(movie_id, folder=None, minimum_availability='released', no_search=Fals help='Add movies with this root folder to Radarr.') @click.option( '--minimum-availability', '-ma', - default='released', type=click.Choice(['announced', 'in_cinemas', 'released', 'predb']), - help='Add movies with this minimum availability to Radarr.', - show_default=True) + help='Add movies with this minimum availability to Radarr. Default is \'released\'.') @click.option( '--actor', '-a', default=None, @@ -548,7 +547,7 @@ def movie(movie_id, folder=None, minimum_availability='released', no_search=Fals is_flag=True, help='Removes rejected/existing movies from recommended.') def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rating=None, genre=None, folder=None, - minimum_availability='released', actor=None, no_search=False, notifications=False, authenticate_user=None, + minimum_availability=None, actor=None, no_search=False, notifications=False, authenticate_user=None, ignore_blacklist=False, remove_rejected_from_recommended=False): from media.radarr import Radarr from media.trakt import Trakt @@ -572,6 +571,8 @@ def movies(list_type, add_limit=0, add_delay=2.5, sort='votes', rating=None, gen log.debug('Set root folder to: \'%s\'', cfg['radarr']['root_folder']) # replace radarr.minimum_availability if minimum_availability is supplied + if cfg['radarr']['minimum_availability'].strip() == '': + cfg['radarr']['minimum_availability'] = 'released' if minimum_availability: cfg['radarr']['minimum_availability'] = minimum_availability log.debug('Set minimum availability to: \'%s\'', cfg['radarr']['minimum_availability'])