dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Make use of regex for search

Browse Source
This commit is contained in:
DarkPhoenix
2020-04-08 03:17:25 +03:00
parent 9b697b24d8
commit 5707914ad5
3 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/jargon/jargon.py
View File

@@ -31,15 +31,14 @@ class Jargon:
def get_rawdata(self) -> dict:
return self._rawdata
def apply(self, query):
query_words = query.split()
def apply(self, query_words):
parts = []
for word in query_words:
replacement = self.get(word)
if replacement:
parts.append(replacement)
parts.append('({}|{})'.format(word, replacement))
else:
parts.append(word)
return ' '.join(parts)
return parts

21
service/market.py
View File

@@ -96,7 +96,7 @@ class SearchWorkerThread(threading.Thread):
self.jargonLoader = JargonLoader.instance()
# load the jargon while in an out-of-thread context, to spot any problems while in the main thread
self.jargonLoader.get_jargon()
self.jargonLoader.get_jargon().apply('test string')
self.jargonLoader.get_jargon().apply('test string'.split())
self.running = True
def run(self):
@@ -138,24 +138,17 @@ class SearchWorkerThread(threading.Thread):
else:
filters = [None]
jargon_request = self.jargonLoader.get_jargon().apply(request)
requestTokens = request.split()
requestTokens = self.jargonLoader.get_jargon().apply(requestTokens)
all_results = set()
if len(request) >= config.minItemSearchLength:
if len(' '.join(requestTokens)) >= config.minItemSearchLength:
for filter_ in filters:
regular_results = eos.db.searchItems(
request, where=filter_,
filtered_results = eos.db.searchItems(
requestTokens, where=filter_,
join=(types_Item.group, types_Group.category),
eager=("group.category", "metaGroup"))
all_results.update(regular_results)
if len(jargon_request) >= config.minItemSearchLength:
for filter_ in filters:
jargon_results = eos.db.searchItems(
jargon_request, where=filter_,
join=(types_Item.group, types_Group.category),
eager=("group.category", "metaGroup"))
all_results.update(jargon_results)
all_results.update(filtered_results)
items = set()
# Return only published items, consult with Market service this time