moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 11:02:21 -05:00
Code Issues Releases Wiki Activity

New show searches now try and return exact matches first then next best, search speed vastly improved as well.

Browse Source
This commit is contained in:
echel0n 2014-04-22 07:14:11 -07:00
parent e7cf923cc0
commit 3af9e2ce65
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sickbeard/webserve.py
View File

@ -1961,7 +1961,7 @@ class NewHomeAddShows:
if not lang or lang == 'null': if not lang or lang == 'null':
lang = "en" lang = "en"
results = [] final_results = []
nameUTF8 = name.encode('utf-8') nameUTF8 = name.encode('utf-8')
@ -1978,6 +1978,8 @@ class NewHomeAddShows:
# Query Indexers for each search term and build the list of results # Query Indexers for each search term and build the list of results
for indexer in indexers: for indexer in indexers:
results = []
lINDEXER_API_PARMS = sickbeard.indexerApi(indexer).api_params.copy() lINDEXER_API_PARMS = sickbeard.indexerApi(indexer).api_params.copy()
lINDEXER_API_PARMS['custom_ui'] = classes.AllShowsListUI lINDEXER_API_PARMS['custom_ui'] = classes.AllShowsListUI
t = sickbeard.indexerApi(indexer).indexer(**lINDEXER_API_PARMS) t = sickbeard.indexerApi(indexer).indexer(**lINDEXER_API_PARMS)
@ -1989,18 +1991,20 @@ class NewHomeAddShows:
search = [search] search = [search]
# add search results # add search results
results += list([sickbeard.indexerApi(indexer).name, int(sickbeard.indexerApi(indexer).config['id']), results += search
sickbeard.indexerApi(indexer).config["show_url"], int(x['id']), x['seriesname'],
x['firstaired']] for x in search if x['firstaired'])
except: except:
continue continue
final_results += list([sickbeard.indexerApi(indexer).name, int(sickbeard.indexerApi(indexer).config['id']),
sickbeard.indexerApi(indexer).config["show_url"], int(x['id']), x['seriesname'],
x['firstaired']] for x in results if re.search(keywords[0], x['seriesname'], flags=re.I) and x['firstaired'])
# remove duplicates and sort by firstaired # remove duplicates and sort by firstaired
results = sorted(results, reverse=True, key=operator.itemgetter(5)) final_results = sorted(final_results, reverse=True, key=operator.itemgetter(5))
results = list(results for results, _ in itertools.groupby(results)) final_results = list(final_results for final_results, _ in itertools.groupby(final_results))
lang_id = sickbeard.indexerApi().config['langabbv_to_id'][lang] lang_id = sickbeard.indexerApi().config['langabbv_to_id'][lang]
return json.dumps({'results': results, 'langid': lang_id}) return json.dumps({'results': final_results, 'langid': lang_id})
@cherrypy.expose @cherrypy.expose
def massAddTable(self, rootDir=None): def massAddTable(self, rootDir=None):