Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-04-02 23:31:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix using readability on trees not parsed by lxml.html

Browse Source
This commit is contained in:
Kovid Goyal 2025-12-13 09:45:09 +05:30
parent d774faf29c
commit 33ba0468d6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/ebooks/readability/readability.py
View File

@ -5,6 +5,7 @@ import re
import sys
from collections import defaultdict
from lxml import etree
from lxml.html import tostring as htostring
from calibre.ebooks.readability.cleaners import clean_attributes, html_cleaner
@ -66,8 +67,14 @@ def clean(text):
return text.strip()
def text_content(elem):
if hasattr(elem, 'text_content'):
return elem.text_content()
return etree.tostring(elem, method='text', encoding='unicode')
def text_length(i):
return len(clean(i.text_content() or ''))
return len(clean(text_content(i) or ''))
class Unparsable(ValueError):
@ -223,7 +230,7 @@ class Document:
continue
grand_parent_node = parent_node.getparent()
inner_text = clean(elem.text_content() or '')
inner_text = clean(text_content(elem) or '')
inner_text_len = len(inner_text)
# If this paragraph is less than 25 characters, don't even count it.
@ -367,7 +374,7 @@ class Document:
if weight + content_score < 0:
self.debug(f'Cleaned {describe(el)} with score {content_score:6.3f} and weight {weight:<3}')
el.drop_tree()
elif el.text_content().count(',') < 10:
elif text_content(el).count(',') < 10:
counts = {}
for kind in ['p', 'img', 'li', 'a', 'embed', 'input']:
counts[kind] = len(el.findall(f'.//{kind}'))
@ -428,7 +435,7 @@ class Document:
# break
# if valid_img:
# to_remove = False
# self.debug("Allowing %s" %el.text_content())
# self.debug("Allowing %s" %text_content(el))
# for desnode in self.tags(el, "table", "ul", "div"):
# allowed[desnode] = True
@ -437,7 +444,7 @@ class Document:
x = 1
siblings = []
for sib in el.itersiblings():
# self.debug(sib.text_content())
# self.debug(text_content(sib))
sib_content_length = text_length(sib)
if sib_content_length:
i += 1
@ -445,7 +452,7 @@ class Document:
if i == x:
break
for sib in el.itersiblings(preceding=True):
# self.debug(sib.text_content())
# self.debug(text_content(sib))
sib_content_length = text_length(sib)
if sib_content_length:
j =+ 1