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

Merge branch 'bwq-torrent_nzb_preference' into develop

Browse Source
This commit is contained in:
Ruud
2012-06-28 22:57:28 +02:00
parent 82acebb3c4 6c0ae664d8
commit fa37a116b0
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/searcher/__init__.py
+7
View File
@@ -31,6 +31,13 @@ config = [{
'label': 'Ignored words', 'label': 'Ignored words',
'default': 'german, dutch, french, truefrench, danish, swedish, spanish, italian, korean, dubbed, swesub, korsub', 'default': 'german, dutch, french, truefrench, danish, swedish, spanish, italian, korean, dubbed, swesub, korsub',
}, },
{
'name': 'preferred_method',
'label': 'Preferred download method',
'default': 'both',
'type': 'dropdown',
'values': [('usenet & torrents', 'both'), ('usenet', 'usenet'), ('torrents', 'torrents')],
},
], ],
}, { }, {
'tab': 'searcher', 'tab': 'searcher',
couchpotato/core/plugins/searcher/main.py
+19 -1
View File
@@ -104,7 +104,25 @@ class Searcher(Plugin):
log.info('Search for %s in %s', (default_title, quality_type['quality']['label'])) log.info('Search for %s in %s', (default_title, quality_type['quality']['label']))
quality = fireEvent('quality.single', identifier = quality_type['quality']['identifier'], single = True) quality = fireEvent('quality.single', identifier = quality_type['quality']['identifier'], single = True)
results = fireEvent('yarr.search', movie, quality, merge = 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)
sorted_results = sorted(results, key = lambda k: k['score'], reverse = True) sorted_results = sorted(results, key = lambda k: k['score'], reverse = True)
if len(sorted_results) == 0: if len(sorted_results) == 0:
log.debug('Nothing found for %s in %s', (default_title, quality_type['quality']['label'])) log.debug('Nothing found for %s in %s', (default_title, quality_type['quality']['label']))