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

Fix GSTs to show the source categories of the items consolidated into the name, and to correct the average rating during consolidation

Browse Source
This commit is contained in:
Charles Haley 2015-11-23 16:20:05 +01:00
parent e8f62e0e49
commit 4aa32c8e4d
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/db/categories.py
View File

@ -21,11 +21,12 @@ class Tag(object):
__slots__ = ('name', 'original_name', 'id', 'count', 'state', 'is_hierarchical', __slots__ = ('name', 'original_name', 'id', 'count', 'state', 'is_hierarchical',
'is_editable', 'is_searchable', 'id_set', 'avg_rating', 'sort', 'is_editable', 'is_searchable', 'id_set', 'avg_rating', 'sort',
'use_sort_as_name', 'category', 'search_expression') 'use_sort_as_name', 'category', 'search_expression', 'original_categories')
def __init__(self, name, id=None, count=0, state=0, avg=0, sort=None, def __init__(self, name, id=None, count=0, state=0, avg=0, sort=None,
category=None, id_set=None, search_expression=None, category=None, id_set=None, search_expression=None,
is_editable=True, is_searchable=True, use_sort_as_name=False): is_editable=True, is_searchable=True, use_sort_as_name=False,
original_categories=None):
self.name = self.original_name = name self.name = self.original_name = name
self.id = id self.id = id
self.count = count self.count = count
@ -39,6 +40,7 @@ class Tag(object):
self.use_sort_as_name = use_sort_as_name self.use_sort_as_name = use_sort_as_name
self.category = category self.category = category
self.search_expression = search_expression self.search_expression = search_expression
self.original_categories = None
def __unicode__(self): def __unicode__(self):
return u'%s:%s:%s:%s:%s'%(self.name, self.count, self.id, self.state, self.category) return u'%s:%s:%s:%s:%s'%(self.name, self.count, self.id, self.state, self.category)
@ -198,12 +200,29 @@ def get_categories(dbcache, sort='name', book_ids=None, first_letter_sort=False)
if user_cat_is_gst: if user_cat_is_gst:
# for gst items, make copy and consolidate the tags by name. # for gst items, make copy and consolidate the tags by name.
if n in names_seen: if n in names_seen:
# We must combine this node into a previous one with
# the same name ignoring case. As part of the process,
# remember the source categories and correct the
# average rating
t = names_seen[n] t = names_seen[n]
other_tag = taglist[label][n] other_tag = taglist[label][n]
t.id_set |= other_tag.id_set t.id_set |= other_tag.id_set
t.count += other_tag.count t.count += other_tag.count
t.original_categories.add(other_tag.category)
total_rating = 0
count = 0
for id_ in t.id_set:
rating = book_rating_map[id_]
if rating:
total_rating += rating/2
count += 1
if total_rating and count:
t.avg_rating = total_rating/count
else: else:
t = copy.copy(taglist[label][n]) # Must deepcopy so we don't share the id_set between nodes
t = copy.deepcopy(taglist[label][n])
t.original_categories = {t.category}
names_seen[n] = t names_seen[n] = t
items.append(t) items.append(t)
else: else:

5
src/calibre/gui2/tag_browser/model.py
View File

@ -184,7 +184,10 @@ class TagTreeItem(object): # {{{
return self.icon_state_map[tag.state] return self.icon_state_map[tag.state]
if role == Qt.ToolTipRole: if role == Qt.ToolTipRole:
tt = [self.tooltip] if self.tooltip else [] tt = [self.tooltip] if self.tooltip else []
tt.append('%s:%s' % (tag.category, tag.original_name)) if tag.original_categories:
tt.append('%s:%s' % (','.join(tag.original_categories), tag.original_name))
else:
tt.append('%s:%s' % (tag.category, tag.original_name))
ar = self.average_rating ar = self.average_rating
if ar: if ar:
tt.append(_('Average rating for books in this category: %.1f') % ar) tt.append(_('Average rating for books in this category: %.1f') % ar)