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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2025-01-31 19:36:12 +05:30
commit 7a48a1ad3f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -673,11 +673,10 @@ class TagsView(QTreeView): # {{{
# category is None if the user asked to specify a template # category is None if the user asked to specify a template
# index is None if the user clicked on a category (top level) node # index is None if the user clicked on a category (top level) node
# extra is a tuple: (icon_file_name: string or None, children: True or False) # extra is a tuple: (icon_file_name: string or None, children: True or False)
def make_icon_name(key, index, db): def make_icon_name(key, index, item_id):
icon_file_name = 'icon_' + sanitize_file_name(key) icon_file_name = 'icon_' + sanitize_file_name(key)
if index is not None: if index is not None:
item_val = self._model.get_node(index).tag.original_name item_val = self._model.get_node(index).tag.original_name
item_id = db.new_api.get_item_id(key, item_val)
icon_file_name = f'{icon_file_name}@@{sanitize_file_name(item_val)}_{item_id}' icon_file_name = f'{icon_file_name}@@{sanitize_file_name(item_val)}_{item_id}'
else: else:
item_val = None item_val = None
@ -714,7 +713,7 @@ class TagsView(QTreeView): # {{{
self.recount() self.recount()
return return
icon_file_name, for_children = extra if extra is not None else (None, None) icon_file_name, for_children = extra if extra is not None else (None, None)
item_val, desired_file_name = make_icon_name(key, index, self.db) item_val, desired_file_name = make_icon_name(key, index, self._model.get_node(index).tag.id)
if icon_file_name is None: if icon_file_name is None:
# User wants to specify a specific icon # User wants to specify a specific icon
try: try: