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

Add ratings to tag browser.

Browse Source 
Fix searching for ratings from tag browser by counting the stars.
Add relational searching for ratings (e.g., rating:>3).
This commit is contained in:
Charles Haley 2010-05-05 19:21:21 +01:00
parent 96b9340b1a
commit a1c9fa3671
4 changed files with 82 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/gui2/tag_view.py
View File

@ -194,15 +194,17 @@ class TagTreeItem(object):
class TagsModel(QAbstractItemModel):
categories_orig = [_('Authors'), _('Series'), _('Formats'), _('Publishers'), _('News'), _('All tags')]
row_map_orig = ['author', 'series', 'format', 'publisher', 'news', 'tag']
categories_orig = [_('Authors'), _('Series'), _('Formats'), _('Publishers'),
_('Ratings'), _('News'), _('All tags')]
row_map_orig = ['author', 'series', 'format', 'publisher', 'rating',
'news', 'tag']
tags_categories_start= 5
search_keys=['search', _('Searches')]
def __init__(self, db, parent=None):
QAbstractItemModel.__init__(self, parent)
self.cat_icon_map_orig = list(map(QIcon, [I('user_profile.svg'),
I('series.svg'), I('book.svg'), I('publisher.png'),
I('series.svg'), I('book.svg'), I('publisher.png'), I('star.png'),
I('news.svg'), I('tags.svg')]))
self.icon_state_map = [None, QIcon(I('plus.svg')), QIcon(I('minus.svg'))]
self.custcol_icon = QIcon(I('column.svg'))
@ -430,6 +432,9 @@ class TagsModel(QAbstractItemModel):
if tag.state > 0:
prefix = ' not ' if tag.state == 2 else ''
category = key if key != 'news' else 'tag'
if tag.name[0] == u'\u2605': # char is a star. Assume rating
ans.append('%s%s:%s'%(prefix, category, len(tag.name)))
else:
if category == 'tag':
if tag.name in tags_seen:
continue

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

