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

Cleanup previous PR

Browse Source
This commit is contained in:
Kovid Goyal 2025-01-21 18:49:25 +05:30
parent abaf03984d
commit 2a3fdcc3d5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,6 @@ def get_gpref(name: str, defval = None):
def get_icon_for_node(node, parent, node_to_tag_map, tag_map, eval_formatter, db): def get_icon_for_node(node, parent, node_to_tag_map, tag_map, eval_formatter, db):
# This needs a legacy database so legacy formatter functions work
category = node['category'] category = node['category']
if category in ('search', 'formats') or category.startswith('@'): if category in ('search', 'formats') or category.startswith('@'):
return return

7
src/calibre/utils/formatter_functions.py
View File

@ -249,11 +249,8 @@ class FormatterFunction:
only_in_gui_error(self.name) only_in_gui_error(self.name)
def get_database(self, mi, formatter=None): def get_database(self, mi, formatter=None):
if formatter is not None: if (db := getattr(formatter, 'database', None)) is not None:
if hasattr(formatter, 'database'): return db
db = formatter.database
if db is not None:
return db
return get_database(mi, self.name) return get_database(mi, self.name)