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

The stuff to handle the counts as we have been discussing.

Browse Source
This commit is contained in:
Charles Haley 2015-11-24 13:38:13 +01:00
parent a18dc59b27
commit 1def031ea3
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,21 +121,8 @@ class TagTreeItem(object): # {{{
return self.tag.avg_rating return self.tag.avg_rating
if not self.children: if not self.children:
return self.tag.avg_rating # leaf node, avg_rating is correct return self.tag.avg_rating # leaf node, avg_rating is correct
if self.cached_average_rating is not None: if self.cached_average_rating is None:
return self.cached_average_rating raise ValueError('Must compute average rating for tag ' + self.tag.original_name)
total = num = 0
for child in self.children:
r = child.average_rating
if r:
total += 1
num += r
if self.tag.avg_rating:
total += 1
num += self.tag.avg_rating
try:
self.cached_average_rating = num/float(total)
except ZeroDivisionError:
self.cached_average_rating = 0
return self.cached_average_rating return self.cached_average_rating
@property @property
@ -358,6 +345,8 @@ class TagsModel(QAbstractItemModel): # {{{
if hidden_categories is not None: if hidden_categories is not None:
self.hidden_categories = hidden_categories self.hidden_categories = hidden_categories
self.book_rating_map = db.new_api.fields['rating'].book_value_map
self.db = db self.db = db
self._run_rebuild() self._run_rebuild()
self.endResetModel() self.endResetModel()
@ -625,6 +614,8 @@ 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 = 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:
@ -652,6 +643,19 @@ class TagsModel(QAbstractItemModel): # {{{
node_parent = self.create_node(parent=node_parent, data=t, node_parent = self.create_node(parent=node_parent, data=t,
tooltip=tt, icon_map=self.icon_state_map) tooltip=tt, icon_map=self.icon_state_map)
child_map[(comp,tag.category)] = node_parent child_map[(comp,tag.category)] = node_parent
# Correct the average rating for the node
total = 0
count = 0
for id_ in t.id_set:
rating = self.book_rating_map.get(id_, 0)
if rating:
total += rating/2
count += 1
if total and count:
node_parent.cached_average_rating = total/count
else:
node_parent.cached_average_rating = 0
return return
# }}} # }}}