dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified preferred method

Browse Source
This commit is contained in:
Ruud
2012-06-28 23:14:27 +02:00
parent fa37a116b0
commit af6f9473c4
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/searcher/__init__.py
+4 -3
View File
@@ -33,10 +33,11 @@ config = [{
},
{
'name': 'preferred_method',
'label': 'Preferred download method',
'default': 'both',
'label': 'First search',
'description': 'Which of the methods do you prefer',
'default': 'nzb',
'type': 'dropdown',
'values': [('usenet & torrents', 'both'), ('usenet', 'usenet'), ('torrents', 'torrents')],
'values': [('usenet & torrents', 'both'), ('usenet', 'nzb'), ('torrents', 'torrent')],
},
],
}, {
couchpotato/core/plugins/searcher/main.py
+5 -17
View File
@@ -105,28 +105,16 @@ class Searcher(Plugin):
log.info('Search for %s in %s', (default_title, quality_type['quality']['label']))
quality = fireEvent('quality.single', identifier = quality_type['quality']['identifier'], single = True)
download_preference = self.conf('preferred_method')
if download_preference == 'torrents':
log.info('First searching torrents')
results = fireEvent('torrent.search', movie, quality, merge = True)
if not results:
log.info('No results from torrents, searching usenet')
results = fireEvent('nzb.search', movie, quality, merge = True)
elif download_preference == 'usenet':
log.info('First searching usenet')
results = fireEvent('nzb.search', movie, quality, merge = True)
if not results:
log.info('No results from usenet, searching torrents')
results = fireEvent('torrent.search', movie, quality, merge = True)
else:
results = fireEvent('yarr.search', movie, quality, merge = True)
results = fireEvent('yarr.search', movie, quality, merge = True)
sorted_results = sorted(results, key = lambda k: k['score'], reverse = True)
if len(sorted_results) == 0:
log.debug('Nothing found for %s in %s', (default_title, quality_type['quality']['label']))
download_preference = self.conf('preferred_method')
if download_preference != 'both':
sorted_results = sorted(sorted_results, key = lambda k: k['type'], reverse = (download_preference == 'torrent'))
# Check if movie isn't deleted while searching
if not db.query(Movie).filter_by(id = movie.get('id')).first():
break