Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't throw exception when searching with token:

Browse Source
This commit is contained in:
John Schember 2009-06-28 12:25:00 -04:00
parent d015f179ac
commit c2f74ca22a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/gui2/library.py
View File

@ -239,7 +239,18 @@ class BooksModel(QAbstractTableModel):
self.endInsertRows() self.endInsertRows()
self.count_changed() self.count_changed()
def clean_search_text(self, text):
tokens = text.split(' ')
for i, token in enumerate(tokens):
if token.strip().endswith(':') or token.strip() == '':
del tokens[i]
text = ' '.join(tokens)
if text.strip() == '':
text = None
return text
def search(self, text, refinement, reset=True): def search(self, text, refinement, reset=True):
text = self.clean_search_text(text)
self.db.search(text) self.db.search(text)
self.last_search = text self.last_search = text
if reset: if reset:
@ -851,9 +862,9 @@ class DeviceBooksModel(BooksModel):
flags |= Qt.ItemIsEditable flags |= Qt.ItemIsEditable
return flags return flags
def search(self, text, refinement, reset=True): def search(self, text, refinement, reset=True):
if not text or not text.strip(): text = self.clean_search_text(text)
if not text:
self.map = list(range(len(self.db))) self.map = list(range(len(self.db)))
else: else:
matches = self.search_engine.parse(text) matches = self.search_engine.parse(text)