Fixed config dumping

Author: danila-schelkov

README.md

@@ -16,19 +16,19 @@ Many thanks to <a href="https://github.com/spiky-s">spiky_Spike</a> for the prov
 On Windows:
 - Download Python 3.7 or newer version from <a href="https://www.python.org/downloads/">official page</a>.
 - Install Python. While Installing, enable such parameters as "Add Python to PATH", "Install pip", "Install py launcher", "Associate files with Python" and "Add Python to environment variables".
-- Download XCoder from <a href="https://github.com/MasterDevX/XCoder/releases">releases page</a> and extract it.
+- Download XCoder from <a href="https://github.com/Vorono4ka/XCoder/releases">releases page</a> and extract it.
 - Execute "main.py" file</br>
 
 On Linux:
 - Open Terminal and install Python by executing following command:</br>
 ```sudo apt-get update && sudo apt-get install python3 python3-pip```
-- Download XCoder from <a href="https://github.com/MasterDevX/XCoder/releases">releases page</a> and extract it.
+- Download XCoder from <a href="https://github.com/Vorono4ka/XCoder/releases">releases page</a> and extract it.
 - Execute "main.py" file
 
 On Android:
 - Download and install PyDroid app from <a href="https://play.google.com/store/apps/details?id=ru.iiec.pydroid3">Google Play</a>.
 - Open PyDroid and wait until Python installs.
-- Download XCoder from <a href="https://github.com/MasterDevX/XCoder/releases">releases page</a> and extract it.
+- Download XCoder from <a href="https://github.com/Vorono4ka/XCoder/releases">releases page</a> and extract it.
 - In PyDroid open and execute "main.py" file</br>
 
 ### TODO:

lib.py

@@ -89,14 +89,14 @@ def make_dirs(directory):
         os.makedirs(directory)
 
 
