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-06-20 22:03:41 +05:30
commit db47678470
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/utils/formatter.py
View File

@ -2033,9 +2033,9 @@ class ValidateFormatter(TemplateFormatter):
def get_value(self, key, args, kwargs): def get_value(self, key, args, kwargs):
return self._validation_string return self._validation_string
def validate(self, x): def validate(self, template):
from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.book.base import Metadata
return self.unsafe_format(x, {}, 'VALIDATE ERROR', Metadata('')) return self.unsafe_format(template, {}, Metadata(''))
validation_formatter = ValidateFormatter() validation_formatter = ValidateFormatter()

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

@ -193,7 +193,10 @@ def only_in_gui_error(name):
def get_database(mi, name): def get_database(mi, name):
proxy = mi.get('_proxy_metadata', None) try:
proxy = mi.get('_proxy_metadata', None)
except Exception:
proxy = None
if proxy is None: if proxy is None:
if name is not None: if name is not None:
only_in_gui_error(name) only_in_gui_error(name)