From 790b641f5709bf5ac40c6c1151395ce7c18fa8fb Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Fri, 17 Oct 2014 14:46:39 +0200 Subject: improving matching for filtering tags and fixing pep8 warnings --- service/pixelated/adapter/search.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'service/pixelated/adapter/search.py') diff --git a/service/pixelated/adapter/search.py b/service/pixelated/adapter/search.py index cd02f09b..a187b444 100644 --- a/service/pixelated/adapter/search.py +++ b/service/pixelated/adapter/search.py @@ -35,7 +35,7 @@ class SearchEngine(object): self._index = self._create_index() def _add_to_tags(self, tags, group, skip_default_tags, count_type, query=None): - query_matcher = re.compile(query) if query else re.compile(".*") + query_matcher = re.compile(".*%s.*" % query.lower()) if query else re.compile(".*") for tag, count in group.iteritems(): @@ -111,7 +111,7 @@ class SearchEngine(object): header = mdict['header'] tags = mdict.get('tags', []) tags.append(mail.mailbox_name.lower()) - + index_data = { 'sender': unicode(header.get('from', '')), 'subject': unicode(header.get('subject', '')), @@ -140,11 +140,7 @@ class SearchEngine(object): def search(self, query, window=25, page=1, all_mails=False): query = self.prepare_query(query) - - if(all_mails): - return self._search_all_mails(query) - else: - return self._paginated_search_mails(query, window, page) + return self._search_all_mails(query) if all_mails else self._paginated_search_mails(query, window, page) def _search_all_mails(self, query): with self._index.searcher() as searcher: -- cgit v1.2.3