Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle unrated items in Tag Browser

Browse Source
This commit is contained in:
Kovid Goyal 2010-05-05 14:46:40 -06:00
commit 1ee1667f7b
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/library/caches.py
View File

@ -281,6 +281,10 @@ class ResultCache(SearchQueryParser):
matches = set([]) matches = set([])
if len(query) == 0: if len(query) == 0:
return matches return matches
if query == 'false':
query = '0'
elif query == 'true':
query = '>0'
relop = None relop = None
for k in self.rating_search_relops.keys(): for k in self.rating_search_relops.keys():
if query.startswith(k): if query.startswith(k):
@ -298,8 +302,13 @@ class ResultCache(SearchQueryParser):
loc = self.FIELD_MAP['rating'] loc = self.FIELD_MAP['rating']
for item in self._data: for item in self._data:
if item is None or item[loc] is None: continue if item is None:
if relop(item[loc]/2, r): continue
if not item[loc]:
i = 0
else:
i = item[loc]/2
if relop(i, r):
matches.add(item[0]) matches.add(item[0])
return matches return matches
@ -312,13 +321,13 @@ class ResultCache(SearchQueryParser):
if (location in ('pubdate', 'date')) or \ if (location in ('pubdate', 'date')) or \
((location in self.custom_column_label_map) and \ ((location in self.custom_column_label_map) and \
self.custom_column_label_map[location]['datatype'] == 'datetime'): self.custom_column_label_map[location]['datatype'] == 'datetime'):
return self.get_dates_matches(location, query) return self.get_dates_matches(location, query.lower())
### take care of ratings special case ### take care of ratings special case
if location == 'rating' or \ if location == 'rating' or \
((location in self.custom_column_label_map) and \ ((location in self.custom_column_label_map) and \
self.custom_column_label_map[location]['datatype'] == 'rating'): self.custom_column_label_map[location]['datatype'] == 'rating'):
return self.get_ratings_matches(location, query) return self.get_ratings_matches(location, query.lower())
### everything else ### everything else
matchkind = CONTAINS_MATCH matchkind = CONTAINS_MATCH

3
src/calibre/library/database2.py
View File

@ -636,7 +636,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
tooltip = self.custom_column_label_map[category]['name'] tooltip = self.custom_column_label_map[category]['name']
formatter = self.tag_browser_formatters.get(tn, lambda x: x) formatter = self.tag_browser_formatters.get(tn, lambda x: x)
categories[category] = [Tag(formatter(r[1]), count=r[2], id=r[0], icon=icon, tooltip = tooltip) categories[category] = [Tag(formatter(r[1]), count=r[2], id=r[0], icon=icon, tooltip = tooltip)
for r in data if r[2] > 0] for r in data
if r[2] > 0 and (category != 'rating' or len(formatter(r[1])) > 0)]
categories['format'] = [] categories['format'] = []
for fmt in self.conn.get('SELECT DISTINCT format FROM data'): for fmt in self.conn.get('SELECT DISTINCT format FROM data'):
fmt = fmt[0] fmt = fmt[0]