Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 21:53:29 +02:00
Code Issues Projects Releases Wiki Activity

Implement #459

Browse source
This commit is contained in:
Kovid Goyal 2008-01-15 02:34:24 +00:00
parent da51c78758
commit 36ce446990
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libprs500/gui2/library.py
View file

@ -25,7 +25,7 @@
QSettings
from libprs500.ptempfile import PersistentTemporaryFile
from libprs500.library.database import LibraryDatabase
from libprs500.library.database import LibraryDatabase, SearchToken
from libprs500.gui2 import NONE, TableView
from libprs500.gui2 import qstring_to_unicode
@ -160,7 +160,7 @@ def search_tokens(self, text):
ans = []
for i in tokens:
try:
ans.append(re.compile(i, re.IGNORECASE))
ans.append(SearchToken(i))
except sre_constants.error:
continue
return ans
@ -505,7 +505,7 @@ def search(self, text, refinement, reset=True):
add = True
q = self.db[i].title + ' ' + self.db[i].authors + ' ' + ', '.join(self.db[i].tags)
for token in tokens:
if not token.search(q):
if not token.match(q):
add = False
break
if add:

19
src/libprs500/library/database.py
View file

@ -805,8 +805,8 @@ def filter(self, filters, refilter=False):
for item in self.data if refilter else self.cache:
keep = True
test = ' '.join([item[i] if item[i] else '' for i in (1,2,3,7,8,9,13)])
for filter in filters:
if not filter.search(test):
for token in filters:
if not token.match(test):
keep = False
break
if keep:
@ -1236,7 +1236,20 @@ def export_to_dir(self, dir, indices, byauthor=False):
traceback.print_exc()
f.close()
class SearchToken(object):
def __init__(self, text_token):
if text_token.startswith('!'):
self.negate = True
text_token = text_token[1:]
else:
self.negate = False
self.pattern = re.compile(text_token, re.IGNORECASE)
def match(self, text):
return bool(self.pattern.search(text)) ^ self.negate
if __name__ == '__main__':
db = LibraryDatabase('/home/kovid/library1.db')