mirror of
https://github.com/Dispatcharr/Dispatcharr.git
synced 2026-07-18 00:55:50 +00:00
lxml 6.0.2 with recover=True silently drops HTML named entities (e.g. é, î) that are not valid XML, causing channel names and program data to lose characters during EPG ingestion. - Add preprocessing step in fetch_xmltv() that converts HTML named entities to Unicode while preserving XML-predefined entities - Detect encoding from XML declaration, fall back to UTF-8 for unknown codecs, skip files that fail to decode cleanly - Guard against entities resolving to XML-special characters and html.unescape partial matching edge cases - Add 28 unit tests covering entity resolution, encoding detection, and file-level processing
195 lines
8 KiB
Python
195 lines
8 KiB
Python
import os
|
|
import tempfile
|
|
|
|
from django.test import TestCase
|
|
|
|
from apps.epg.tasks import (
|
|
_NAMED_ENTITY_RE,
|
|
_detect_xml_encoding,
|
|
_replace_html_entity,
|
|
_resolve_html_entities,
|
|
)
|
|
|
|
|
|
class ReplaceHtmlEntityTests(TestCase):
|
|
"""Tests for the regex callback that resolves individual HTML entities."""
|
|
|
|
def _sub(self, text):
|
|
return _NAMED_ENTITY_RE.sub(_replace_html_entity, text)
|
|
|
|
def test_french_accented(self):
|
|
self.assertEqual(self._sub("Chaîne Télé"), "Chaîne Télé")
|
|
|
|
def test_german_umlauts(self):
|
|
self.assertEqual(self._sub("München Übersicht ß"), "München Übersicht ß")
|
|
|
|
def test_spanish(self):
|
|
self.assertEqual(self._sub("España ¿Qué?"), "España ¿Qué?")
|
|
|
|
def test_portuguese(self):
|
|
self.assertEqual(self._sub("Comunicação"), "Comunicação")
|
|
|
|
def test_scandinavian(self):
|
|
self.assertEqual(self._sub("Norsk ø å æ"), "Norsk ø å æ")
|
|
|
|
def test_greek_letters(self):
|
|
self.assertEqual(self._sub("αβγ"), "αβγ")
|
|
|
|
def test_currency_and_symbols(self):
|
|
self.assertEqual(self._sub("© € £ ¥"), "© € £ ¥")
|
|
|
|
def test_preserves_xml_amp(self):
|
|
self.assertEqual(self._sub("A & B"), "A & B")
|
|
|
|
def test_preserves_xml_lt_gt(self):
|
|
self.assertEqual(self._sub("<tag>"), "<tag>")
|
|
|
|
def test_preserves_xml_quot_apos(self):
|
|
self.assertEqual(self._sub(""hello'"), ""hello'")
|
|
|
|
def test_preserves_uppercase_xml_entities(self):
|
|
"""&, <, >, " resolve to XML-special chars; must not be replaced."""
|
|
self.assertEqual(self._sub("&"), "&")
|
|
self.assertEqual(self._sub("<"), "<")
|
|
self.assertEqual(self._sub(">"), ">")
|
|
self.assertEqual(self._sub("""), """)
|
|
|
|
def test_partial_entity_match_preserved(self):
|
|
"""html.unescape can partially match & inside &ersand; — must not corrupt."""
|
|
self.assertEqual(self._sub("&ersand;"), "&ersand;")
|
|
|
|
def test_mixed_html_and_xml_entities(self):
|
|
self.assertEqual(
|
|
self._sub("Résumé & Co <test>"),
|
|
"Résumé & Co <test>",
|
|
)
|
|
|
|
def test_plain_ascii_unchanged(self):
|
|
self.assertEqual(self._sub("Plain ASCII text"), "Plain ASCII text")
|
|
|
|
def test_direct_utf8_unchanged(self):
|
|
self.assertEqual(self._sub("日本語テレビ"), "日本語テレビ")
|
|
|
|
def test_unknown_entity_preserved(self):
|
|
self.assertEqual(self._sub("&zzfakeentity;"), "&zzfakeentity;")
|
|
|
|
|
|
class ResolveHtmlEntitiesFileTests(TestCase):
|
|
"""Tests for the file-level preprocessing function."""
|
|
|
|
def _make_file(self, content):
|
|
fd, path = tempfile.mkstemp(suffix=".xml")
|
|
with os.fdopen(fd, "w", encoding="utf-8") as f:
|
|
f.write(content)
|
|
self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
|
|
return path
|
|
|
|
def test_resolves_entities_in_file(self):
|
|
path = self._make_file(
|
|
'<?xml version="1.0"?>\n<tv><channel><display-name>Télé</display-name></channel></tv>'
|
|
)
|
|
_resolve_html_entities(path)
|
|
with open(path, "r", encoding="utf-8") as f:
|
|
content = f.read()
|
|
self.assertIn("Télé", content)
|
|
self.assertNotIn("é", content)
|
|
|
|
def test_preserves_xml_entities_in_file(self):
|
|
path = self._make_file("<tv><desc>A & B <C></desc></tv>")
|
|
_resolve_html_entities(path)
|
|
with open(path, "r", encoding="utf-8") as f:
|
|
content = f.read()
|
|
self.assertIn("&", content)
|
|
self.assertIn("<", content)
|
|
self.assertIn(">", content)
|
|
|
|
def test_no_temp_file_left_on_success(self):
|
|
path = self._make_file("<tv>test</tv>")
|
|
_resolve_html_entities(path)
|
|
self.assertFalse(os.path.exists(path + ".entity_tmp"))
|
|
|
|
def test_plain_file_unchanged(self):
|
|
original = '<?xml version="1.0"?>\n<tv><channel><display-name>Plain</display-name></channel></tv>'
|
|
path = self._make_file(original)
|
|
_resolve_html_entities(path)
|
|
with open(path, "r", encoding="utf-8") as f:
|
|
content = f.read()
|
|
self.assertEqual(content, original)
|
|
|
|
def test_utf8_content_preserved(self):
|
|
original = "<tv><channel><display-name>日本語テレビ</display-name></channel></tv>"
|
|
path = self._make_file(original)
|
|
_resolve_html_entities(path)
|
|
with open(path, "r", encoding="utf-8") as f:
|
|
content = f.read()
|
|
self.assertIn("日本語テレビ", content)
|
|
|
|
def test_iso_8859_1_encoding(self):
|
|
"""Files declaring ISO-8859-1 should be read in that encoding."""
|
|
xml = '<?xml version="1.0" encoding="ISO-8859-1"?>\n<tv><channel><display-name>Chaîne</display-name></channel></tv>'
|
|
fd, path = tempfile.mkstemp(suffix=".xml")
|
|
with os.fdopen(fd, "wb") as f:
|
|
f.write(xml.encode("iso-8859-1"))
|
|
self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
|
|
|
|
_resolve_html_entities(path)
|
|
with open(path, "r", encoding="iso-8859-1") as f:
|
|
content = f.read()
|
|
self.assertIn("Cha\u00eene", content)
|
|
self.assertNotIn("î", content)
|
|
|
|
def test_detect_encoding_utf8_default(self):
|
|
"""Headers without an encoding declaration default to UTF-8."""
|
|
self.assertEqual(_detect_xml_encoding(b'<?xml version="1.0"?>'), "utf-8")
|
|
|
|
def test_detect_encoding_iso_8859_1(self):
|
|
"""Encoding is read from the XML declaration."""
|
|
self.assertEqual(
|
|
_detect_xml_encoding(b'<?xml version="1.0" encoding="ISO-8859-1"?>'),
|
|
"ISO-8859-1",
|
|
)
|
|
|
|
def test_detect_encoding_single_quotes(self):
|
|
"""Encoding detection works with single-quoted attributes."""
|
|
self.assertEqual(
|
|
_detect_xml_encoding(b"<?xml version='1.0' encoding='windows-1252'?>"),
|
|
"windows-1252",
|
|
)
|
|
|
|
def test_detect_encoding_unknown_falls_back(self):
|
|
"""Unrecognized encoding falls back to UTF-8."""
|
|
self.assertEqual(
|
|
_detect_xml_encoding(b'<?xml version="1.0" encoding="x-fake-codec"?>'),
|
|
"utf-8",
|
|
)
|
|
|
|
def test_iso_8859_1_with_entities_roundtrip(self):
|
|
"""ISO-8859-1 file with entities: resolved without corrupting existing accented chars."""
|
|
# Mix of direct ISO-8859-1 chars and HTML entities
|
|
xml_str = '<?xml version="1.0" encoding="ISO-8859-1"?>\n<tv><channel><display-name>D\xe9j\xe0 émission</display-name></channel></tv>'
|
|
fd, path = tempfile.mkstemp(suffix=".xml")
|
|
with os.fdopen(fd, "wb") as f:
|
|
f.write(xml_str.encode("iso-8859-1"))
|
|
self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
|
|
|
|
_resolve_html_entities(path)
|
|
with open(path, "r", encoding="iso-8859-1") as f:
|
|
content = f.read()
|
|
self.assertIn("D\xe9j\xe0", content, "Existing accented chars should be preserved")
|
|
self.assertIn("\xe9mission", content, "Entity should be resolved")
|
|
self.assertNotIn("é", content)
|
|
|
|
def test_mismatched_encoding_leaves_file_untouched(self):
|
|
"""File declaring UTF-8 but containing Latin-1 bytes is left alone."""
|
|
# \xe9 is valid ISO-8859-1 but invalid as a standalone UTF-8 byte
|
|
raw = b'<?xml version="1.0" encoding="UTF-8"?>\n<tv><channel><display-name>\xe9</display-name></channel></tv>'
|
|
fd, path = tempfile.mkstemp(suffix=".xml")
|
|
with os.fdopen(fd, "wb") as f:
|
|
f.write(raw)
|
|
self.addCleanup(lambda: os.unlink(path) if os.path.exists(path) else None)
|
|
|
|
original_bytes = raw # save for comparison
|
|
_resolve_html_entities(path)
|
|
with open(path, "rb") as f:
|
|
result_bytes = f.read()
|
|
self.assertEqual(result_bytes, original_bytes, "File should be untouched on decode error")
|