refactor: pixel writing and reading separated into pixel_utils module, all pyright errors fixed

Author: danila-schelkov

system/bytestream.py

@@ -1,17 +1,15 @@
 import io
-from typing import Literal, Optional, Union
+from typing import Literal, Optional
 
 
 class Reader(io.BytesIO):
     def __init__(
         self,
-        buffer: bytes = b"",
-        endian: Union[Literal["little"], Literal["big"]] = "little",
+        initial_buffer: bytes = b"",
+        endian: Literal["little", "big"] = "little",
     ):
-        super().__init__(buffer)
-
-        self.buffer = buffer
-        self.endian = endian
+        super().__init__(initial_buffer)
+        self.endian: Literal["little", "big"] = endian
 
     def read_integer(self, length: int, signed=False) -> int:
         return int.from_bytes(self.read(length), self.endian, signed=signed)
@@ -47,10 +45,10 @@ def read_string(self) -> str:
 class Writer(io.BytesIO):
     def __init__(self, endian: Literal["little", "big"] = "little"):
         super().__init__()
-        self.endian = endian
+        self._endian: Literal["little", "big"] = endian
 
     def write_int(self, integer: int, length: int = 1, signed: bool = False):
-        self.write(integer.to_bytes(length, self.endian, signed=signed))
+        self.write(integer.to_bytes(length, self._endian, signed=signed))
 
     def write_ubyte(self, integer: int):
         self.write_int(integer)

system/languages/en-EU.json

@@ -53,7 +53,7 @@
     "decompression_error": "Error while decompressing! Trying to decode as is...",
     "skip_not_installed": "%s isn't installed! Reinitialize",
     "detected_comp": "%s compression detected",
-    "unk_type": "Unknown pixel type: %s",
+    "unknown_pixel_type": "Unknown pixel type: %s",
     "crt_pic": "Creating picture...",
     "join_pic": "Joining picture...",
     "png_save": "Saving to png...",

system/languages/ru-RU.json

@@ -53,7 +53,7 @@
     "decompression_error": "Ошибка распаковки! Проведите повторную инициализацию!",
     "skip_not_installed": "%s не установлен! Пропускаем...",
     "detected_comp": "Обнаружено сжатие: %s",
-    "unk_type": "Неизвестный подтип: %s",
+    "unknown_pixel_type": "Неизвестный подтип: %s",
     "crt_pic": "Создаём картинку...",
     "join_pic": "Соединяем картинку...",
     "png_save": "Сохраняем в png...",

system/languages/ua-UA.json

@@ -53,7 +53,7 @@
     "decompression_error": "Помилка при розпакуванні! Намагаємся розпакувати як є...",
     "skip_not_installed": "%s не встановлений, повторіть налаштування",
     "detected_comp": "Виявлено компресію: %s",
-    "unk_type": "Невідомий вид пікселів: %s",
+    "unknown_pixel_type": "Невідомий вид пікселів: %s",
     "crt_pic": "Створюємо зоображеня...",
     "join_pic": "З'єднуємо зоображення...",
     "png_save": "Зберігаємо PNG...",

system/lib/__init__.py

@@ -89,82 +89,96 @@ def refill_menu():
             sc_category = Menu.Category(0, locale.sc_label)
             sc_category.add(
                 Menu.Item(
-                    locale.decode_sc, locale.decode_sc_description, decode_textures_only
+                    name=locale.decode_sc,
+                    description=locale.decode_sc_description,
+                    handler=decode_textures_only,
                 )
             )
             sc_category.add(
                 Menu.Item(
-                    locale.encode_sc, locale.encode_sc_description, encode_textures_only
+                    name=locale.encode_sc,
+                    description=locale.encode_sc_description,
+                    handler=encode_textures_only,
                 )
             )
             sc_category.add(
                 Menu.Item(
-                    locale.decode_by_parts,
-                    locale.decode_by_parts_description,
-                    decode_and_render_objects,
+                    name=locale.decode_by_parts,
+                    description=locale.decode_by_parts_description,
+                    handler=decode_and_render_objects,
                 )
             )
             sc_category.add(
                 Menu.Item(
-                    locale.encode_by_parts,
-                    locale.encode_by_parts_description,
-                    collect_objects_and_encode,
+                    name=locale.encode_by_parts,
+                    description=locale.encode_by_parts_description,
+                    handler=collect_objects_and_encode,
                 )
             )
             sc_category.add(
                 Menu.Item(
-                    locale.overwrite_by_parts,
-                    locale.overwrite_by_parts_description,
-                    lambda: collect_objects_and_encode(True),
+                    name=locale.overwrite_by_parts,
+                    description=locale.overwrite_by_parts_description,
+                    handler=lambda: collect_objects_and_encode(True),
                 )
             )
             menu.add_category(sc_category)
 
         csv_category = Menu.Category(1, locale.csv_label)
         csv_category.add(
             Menu.Item(
-                locale.decompress_csv, locale.decompress_csv_description, decompress_csv
+                name=locale.decompress_csv,
+                description=locale.decompress_csv_description,
+                handler=decompress_csv,
             )
         )
         csv_category.add(
             Menu.Item(
-                locale.compress_csv, locale.compress_csv_description, compress_csv
+                name=locale.compress_csv,
+                description=locale.compress_csv_description,
+                handler=compress_csv,
             )
         )
         menu.add_category(csv_category)
 
     other = Menu.Category(10, locale.other_features_label)
     other.add(
-        Menu.Item(locale.check_update, locale.version % config.version, check_update)
+        Menu.Item(
+            name=locale.check_update,
+            description=locale.version % config.version,
+            handler=check_update,
+        )
     )
