From 3edb914a7d33b7e4e732cf7b9e6c2f56de380674 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Mar 2017 14:26:29 +0530 Subject: [PATCH] Add some more ignored tags when getting length of flow --- src/calibre/srv/render_book.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/srv/render_book.py b/src/calibre/srv/render_book.py index c4f61269d0..6756b64c9d 100644 --- a/src/calibre/srv/render_book.py +++ b/src/calibre/srv/render_book.py @@ -133,11 +133,12 @@ def anchor_map(root): def get_length(root): strip_space = re.compile(r'\s+') ans = 0 + ignore_tags = frozenset('script style title noscript'.split()) def count(elem): num = 0 tname = elem.tag.rpartition('}')[-1].lower() - if elem.text and tname not in 'script style': + if elem.text and tname not in ignore_tags: num += len(strip_space.sub('', elem.text)) if elem.tail: num += len(strip_space.sub('', elem.tail)) @@ -219,7 +220,6 @@ class Container(ContainerBase): if ans['is_html']: root = self.parsed(name) ans['length'] = l = get_length(root) - print(111111, name, ans['size'], l) self.book_render_data['total_length'] += l if name in data['spine']: self.book_render_data['spine_length'] += l