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

Two bug fixes involving user categories:

Browse Source 
1) Fix child categories not displaying if the parent category doesn't exist.
2) Ensure that only the top most user category in a hierarchy can be hidden.
This commit is contained in:
Charles Haley 2022-10-05 13:49:30 +01:00
parent 24a2f7a3a5
commit 8521749f0a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1204,10 +1204,13 @@ class TagsModel(QAbstractItemModel): # {{{
data[category] = [t for t in data[category]
if lower(t.name).find(filter_by) >= 0]
# Build a dict of the keys that have data
# Build a dict of the keys that have data.
# Always add user categories so that the constructed hierarchy works.
# This means that empty categories will be displayed unless the 'hide
# empty categories' box is checked.
tb_categories = self.db.field_metadata
for category in tb_categories:
if category in data: # The search category can come and go
if category in data or category.startswith('@'):
self.categories[category] = tb_categories[category]['name']
# Now build the list of fields in display order. A lot of this is to

8
src/calibre/gui2/tag_browser/view.py
View File

@ -976,8 +976,12 @@ class TagsView(QTreeView): # {{{
# Hide/Show/Restore categories
self.context_menu.addSeparator()
self.context_menu.addAction(_('Hide category %s') % category.replace('&', '&&'),
partial(self.context_menu_handler, action='hide',
# Because of the strange way hierarchy works in user categories
# where child nodes actually exist we must limit hiding to top-
# level categories, which will hide that category and children
if not key.startswith('@') or '.' not in key:
self.context_menu.addAction(_('Hide category %s') % category.replace('&', '&&'),
partial(self.context_menu_handler, action='hide',
category=key)).setIcon(QIcon.ic('minus.png'))
add_show_hidden_categories()