lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2025-11-03 16:17:51 +00:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Force UTF-8 encoding when processing diff text

Browse Source
This commit is contained in:
dgtlmoon
2022-10-17 17:07:13 +02:00
parent 8d5b0b5576
commit d4b241720a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
changedetectionio/__init__.py
View File

@@ -816,9 +816,11 @@ def changedetection_app(config=None, datastore_o=None):
newest_file = history[dates[-1]]
# Read as binary and force decode as UTF-8
# Windows may fail decode in python if we just use 'r' mode (chardet decode exception)
try:
with open(newest_file, 'r') as f:
newest_version_file_contents = f.read()
with open(newest_file, 'rb') as f:
newest_version_file_contents = f.read().decode('utf-8')
except Exception as e:
newest_version_file_contents = "Unable to read {}.\n".format(newest_file)
@@ -830,8 +832,8 @@ def changedetection_app(config=None, datastore_o=None):
previous_file = history[dates[-2]]
try:
with open(previous_file, 'r') as f:
previous_version_file_contents = f.read()
with open(previous_file, 'rb') as f:
previous_version_file_contents = f.read().decode('utf-8')
except Exception as e:
previous_version_file_contents = "Unable to read {}.\n".format(previous_file)