-def print_feature_with_description(name: str, description: str = None, console_width: int = -1):
+def print_feature(name: str, description: str = None, console_width: int = -1):
     print(name, end='')
     if description:
         print(' ' * (console_width // 2 - len(name)) + ': ' + description, end='')
     print()
 
 
-def colored_print(text, color=None):
+def print_category(text, color=None):
     if color is None:
         color = colorama.Back.GREEN
     return print(color + colorama.Fore.BLACK + text + ' ' * (10 - len(text)) + colorama.Style.RESET_ALL)
@@ -106,41 +106,39 @@ def welcome_text():
     locale.load_from(config.lang)
 
     console_width = shutil.get_terminal_size().columns
-    print(
-        (
-            colorama.Back.BLACK + colorama.Fore.GREEN +
-            locale.xcoder_header % config.version +
-            colorama.Style.RESET_ALL
-        ).center(console_width + 14)
-    )
+    print((
+        colorama.Back.BLACK + colorama.Fore.GREEN +
+        locale.xcoder_header % config.version +
+        colorama.Style.RESET_ALL
+    ).center(console_width + 14))
     print('github.com/Vorono4ka/XCoder'.center(console_width))
     print(console_width * '-')
 
-    colored_print(locale.sc_label)
-    print_feature_with_description(' 1   ' + locale.decode_sc, locale.decode_sc_description, console_width)
-    print_feature_with_description(' 2   ' + locale.encode_sc, locale.encode_sc_description, console_width)
-    print_feature_with_description(' 3   ' + locale.decode_by_parts, locale.decode_by_parts_description, console_width)
-    print_feature_with_description(' 4   ' + locale.encode_by_parts, locale.encode_by_parts_description, console_width)
-    print_feature_with_description(' 5   ' + locale.overwrite_by_parts, locale.overwrite_by_parts_description, console_width)
+    print_category(locale.sc_label)
+    print_feature(' 1   ' + locale.decode_sc, locale.decode_sc_description, console_width)
+    print_feature(' 2   ' + locale.encode_sc, locale.encode_sc_description, console_width)
+    print_feature(' 3   ' + locale.decode_by_parts, locale.decode_by_parts_description, console_width)
+    print_feature(' 4   ' + locale.encode_by_parts, locale.encode_by_parts_description, console_width)
+    print_feature(' 5   ' + locale.overwrite_by_parts, locale.overwrite_by_parts_description, console_width)
     print(console_width * '-')
 
-    colored_print(locale.csv_label)
-    print_feature_with_description(' 11   ' + locale.decompress_csv, locale.decompress_csv_description, console_width)
-    print_feature_with_description(' 12   ' + locale.compress_csv, locale.compress_csv_description, console_width)
+    print_category(locale.csv_label)
+    print_feature(' 11   ' + locale.decompress_csv, locale.decompress_csv_description, console_width)
+    print_feature(' 12   ' + locale.compress_csv, locale.compress_csv_description, console_width)
     print(console_width * '-')
 
-    colored_print(locale.other_features_label)
-    print_feature_with_description(' 101 ' + locale.check_update, locale.version % config.version, console_width)
-    print_feature_with_description(' 102 ' + locale.check_for_outdated)
-    print_feature_with_description(' 103 ' + locale.reinit, locale.reinit_description, console_width)
-    print_feature_with_description(' 104 ' + locale.change_lang, locale.change_lang_description % config.lang, console_width)
-    print_feature_with_description(' 105 ' + locale.clear_dirs, locale.clean_dirs_description, console_width)
-    print_feature_with_description(
+    print_category(locale.other_features_label)
+    print_feature(' 101 ' + locale.check_update, locale.version % config.version, console_width)
+    print_feature(' 102 ' + locale.check_for_outdated)
+    print_feature(' 103 ' + locale.reinit, locale.reinit_description, console_width)
+    print_feature(' 104 ' + locale.change_lang, locale.change_lang_description % config.lang, console_width)
+    print_feature(' 105 ' + locale.clear_dirs, locale.clean_dirs_description, console_width)
+    print_feature(
         ' 106 ' + locale.toggle_update_auto_checking,
         locale.enabled if config.auto_update else locale.disabled,
         console_width
     )
-    print_feature_with_description(' 107 ' + locale.exit)
+    print_feature(' 107 ' + locale.exit)
     print(console_width * '-')
 
     choice = input(locale.choice)
@@ -354,12 +352,14 @@ def sc1_decode():
                 base_name = os.path.basename(file).rsplit('.', 1)[0]
 
                 with open(f'{folder_export}/{current_sub_path}/{base_name}.xcod', 'wb') as xcod_file:
-                    xcod_file.write(b'XCOD' + bool.to_bytes(use_lzham, 1, 'big') + int.to_bytes(len(swf.textures), 1, 'big'))
+                    xcod_file.write(b'XCOD' + bool.to_bytes(use_lzham, 1, 'big') +
+                                    int.to_bytes(len(swf.textures), 1, 'big'))
 
                     for img_index in range(len(swf.textures)):
                         filename = base_name + '_' * img_index
-                        swf.textures[img_index].image.save(f'{folder_export}/{current_sub_path}/textures/{filename}.png')
-
+                        swf.textures[img_index].image.save(
+                            f'{folder_export}/{current_sub_path}/textures/{filename}.png'
+                        )
 
                     Console.info(locale.dec_sc)
 
@@ -436,7 +436,7 @@ def open_sc(input_filename: str):
         #
         if signature == Signatures.SCLZ:
             use_lzham = True
-    except Exception:
+    except TypeError:
         Console.info(locale.decompression_error)
         exit(1)
 
@@ -471,7 +471,7 @@ def compile_sc(_dir, from_memory=None, img_data=None, folder_export=None):
             use_lzham, = struct.unpack('?', sc_data.read(1))
             sc_data.read(1)
             has_xcod = True
-        except Exception:
+        except OSError:
             Console.info(locale.not_xcod)
             Console.info(locale.default_types)
 
@@ -609,7 +609,13 @@ def load_tags(self):
                 texture.load(self, tag, has_texture)
 
                 if has_texture:
-                    Console.info(locale.about_sc % (self.filename, texture_id, texture.pixel_type, texture.width, texture.height))
+                    Console.info(locale.about_sc % (
+                        self.filename,
+                        texture_id,
+                        texture.pixel_type,
+                        texture.width,
+                        texture.height
+                    ))
                     print()
 
                     self.xcod_writer.write_ubyte(tag)
@@ -690,7 +696,10 @@ def place_sprites(xcod, folder, overwrite=False):
     sheet_image = []
     sheet_image_data = {'use_lzham': use_lzham, 'data': []}
     for i in range(pictures_count):
-        file_type, sub_type, width, height = xcod.read_ubyte(), xcod.read_ubyte(), xcod.read_uint16(), xcod.read_uint16()
+        file_type, sub_type, width, height = xcod.read_ubyte(), \
+                                             xcod.read_ubyte(), \
+                                             xcod.read_uint16(), \
+                                             xcod.read_uint16()
         sheet_image.append(
             Image.open(f'{folder}/textures/{tex[i]}')
             if overwrite else

main.py

@@ -25,8 +25,8 @@ def select_lang():
     config.dump()
 
 
-def init(ret=True):
-    if ret:
+def init(first_init=False):
+    if first_init:
         clear()
 
     Console.info(locale.detected_os % platform.system())
@@ -51,7 +51,7 @@ def init(ret=True):
     config.version = get_tags('vorono4ka', 'xcoder')[0]['name'][1:]
     config.dump()
 
-    if ret:
+    if first_init:
         input(locale.to_continue)
 
 
@@ -82,11 +82,7 @@ def clear_dirs():
     locale.load_from(config.lang)
 
     if not config.inited:
-        init()
-        try:
-            run('python%s "%s"' % ('' if is_windows else '3', __file__))
-        except Exception as e:
-            logger.write(e)
+        init(True)
         exit()
 
     if is_windows:
@@ -125,11 +121,13 @@ def clear_dirs():
                 '3': sc1_decode,
                 '4': sc1_encode,
                 '5': lambda: sc1_encode(True),
+
                 '11': decompress_csv,
                 '12': compress_csv,
+
                 '101': check_update,
                 '102': check_for_outdated,
-                '103': lambda: init(ret=False),
+                '103': init,
                 '104': lambda: (select_lang(), locale.load_from(config.lang)),
                 '105': lambda: clear_dirs() if Console.question(locale.clear_qu) else -1,
                 '106': toggle_auto_update,

system/languages/ru-RU.json

@@ -38,7 +38,7 @@
     "reinit": "Повторная инициализация",
     "change_lang": "Выбрать другой язык",
     "clear_dirs": "Очистить рабочие папки",
-    "toggle_update_auto_checking": "Включить/Выключить проверку обновлений",
+    "toggle_update_auto_checking": "Переключить проверку обновлений",
     "exit": "Выход",
     "version": "Версия: %s",
     "reinit_description": "Если что-то пошло не так",

system/lib/config.py

@@ -7,9 +7,16 @@ class Config:
     inited: bool
 
     def __init__(self):
-        self.config_items = []
-
-        self.inited: bool = False
+        self.config_items = (
+            'initialized',
+            'version',
+            'lang',
+            'has_update',
+            'last_update',
+            'auto_update',
+        )
+
+        self.initialized: bool = False
         self.version = None
         self.lang: str = 'en-EU'
         self.has_update: bool = False
@@ -22,7 +29,6 @@ def load(self):
         if os.path.isfile(self.config_path):
             for key, value in json.load(open(self.config_path)).items():
                 setattr(self, key, value)
-                self.config_items.append(key)
 
     def dump(self):
         json.dump({