From ad73e597e4b1bc99c2780e5da93a4fe534ed5696 Mon Sep 17 00:00:00 2001 From: Clinton Hall Date: Wed, 9 Aug 2023 22:50:25 +1200 Subject: [PATCH 1/3] Initialize remove_groups #1973 This parameter was not being loaded and therefore was ignored. --- core/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/core/__init__.py b/core/__init__.py index 243c23b7..04faf3ef 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -1047,6 +1047,7 @@ def initialize(section=None): configure_utility_locations() configure_sections(section) configure_torrent_class() + configure_groups() __INITIALIZED__ = True From c6292d539080d01932da13afc7079fb57a3380bb Mon Sep 17 00:00:00 2001 From: Matt Park Date: Mon, 2 Oct 2023 15:13:36 -0400 Subject: [PATCH 2/3] Update identification.py Return updated dir_name if needed --- core/utils/identification.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/utils/identification.py b/core/utils/identification.py index 2b43daec..5e942d08 100644 --- a/core/utils/identification.py +++ b/core/utils/identification.py @@ -27,14 +27,14 @@ def find_imdbid(dir_name, input_name, omdb_api_key): if m: imdbid = m.group(1) logger.info('Found imdbID [{0}]'.format(imdbid)) - return imdbid + return imdbid, dir_name if os.path.isdir(dir_name): for file in os.listdir(text_type(dir_name)): m = re.search(r'\b(tt\d{7,8})\b', file) if m: imdbid = m.group(1) logger.info('Found imdbID [{0}] via file name'.format(imdbid)) - return imdbid + return imdbid, dir_name if 'NZBPR__DNZB_MOREINFO' in os.environ: dnzb_more_info = os.environ.get('NZBPR__DNZB_MOREINFO', '') if dnzb_more_info != '': @@ -43,7 +43,7 @@ def find_imdbid(dir_name, input_name, omdb_api_key): if m: imdbid = m.group(1) logger.info('Found imdbID [{0}] from DNZB-MoreInfo'.format(imdbid)) - return imdbid + return imdbid, dir_name logger.info('Searching IMDB for imdbID ...') try: guess = guessit.guessit(input_name) @@ -87,10 +87,12 @@ def find_imdbid(dir_name, input_name, omdb_api_key): if imdbid: logger.info('Found imdbID [{0}]'.format(imdbid)) - return imdbid + new_dir_name = '{}.cp({})'.format(dir_name, imdbid) + os.rename(dir_name, new_dir_name) + return imdbid, new_dir_name logger.warning('Unable to find a imdbID for {0}'.format(input_name)) - return imdbid + return imdbid, dir_name def category_search(input_directory, input_name, input_category, root, categories): From 836df51d1462ee3fadacd3ea0a638c7113d05ed4 Mon Sep 17 00:00:00 2001 From: Matt Park Date: Mon, 2 Oct 2023 15:15:01 -0400 Subject: [PATCH 3/3] Update movies.py Check for an updated dir_name in case IMDB id was appended. --- core/auto_process/movies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py index bfee550a..87c50e16 100644 --- a/core/auto_process/movies.py +++ b/core/auto_process/movies.py @@ -66,7 +66,7 @@ def process(section, dir_name, input_name=None, status=0, client_agent='manual', else: extract = int(cfg.get('extract', 0)) - imdbid = find_imdbid(dir_name, input_name, omdbapikey) + imdbid, dir_name = find_imdbid(dir_name, input_name, omdbapikey) if section == 'CouchPotato': base_url = '{0}{1}:{2}{3}/api/{4}/'.format(protocol, host, port, web_root, apikey) if section == 'Radarr':