Merge pull request #24 from xcoder-tool/linting-fixes

fix: config importing, linting errors

Author: danila-schelkov

.github/workflows/lint.yml

@@ -8,10 +8,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install requirements
         run: |

system/lib/features/files.py

@@ -8,16 +8,16 @@
 
 
 def write_sc(
-    output_filename: str | os.PathLike,
+    output_filename: os.PathLike | str,
     buffer: bytes,
     signature: Signatures,
     version: int | None = None,
 ):
     with open(output_filename, "wb") as file_out:
-        file_out.write(compress(buffer, signature, version))
+        file_out.write(compress(buffer, signature, version))  # type: ignore
 
 
-def open_sc(input_filename: str) -> tuple[bytes, Signatures]:
+def open_sc(input_filename: os.PathLike | str) -> tuple[bytes, Signatures]:
     with open(input_filename, "rb") as f:
         file_data = f.read()
 

system/lib/features/initialization.py

@@ -3,7 +3,7 @@
 from loguru import logger
 
 from system import clear, run
-from system.lib import config
+from system.lib.config import config
 from system.lib.features.directories import create_directories
 from system.lib.features.update.check import get_pip_info, get_tags
 from system.localization import locale

system/lib/features/sc/decode.py

@@ -39,7 +39,7 @@ def decode_textures_only():
             )
 
             _save_meta_file(
-                swf, objects_output_folder, base_name.rstrip("_"), signature
+                swf, objects_output_folder, base_name.rsplit("_", 1)[0], signature
             )
             _save_textures(swf, objects_output_folder, base_name)
         except Exception as exception:
@@ -96,6 +96,7 @@ def decode_and_render_objects():
 
 
 def get_file_basename(swf: SupercellSWF):
+    assert swf.filename is not None
     return os.path.basename(swf.filename).rsplit(".", 1)[0]
 
 
@@ -109,9 +110,9 @@ def _create_objects_output_folder(output_folder: Path, base_name: str) -> Path:
 
 def _save_textures(swf: SupercellSWF, textures_output: Path, base_name: str) -> None:
     os.makedirs(textures_output, exist_ok=True)
-    for img_index in range(len(swf.textures)):
-        filename = base_name + "_" * img_index
-        swf.textures[img_index].image.save(textures_output / f"{filename}.png")
+    for texture_index, texture in enumerate(swf.textures):
+        assert texture.image is not None
+        texture.image.save(textures_output / f"{base_name}_{texture_index}.png")
 
 
 def _save_meta_file(

system/lib/features/update/check.py

@@ -4,7 +4,7 @@
 from loguru import logger
 
 from system import run
-from system.lib import config
+from system.lib.config import config
 from system.lib.features.update.download import download_update
 from system.localization import locale
 

system/lib/features/update/download.py

@@ -4,7 +4,7 @@
 from loguru import logger
 
 from system import run
-from system.lib import config
+from system.lib.config import config
 from system.localization import locale
 
 

system/lib/images.py

@@ -86,7 +86,7 @@ def add_pixel(pixel: tuple) -> None:
                     if pixel_x >= width:
                         break
 
-                    add_pixel(loaded_clone[pixel_x, pixel_y])
+                    add_pixel(loaded_clone[pixel_x, pixel_y])  # type: ignore
                     pixel_index += 1
 
         Console.progress_bar(locale.split_pic, y_chunk, y_chunks_count + 1)
@@ -149,7 +149,7 @@ def save_texture(writer: Writer, image: Image.Image, pixel_type: int) -> None:
     point = -1
     for y in range(height):
         for x in range(width):
-            writer.write(write_pixel(pixels[y * width + x]))
+            writer.write(write_pixel(pixels[y * width + x]))  # type: ignore
 
         curr = Console.percent(y, height)
         if curr > point:

system/lib/math/polygon.py

@@ -14,7 +14,7 @@ class PointOrder(IntEnum):
     COUNTER_CLOCKWISE = 1
 
 
-def get_polygon_sum_of_edges(polygon: Polygon) -> int:
+def get_polygon_sum_of_edges(polygon: Polygon) -> float:
     """
      Mostly like signed area, but two times bigger and more accurate with signs.
 

system/lib/objects/movie_clip/movie_clip.py

@@ -27,6 +27,8 @@ def __init__(self):
         self.matrix_bank_index: int = 0
 
     def load(self, swf: SupercellSWF, tag: int):
+        assert swf.reader is not None
+
         self.id = swf.reader.read_ushort()
 
         self.fps = swf.reader.read_char()

system/lib/objects/renderable/renderable_movie_clip.py

@@ -84,6 +84,8 @@ def calculate_bounds(self, matrix: Matrix2x3) -> Rect:
         return rect
 
     def set_frame(self, frame_index: int):
+        assert self._matrix_bank is not None
+
         self._frame_children = []
 
         frame = self._frames[frame_index]