diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py index e44e8e6d..3c26386d 100755 --- a/couchpotato/core/media/movie/searcher.py +++ b/couchpotato/core/media/movie/searcher.py @@ -166,7 +166,8 @@ class MovieSearcher(SearcherBase, MovieTypeBase): 'quality': q_identifier, 'finish': profile['finish'][index], 'wait_for': tryInt(profile['wait_for'][index]), - '3d': profile['3d'][index] if profile.get('3d') else False + '3d': profile['3d'][index] if profile.get('3d') else False, + 'minimum_score': profile.get('minimum_score', 1), } could_not_be_released = not self.couldBeReleased(q_identifier in pre_releases, release_dates, movie['info']['year']) diff --git a/couchpotato/core/plugins/profile/main.py b/couchpotato/core/plugins/profile/main.py index 489c34dd..29bd6cbe 100644 --- a/couchpotato/core/plugins/profile/main.py +++ b/couchpotato/core/plugins/profile/main.py @@ -86,6 +86,7 @@ class ProfilePlugin(Plugin): 'label': toUnicode(kwargs.get('label')), 'order': tryInt(kwargs.get('order', 999)), 'core': kwargs.get('core', False), + 'minimum_score': tryInt(kwargs.get('minimum_score', 1)), 'qualities': [], 'wait_for': [], 'stop_after': [], @@ -217,6 +218,7 @@ class ProfilePlugin(Plugin): 'label': toUnicode(profile.get('label')), 'order': order, 'qualities': profile.get('qualities'), + 'minimum_score': 1, 'finish': [], 'wait_for': [], 'stop_after': [], diff --git a/couchpotato/core/plugins/profile/static/profile.css b/couchpotato/core/plugins/profile/static/profile.css index edab8312..df93944e 100644 --- a/couchpotato/core/plugins/profile/static/profile.css +++ b/couchpotato/core/plugins/profile/static/profile.css @@ -51,6 +51,11 @@ margin: 0 5px !important; } + .profile .wait_for .minimum_score_input { + width: 40px !important; + text-align: left; + } + .profile .types { padding: 0; margin: 0 20px 0 -4px; diff --git a/couchpotato/core/plugins/profile/static/profile.js b/couchpotato/core/plugins/profile/static/profile.js index 89f1a697..35ad81b9 100644 --- a/couchpotato/core/plugins/profile/static/profile.js +++ b/couchpotato/core/plugins/profile/static/profile.js @@ -53,12 +53,21 @@ var Profile = new Class({ }), new Element('span', {'text':'day(s) for a better quality '}), new Element('span.advanced', {'text':'and keep searching'}), + // "After a checked quality is found and downloaded, continue searching for even better quality releases for the entered number of days." new Element('input.inlay.xsmall.stop_after_input.advanced', { 'type':'text', 'value': data.stop_after && data.stop_after.length > 0 ? data.stop_after[0] : 0 }), - new Element('span.advanced', {'text':'day(s) for a better (checked) quality.'}) + new Element('span.advanced', {'text':'day(s) for a better (checked) quality.'}), + + // Minimum score of + new Element('span.advanced', {'html':'
Releases need a minimum score of'}), + new Element('input.advanced.inlay.xsmall.minimum_score_input', { + 'size': 4, + 'type':'text', + 'value': data.minimum_score || 1 + }) ) ); @@ -126,6 +135,7 @@ var Profile = new Class({ 'label' : self.el.getElement('.quality_label input').get('value'), 'wait_for' : self.el.getElement('.wait_for_input').get('value'), 'stop_after' : self.el.getElement('.stop_after_input').get('value'), + 'minimum_score' : self.el.getElement('.minimum_score_input').get('value'), 'types': [] }; diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index 452aa751..375547c3 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -389,8 +389,8 @@ class Release(Plugin): log.info('Ignored: %s', rel['name']) continue - if rel['score'] <= 0: - log.info('Ignored, score "%s" to low: %s', (rel['score'], rel['name'])) + if rel['score'] < quality_custom.get('minimum_score'): + log.info('Ignored, score "%s" to low, need at least "%s": %s', (rel['score'], quality_custom.get('minimum_score'), rel['name'])) continue if rel['size'] <= 50: