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

Fix differences in counting algorithms for category counts

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-24 10:25:20 +05:30
parent 1c0f8a4c02
commit aa2f592c98
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/srv/metadata.py
View File

@ -199,8 +199,7 @@ def create_toplevel_tree(category_data, items, field_metadata, opts):
) )
node_id_map[last_category_node] = category_node_map[path] = node = {'id':last_category_node, 'children':[]} node_id_map[last_category_node] = category_node_map[path] = node = {'id':last_category_node, 'children':[]}
category_nodes.append(last_category_node) category_nodes.append(last_category_node)
if not is_gst: recount_nodes.append(node)
recount_nodes.append(node)
current_root['children'].append(node) current_root['children'].append(node)
current_root = node current_root = node
else: else:
@ -215,6 +214,7 @@ def create_toplevel_tree(category_data, items, field_metadata, opts):
category_node_map[category] = node_id_map[last_category_node] = node = {'id':last_category_node, 'children':[]} category_node_map[category] = node_id_map[last_category_node] = node = {'id':last_category_node, 'children':[]}
root['children'].append(node) root['children'].append(node)
category_nodes.append(last_category_node) category_nodes.append(last_category_node)
recount_nodes.append(node)
return root, node_id_map, category_nodes, recount_nodes return root, node_id_map, category_nodes, recount_nodes
@ -479,7 +479,7 @@ def render_categories(field_metadata, opts, category_data):
fillout_tree(root, items, node_id_map, category_nodes, category_data, field_metadata, opts) fillout_tree(root, items, node_id_map, category_nodes, category_data, field_metadata, opts)
for node in recount_nodes: for node in recount_nodes:
item = items[node['id']] item = items[node['id']]
item['count'] = sum(1 for x in iternode_descendants(node) if not items[x['id']].get('is_user_category', False)) item['count'] = sum(1 for x in iternode_descendants(node) if not items[x['id']].get('is_category', False))
if opts.hidden_categories: if opts.hidden_categories:
# We have to remove hidden categories after all processing is done as # We have to remove hidden categories after all processing is done as
# items from a hidden category could be in a user category # items from a hidden category could be in a user category