X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rurllib_py3.py;fp=Robots%2Fbkmk_rurllib_py3.py;h=1da8ec879e96925e40a8ab9cb9fe2e54407ffb7c;hb=dd8d2bd3a0f9bf4e09f58d7289437cf43350f373;hp=2b73347568813505a270d9308e1595172aa98819;hpb=fc3e4ef0d8f12520e40aaceb4fa405e0c6985133;p=bookmarks_db.git

diff --git a/Robots/bkmk_rurllib_py3.py b/Robots/bkmk_rurllib_py3.py
index 2b73347..1da8ec8 100644
--- a/Robots/bkmk_rurllib_py3.py
+++ b/Robots/bkmk_rurllib_py3.py
@@ -106,10 +106,31 @@ class robot_urllib_py3(robot_base):
                     # Remove Accept-Charset
                     del opener.addheaders[-1]
 
-            infile = open(fname, 'rt')
-            content = infile.read()
-            infile.close()
-
+            possible_encodings = []
+            for encoding in (
+                    bookmark.charset,
+                    sys.getfilesystemencoding(),
+                    'utf-8',
+            ):
+                if encoding and encoding not in possible_encodings:
+                    possible_encodings.append(encoding)
+            content = None
+            for encoding in possible_encodings:
+                infile = open(fname, 'rt', encoding=encoding)
+                try:
+                    content = infile.read()
+                except UnicodeDecodeError:
+                    infile.close()
+                    continue
+                else:
+                    break
+                infile.close()
+
+            if content is None:
+                return (
+                    'ERROR: File encoding was not recognized',
+                    None, None, None, None
+                )
             return None, None, None, headers, content
 
         except RedirectException as e: