fixes decoding cp1251 text (found in comments)

klensy · Jul 19, 2018 · 3bd82c5 · klensy · Jul 19, 2018 · 3bd82c5
1 parent f95d328
commit 3bd82c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/blk_unpack.py b/blk_unpack.py
@@ -427,7 +427,15 @@ def get_block_value(self, id_offset: int, block_type: int) -> Tuple[Any, int]:
 
     def print_item(self, item_type: str, item_data, sub_units_names):
         if item_type == 'str':
-            return sub_units_names[item_data].decode("utf-8")
+            s = sub_units_names[item_data]
+            try:
+                return s.decode("utf-8")
+            except UnicodeDecodeError as e:  # russian win encoding
+                return s.decode("cp1251")
+            except Exception as e:
+                import sys
+                from traceback import print_exc
+                print_exc(file=sys.stdout)
         elif item_type == 'float':
             return float('%.4f' % item_data)
         elif item_type == 'bool':

diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
 
 setup(
     name="wt-tools",
-    version="0.2.1.2-dev",
+    version="0.2.1.3-dev",
     author='klensy',
     description="War Thunder resource extraction tools",
     options={"build_exe": {"includes": includes, "excludes": excludes, "include_files": includefiles,