@ -158,9 +158,10 @@ class ResultCache(SearchQueryParser):
SearchQueryParser.__init__(self,
locations=SearchQueryParser.DEFAULT_LOCATIONS +
[c for c in cc_label_map])
self.build_relop_dict()
self.build_date_relop_dict()
self.build_rating_relop_dict()
def build_relop_dict(self):
def build_date_relop_dict(self):
'''
Because the database dates have time in them, we can't use direct
comparisons even when field_count == 3. The query has time = 0, but
@ -204,9 +205,18 @@ class ResultCache(SearchQueryParser):
def relop_le(db, query, field_count):
return not relop_gt(db, query, field_count)
self.search_relops = {'=':[1, relop_eq], '>':[1, relop_gt], '<':[1, relop_lt], \
self.date_search_relops = {'=':[1, relop_eq], '>':[1, relop_gt], '<':[1, relop_lt], \
'!=':[2, relop_ne], '>=':[2, relop_ge], '<=':[2, relop_le]}
def build_rating_relop_dict(self):
self.rating_search_relops = {
'=':[1, lambda r, q: r == q],
'>':[1, lambda r, q: r > q],
'<':[1, lambda r, q: r < q],
'!=':[2, lambda r, q: r != q],
'>=':[2, lambda r, q: r >= q],
'<=':[2, lambda r, q: r <= q]}
def __getitem__(self, row):
return self._data[self._map_filtered[row]]
@ -220,17 +230,17 @@ class ResultCache(SearchQueryParser):
def universal_set(self):
return set([i[0] for i in self._data if i is not None])
def get_matches_dates(self, location, query):
def get_dates_matches(self, location, query):
matches = set([])
if len(query) < 2:
return matches
relop = None
for k in self.search_relops.keys():
for k in self.date_search_relops.keys():
if query.startswith(k):
(p, relop) = self.search_relops[k]
(p, relop) = self.date_search_relops[k]
query = query[p:]
if relop is None:
(p, relop) = self.search_relops['=']
(p, relop) = self.date_search_relops['=']
if location in self.custom_column_label_map:
loc = self.FIELD_MAP[self.custom_column_label_map[location]['num']]
else:
@ -267,6 +277,32 @@ class ResultCache(SearchQueryParser):
matches.add(item[0])
return matches
def get_ratings_matches(self, location, query):
matches = set([])
if len(query) == 0:
return matches
relop = None
for k in self.rating_search_relops.keys():
if query.startswith(k):
(p, relop) = self.rating_search_relops[k]
query = query[p:]
if relop is None:
(p, relop) = self.rating_search_relops['=']
try:
r = int(query)
except:
return matches
if location in self.custom_column_label_map:
loc = self.FIELD_MAP[self.custom_column_label_map[location]['num']]
else:
loc = self.FIELD_MAP['rating']
for item in self._data:
if item is None or item[loc] is None: continue
if relop(item[loc]/2, r):
matches.add(item[0])
return matches
def get_matches(self, location, query):
matches = set([])
if query and query.strip():
@ -276,7 +312,13 @@ class ResultCache(SearchQueryParser):
if (location in ('pubdate', 'date')) or \
((location in self.custom_column_label_map) and \
self.custom_column_label_map[location]['datatype'] == 'datetime'):
return self.get_matches_dates(location, query)
return self.get_dates_matches(location, query)
### take care of ratings special case
if location == 'rating' or \
((location in self.custom_column_label_map) and \
self.custom_column_label_map[location]['datatype'] == 'rating'):
return self.get_ratings_matches(location, query)
### everything else
matchkind = CONTAINS_MATCH
@ -297,7 +339,8 @@ class ResultCache(SearchQueryParser):
if location in ('tag', 'author', 'format', 'comment'):
location += 's'
all = ('title', 'authors', 'publisher', 'tags', 'comments', 'series', 'formats', 'isbn', 'rating', 'cover')
all = ('title', 'authors', 'publisher', 'tags', 'comments', 'series',
'formats', 'isbn', 'rating', 'cover')
MAP = {}
for x in all: # get the db columns for the standard searchables
@ -317,21 +360,22 @@ class ResultCache(SearchQueryParser):
if self.custom_column_label_map[x]['is_multiple']:
SPLITABLE_FIELDS.append(MAP[x])
location = [location] if location != 'all' else list(MAP.keys())
for i, loc in enumerate(location):
location[i] = MAP[loc]
try:
rating_query = int(query) * 2
except:
rating_query = None
location = [location] if location != 'all' else list(MAP.keys())
for i, loc in enumerate(location):
location[i] = MAP[loc]
# get the tweak here so that the string lookup and compare aren't in the loop
bools_are_tristate = tweaks['bool_custom_columns_are_tristate'] == 'yes'
for loc in location:
if loc == MAP['authors']:
q = query.replace(',', '|'); ### DB stores authors with commas changed to bars, so change query
### DB stores authors with commas changed to bars, so change query
q = query.replace(',', '|');
else:
q = query
@ -388,7 +432,8 @@ class ResultCache(SearchQueryParser):
matches.add(item[0])
continue
except:
continue ## A conversion threw an exception. Because of the type, no further match possible
# A conversion threw an exception. Because of the type, no further match possible
continue
if loc not in EXCLUDE_FIELDS:
if loc in SPLITABLE_FIELDS:

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

@ -126,8 +126,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
'publishers': ['publisher', 'name'],
'authors' : ['author', 'name'],
'news' : ['news', 'name'],
'ratings' : ['rating', 'rating']
}
self.tag_browser_formatters = {}
self.tag_browser_formatters = {'ratings': lambda x:u'\u2605'*int(round(x/2.))}
self.connect()
self.is_case_sensitive = not iswindows and not isosx and \

8
src/calibre/library/schema_upgrades.py
View File

@ -273,6 +273,12 @@ class SchemaUpgrade(object):
'Add restricted Tag Browser views'
def create_tag_browser_view(table_name, column_name, view_column_name):
script = ('''
DROP VIEW IF EXISTS tag_browser_{tn};
CREATE VIEW tag_browser_{tn} AS SELECT
id,
{vcn},
(SELECT COUNT(id) FROM books_{tn}_link WHERE {cn}={tn}.id) count
FROM {tn};
DROP VIEW IF EXISTS tag_browser_filtered_{tn};
CREATE VIEW tag_browser_filtered_{tn} AS SELECT
id,
@ -286,5 +292,3 @@ class SchemaUpgrade(object):
for tn, cn in self.tag_browser_categories.items():
if tn != 'news':
create_tag_browser_view(tn, cn[0], cn[1])