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 counting items. The old way misstated the counts for user categories because it was using the cumulative id_set from the original category.

Browse Source
This commit is contained in:
Charles Haley 2015-11-23 16:21:27 +01:00
parent 99adf52046
commit 8ff0bf8481
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,7 @@ def get_categories(dbcache, sort='name', book_ids=None, first_letter_sort=False)
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 = len(t.id_set)
t.original_categories.add(other_tag.category) t.original_categories.add(other_tag.category)
total_rating = 0 total_rating = 0

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

@ -74,6 +74,7 @@ class TagTreeItem(object): # {{{
elif self.type == self.TAG: elif self.type == self.TAG:
self.tag = data self.tag = data
self.cached_average_rating = None self.cached_average_rating = None
self.cached_item_count = None
self.tooltip = tooltip or '' self.tooltip = tooltip or ''
@ -137,6 +138,21 @@ class TagTreeItem(object): # {{{
except ZeroDivisionError: except ZeroDivisionError:
return 0 return 0
@property
def item_count(self):
if not self.tag.is_hierarchical or len(self.children) == 0:
return self.tag.count
if self.cached_item_count:
return self.cached_item_count
def child_item_set(node):
s = set() | node.tag.id_set # force a copy of the set
for child in node.children:
s |= child_item_set(child)
return s
self.cached_item_count = len(child_item_set(self))
return self.cached_item_count
def data(self, role): def data(self, role):
if role == Qt.UserRole: if role == Qt.UserRole:
return self return self
@ -174,8 +190,7 @@ class TagTreeItem(object): # {{{
else: else:
name = tag.name name = tag.name
if role == Qt.DisplayRole: if role == Qt.DisplayRole:
count = len(tag.id_set) count = self.item_count
count = count if count > 0 else tag.count
if count == 0: if count == 0:
return ('%s'%(name)) return ('%s'%(name))
else: else:
@ -217,8 +232,7 @@ class TagTreeItem(object): # {{{
name = tag.original_name name = tag.original_name
else: else:
name = tag.name name = tag.name
count = len(tag.id_set) count = self.item_count
count = count if count > 0 else tag.count
rating = self.average_rating rating = self.average_rating
if rating: if rating:
rating = ',rating=%.1f' % rating rating = ',rating=%.1f' % rating
@ -611,8 +625,6 @@ class TagsModel(QAbstractItemModel): # {{{
node_parent = child_map[(comp,tag.category)] node_parent = child_map[(comp,tag.category)]
t = node_parent.tag t = node_parent.tag
t.is_hierarchical = '5state' if tag.category != 'search' else '3state' t.is_hierarchical = '5state' if tag.category != 'search' else '3state'
if tag.id_set is not None and t.id_set is not None:
t.id_set |= tag.id_set
intermediate_nodes[t.original_name, t.category] = t intermediate_nodes[t.original_name, t.category] = t
else: else:
if i < len(components)-1: if i < len(components)-1: