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

Fix error check in field_list_count(). Also speeds it up a bit.

Browse Source
This commit is contained in:
Charles Haley 2024-10-19 11:34:05 +01:00 committed by Kovid Goyal
parent 12cccddba6
commit 8e22f1c7ce
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1349,11 +1349,9 @@ class _Interpreter:
def do_node_field_list_count(self, prog): def do_node_field_list_count(self, prog):
name = field_metadata.search_term_to_field_key(self.expr(prog.expression)) name = field_metadata.search_term_to_field_key(self.expr(prog.expression))
if not self.parent_book.has_key(name):
self.error(_("'{0}' is not a field").format(name), prog.line_number)
res = getattr(self.parent_book, name, None) res = getattr(self.parent_book, name, None)
if not isinstance(res, (list, tuple, set, dict)): if res is None or not isinstance(res, (list, tuple, set, dict)):
self.error(_("Field '{0}' is not a list").format(name), prog.line_number) self.error(_("Field '{0}' is either not a field or not a list").format(name), prog.line_number)
ans = str(len(res)) ans = str(len(res))
if self.break_reporter: if self.break_reporter:
self.break_reporter(prog.node_name, ans, prog.line_number) self.break_reporter(prog.node_name, ans, prog.line_number)