-    other.add(Menu.Item(locale.check_for_outdated, None, check_for_outdated))
+    other.add(Menu.Item(name=locale.check_for_outdated, handler=check_for_outdated))
     other.add(
         Menu.Item(
-            locale.reinit,
-            locale.reinit_description,
-            lambda: (initialize(), refill_menu()),
+            name=locale.reinit,
+            description=locale.reinit_description,
+            handler=lambda: (initialize(), refill_menu()),
         )
     )
     other.add(
         Menu.Item(
-            locale.change_language,
-            locale.change_lang_description % config.language,
-            lambda: (config.change_language(locale.change()), refill_menu()),
+            name=locale.change_language,
+            description=locale.change_lang_description % config.language,
+            handler=lambda: (config.change_language(locale.change()), refill_menu()),
         )
     )
     other.add(
         Menu.Item(
-            locale.clear_directories,
-            locale.clean_dirs_description,
-            lambda: clear_directories() if Console.question(locale.clear_qu) else -1,
+            name=locale.clear_directories,
+            description=locale.clean_dirs_description,
+            handler=lambda: clear_directories()
+            if Console.question(locale.clear_qu)
+            else -1,
         )
     )
     other.add(
         Menu.Item(
-            locale.toggle_update_auto_checking,
-            locale.enabled if config.auto_update else locale.disabled,
-            lambda: (config.toggle_auto_update(), refill_menu()),
+            name=locale.toggle_update_auto_checking,
+            description=locale.enabled if config.auto_update else locale.disabled,
+            handler=lambda: (config.toggle_auto_update(), refill_menu()),
         )
     )
-    other.add(Menu.Item(locale.exit, None, lambda: (clear(), exit())))
+    other.add(Menu.Item(name=locale.exit, handler=lambda: (clear(), exit())))
     menu.add_category(other)

system/lib/features/sc/__init__.py

@@ -8,7 +8,7 @@
 from system.bytestream import Writer
 from system.lib.console import Console
 from system.lib.features.files import write_sc
-from system.lib.images import get_pixel_size, save_texture, split_image
+from system.lib.images import get_byte_count_by_pixel_type, save_texture, split_image
 from system.lib.xcod import FileInfo
 from system.localization import locale
 
@@ -38,7 +38,7 @@ def compile_sc(
                 sheet = sheet.resize(sheet_info.size, Image.ANTIALIAS)
 
         width, height = sheet.size
-        pixel_size = get_pixel_size(pixel_type)
+        pixel_size = get_byte_count_by_pixel_type(pixel_type)
 
         file_size = width * height * pixel_size + 5
 

system/lib/features/sc/decode.py

@@ -93,7 +93,7 @@ def decode_and_render_objects():
         print()
 
 
-def get_file_basename(swf):
+def get_file_basename(swf: SupercellSWF):
     return os.path.basename(swf.filename).rsplit(".", 1)[0]
 
 

system/lib/helper.py

@@ -1,7 +1,9 @@
-from typing import List, Tuple, Union
+from typing import List, Tuple, TypeAlias
 
 from system.lib.objects.point import Point
 
+PointType: TypeAlias = Tuple[float, float] | Tuple[int, int] | Point
+
 
 def get_size(left: float, top: float, right: float, bottom: float) -> Tuple[int, int]:
     """Returns width and height of given rect.
@@ -16,7 +18,7 @@ def get_size(left: float, top: float, right: float, bottom: float) -> Tuple[int,
 
 
 def get_sides(
-    points: Union[List[Tuple[float, float]], List[Tuple[int, int]], List[Point]]
+    points: List[Tuple[float, float]] | List[Tuple[int, int]] | List[Point]
 ) -> Tuple[float, float, float, float]:
     """Calculates and returns rect sides.
 
@@ -25,17 +27,17 @@ def get_sides(
     """
 
     if len(points) > 0:
-        point = points[0]
+        point: PointType = points[0]
         if isinstance(point, Point):
-            left = min(point.x for point in points)
-            top = min(point.y for point in points)
-            right = max(point.x for point in points)
-            bottom = max(point.y for point in points)
+            left = min(point.x for point in points)  # type: ignore
+            top = min(point.y for point in points)  # type: ignore
+            right = max(point.x for point in points)  # type: ignore
+            bottom = max(point.y for point in points)  # type: ignore
         elif isinstance(point, tuple):
-            left = min(x for x, _ in points)
-            top = min(y for _, y in points)
-            right = max(x for x, _ in points)
-            bottom = max(y for _, y in points)
+            left = min(x for x, _ in points)  # type: ignore
+            top = min(y for _, y in points)  # type: ignore
+            right = max(x for x, _ in points)  # type: ignore
+            bottom = max(y for _, y in points)  # type: ignore
         else:
             raise TypeError("Unknown point type.")