Skip to content

Improve encoding detection of the XML TV file #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thombet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve encoding detection of the XML TV file #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2924,11 +2924,16 @@ def xmltv():
data = f.read()
f.close()

match = re.search('<\?xml.*?encoding="(.*?)"',data,flags=(re.I|re.DOTALL))
match = re.search(r'<\?xml.*?encoding=["\'](.*?)["\']',data,flags=(re.I|re.DOTALL))
if match:
encoding = match.group(1)
else:
chardet_encoding = chardet.detect(data)
# Improve performance by limiting the detection of the encoding
# to the first 50k characters if the XML file is bigger
if len(data) > 50000:
chardet_encoding = chardet.detect(data[:50000])
else:
chardet_encoding = chardet.detect(data)
encoding = chardet_encoding['encoding']
data = data.decode(encoding)

Expand Down Expand Up @@ -3013,11 +3018,16 @@ def xmltv():
data = f.read()
f.close()

match = re.search('<\?xml.*?encoding="(.*?)"',data,flags=(re.I|re.DOTALL))
match = re.search(r'<\?xml.*?encoding=["\'](.*?)["\']',data,flags=(re.I|re.DOTALL))
if match:
encoding = match.group(1)
else:
chardet_encoding = chardet.detect(data)
# Improve performance by limiting the detection of the encoding
# to the first 50k characters if the XML file is bigger
if len(data) > 50000:
chardet_encoding = chardet.detect(data[:50000])
else:
chardet_encoding = chardet.detect(data)
encoding = chardet_encoding['encoding']
data = data.decode(encoding)

Expand Down