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

...

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-23 00:46:35 +05:30
parent 7489f1a793
commit 039a582b96
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,6 +401,7 @@ class TagsModel(QAbstractItemModel): # {{{
sort_by = config['sort_tags_by'] sort_by = config['sort_tags_by']
eval_formatter = EvalFormatter() eval_formatter = EvalFormatter()
intermediate_nodes = {}
if data is None: if data is None:
print ('_create_node_tree: no data!') print ('_create_node_tree: no data!')
@ -580,7 +581,7 @@ class TagsModel(QAbstractItemModel): # {{{
else: else:
if i < len(components)-1: if i < len(components)-1:
original_name = '.'.join(components[:i+1]) original_name = '.'.join(components[:i+1])
t = self.intermediate_nodes.get((original_name, tag.category), None) t = intermediate_nodes.get((original_name, tag.category), None)
if t is None: if t is None:
t = copy.copy(tag) t = copy.copy(tag)
t.original_name = original_name t.original_name = original_name
@ -591,12 +592,12 @@ class TagsModel(QAbstractItemModel): # {{{
t.is_editable = False t.is_editable = False
else: else:
t.is_searchable = t.is_editable = False t.is_searchable = t.is_editable = False
self.intermediate_nodes[(original_name, tag.category)] = t intermediate_nodes[(original_name, tag.category)] = t
else: else:
t = tag t = tag
if not in_uc: if not in_uc:
t.original_name = t.name t.original_name = t.name
self.intermediate_nodes[(t.original_name, tag.category)] = t intermediate_nodes[(t.original_name, tag.category)] = t
t.is_hierarchical = \ t.is_hierarchical = \
'5state' if t.category != 'search' else '3state' '5state' if t.category != 'search' else '3state'
t.name = comp t.name = comp
@ -611,11 +612,9 @@ class TagsModel(QAbstractItemModel): # {{{
# Build the entire node tree. Note that category_nodes is in field # Build the entire node tree. Note that category_nodes is in field
# metadata order so the user categories will be at the end # metadata order so the user categories will be at the end
self.intermediate_nodes = {}
for category in self.category_nodes: for category in self.category_nodes:
process_one_node(category, collapse_model, process_one_node(category, collapse_model,
state_map.get(category.category_key, {})) state_map.get(category.category_key, {}))
self.intermediate_nodes = None
# Fix up the node tree, reordering as needed and deleting undisplayed nodes # Fix up the node tree, reordering as needed and deleting undisplayed nodes
new_children = [] new_children = []