Changed onCompressionError handler and install info has been fixed.

Author: danila-schelkov

lib.py

@@ -213,6 +213,54 @@ def download_update(zip_url):
         exit()
 
 
+def decompress_csv():
+    global errors
+    folder = './CSV/In-Compressed'
+    folder_export = './CSV/Out-Decompressed'
+
+    for file in os.listdir(folder):
+        if file.endswith('.csv'):
+            try:
+                with open(f'{folder}/{file}', 'rb') as f:
+                    file_data = f.read()
+                    f.close()
+
+                with open(f'{folder_export}/{file}', 'wb') as f:
+                    f.write(decompress(file_data))
+                    f.close()
+            except Exception as exception:
+                errors += 1
+                Console.error(locale.error % (exception.__class__.__module__, exception.__class__.__name__, exception))
+                logger.write(traceback.format_exc())
+
+            print()
+
+
+def compress_csv():
+    from sc_compression.signatures import Signatures
+
+    global errors
+    folder = './CSV/In-Decompressed'
+    folder_export = './CSV/Out-Compressed'
+
+    for file in os.listdir(folder):
+        if file.endswith('.csv'):
+            try:
+                with open(f'{folder}/{file}', 'rb') as f:
+                    file_data = f.read()
+                    f.close()
+
+                with open(f'{folder_export}/{file}', 'wb') as f:
+                    f.write(compress(file_data, Signatures.LZMA))
+                    f.close()
+            except Exception as exception:
+                errors += 1
+                Console.error(locale.error % (exception.__class__.__module__, exception.__class__.__name__, exception))
+                logger.write(traceback.format_exc())
+
+            print()
+
+
 def get_pixel_size(_type):
     if _type in (0, 1):
         return 4
@@ -400,21 +448,24 @@ def write_sc(output_filename: str, buffer: bytes, use_lzham: bool):
 
 
 def open_sc(input_filename: str):
+    decompressed = None
     use_lzham = False
 
     Console.info(locale.collecting_inf)
-    with open(input_filename, 'rb') as fh:
-        try:
-            decompressed, signature = decompress(fh.read())
-            #
-            # Console.info(locale.detected_comp % signature.upper())
-            #
-            if signature == Signatures.SCLZ:
-                use_lzham = True
-        except Exception:
-            Console.info(locale.try_error)
+    with open(input_filename, 'rb') as f:
+        filedata = f.read()
+        f.close()
 
-        fh.close()
+    try:
+        decompressed, signature = decompress(filedata)
+        #
+        # Console.info(locale.detected_comp % signature.upper())
+        #
+        if signature == Signatures.SCLZ:
+            use_lzham = True
+    except Exception:
+        Console.info(locale.decompression_error)
+        exit(1)
 
     return decompressed, use_lzham
 

main.py

@@ -49,7 +49,7 @@ def init(ret=True):
         if package in installed_packages:
             continue
 
-        if run(f'pip3 install {package}'):
+        if run(f'pip3 install {package}') == 0:
             Console.info(locale.installed % package)
         else:
             Console.info(locale.not_installed % package)
@@ -91,54 +91,6 @@ def clear_dirs():
                 make_dirs(folder)
 
 
-def decompress_csv():
-    global errors
-    folder = './CSV/In-Compressed'
-    folder_export = './CSV/Out-Decompressed'
-
-    for file in os.listdir(folder):
-        if file.endswith('.csv'):
-            try:
-                with open(f'{folder}/{file}', 'rb') as f:
-                    file_data = f.read()
-                    f.close()
-
-                with open(f'{folder_export}/{file}', 'wb') as f:
-                    f.write(decompress(file_data))
-                    f.close()
-            except Exception as exception:
-                errors += 1
-                Console.error(locale.error % (exception.__class__.__module__, exception.__class__.__name__, exception))
-                logger.write(traceback.format_exc())
-
-            print()
-
-
-def compress_csv():
-    from sc_compression.signatures import Signatures
-
-    global errors
-    folder = './CSV/In-Decompressed'
-    folder_export = './CSV/Out-Compressed'
-
-    for file in os.listdir(folder):
-        if file.endswith('.csv'):
-            try:
-                with open(f'{folder}/{file}', 'rb') as f:
-                    file_data = f.read()
-                    f.close()
-
-                with open(f'{folder_export}/{file}', 'wb') as f:
-                    f.write(compress(file_data, Signatures.LZMA))
-                    f.close()
-            except Exception as exception:
-                errors += 1
-                Console.error(locale.error % (exception.__class__.__module__, exception.__class__.__name__, exception))
-                logger.write(traceback.format_exc())
-
-            print()
-
-
 def sc_decode():
     global errors
     folder = './SC/In-Compressed'

requirements.txt

@@ -2,4 +2,5 @@ sc-compression
 requests
 colorama
 pylzham
+zstandard
 pillow

system/languages/en-EU.json

@@ -35,9 +35,8 @@
     "got_error": "[%s] Got error: \n%s\n\n",
     "collecting_inf": "Collecting information...",
     "about_sc": "About: Filename: %s, Pixel type: %s, Width: %s, Height: %s",
-    "try_error": "Error while decompressing! Trying to decode as is...",
-    "skip_not_installed": "%s isn\"t installed! Return",
-    "decompression_error": "Decompression failed",
+    "decompression_error": "Error while decompressing! Trying to decode as is...",
+    "skip_not_installed": "%s isn\"t installed! Reinitialize",
     "detected_comp": "Detected %s compression!",
     "unk_type": "Unknown pixel type: %s",
     "crt_pic": "Creating picture...",

system/languages/ru-RU.json

@@ -35,9 +35,8 @@
     "got_error": "[%s] Получена ошибка: \n%s\n\n",
     "collecting_inf": "Сбор информации...",
     "about_sc": "О текстуре: имя: %s, тип пикселя: %s, ширина: %s, высота: %s",
-    "try_error": "Ошибка распаковки! Пробуем как есть...",
+    "decompression_error": "Ошибка распаковки! Проведите повторную инициализацию!",
     "skip_not_installed": "%s не установлен! Пропускаем...",
-    "decompression_error": "Распаковка не удалась",
     "detected_comp": "Обнаружено %s сжатие!",
     "unk_type": "Неизвестный подтип: %s",
     "crt_pic": "Создаём картинку...",

system/localization.py

@@ -40,7 +40,6 @@ def __init__(self):
         self.got_error = None
         self.collecting_inf = None
         self.about_sc = None
-        self.try_error = None
         self.skip_not_installed = None
         self.decompression_error = None
         self.detected_comp = None