From 02b665923535a1cc59d05c5840f6a6231d9e5213 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 20 Oct 2014 20:46:07 +0200 Subject: [PATCH] Don't show ignored in ETA message --- couchpotato/core/media/movie/searcher.py | 19 +++++++++---------- couchpotato/core/plugins/release/main.py | 4 +++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py index 3c26386..11aa975 100755 --- a/couchpotato/core/media/movie/searcher.py +++ b/couchpotato/core/media/movie/searcher.py @@ -203,13 +203,6 @@ class MovieSearcher(SearcherBase, MovieTypeBase): quality['custom'] = quality_custom results = fireEvent('searcher.search', search_protocols, movie, quality, single = True) or [] - results_count = len(results) - total_result_count += results_count - if results_count == 0: - log.debug('Nothing found for %s in %s', (default_title, quality['label'])) - - # Keep track of releases found outside ETA window - outside_eta_results += results_count if could_not_be_released else 0 # Check if movie isn't deleted while searching if not fireEvent('media.get', movie.get('_id'), single = True): @@ -217,11 +210,17 @@ class MovieSearcher(SearcherBase, MovieTypeBase): # Add them to this movie releases list found_releases += fireEvent('release.create_from_search', results, movie, quality, single = True) + results_count = len(found_releases) + total_result_count += results_count + if results_count == 0: + log.debug('Nothing found for %s in %s', (default_title, quality['label'])) + + # Keep track of releases found outside ETA window + outside_eta_results += results_count if could_not_be_released else 0 # Don't trigger download, but notify user of available releases - if could_not_be_released: - if results_count > 0: - log.debug('Found %s releases for "%s", but ETA isn\'t correct yet.', (results_count, default_title)) + if could_not_be_released and results_count > 0: + log.debug('Found %s releases for "%s", but ETA isn\'t correct yet.', (results_count, default_title)) # Try find a valid result and download it if (force_download or not could_not_be_released or always_search) and fireEvent('release.try_download_result', results, movie, quality_custom, single = True): diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index 375547c..a241c34 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -441,7 +441,6 @@ class Release(Plugin): for rel in search_results: rel_identifier = md5(rel['url']) - found_releases.append(rel_identifier) release = { '_t': 'release', @@ -482,6 +481,9 @@ class Release(Plugin): # Update release in search_results rel['status'] = rls.get('status') + if rel['status'] == 'available': + found_releases.append(rel_identifier) + return found_releases except: log.error('Failed: %s', traceback.format_exc())