little addition of type hinting, some new names

Author: danila-schelkov

system/lib/console.py

@@ -1,31 +1,36 @@
-import sys
-
-
 class Console:
     @staticmethod
-    def progress_bar(message, current, total, start=0, end=100):
-        sys.stdout.write(f"\r[{((current + 1) * end + start) // total + start}%] {message}")
+    def progress_bar(message, current, total):
+        percentage = (current + 1) * 100 // total
+        print('\r', end='')
+        print(f'[{percentage}%] {message}', end='')
+        if current + 1 == total:
+            print()
 
     @staticmethod
-    def percent(current, total):
+    def percent(current: int, total: int) -> int:
         return (current + 1) * 100 // total
 
     @staticmethod
-    def ask_integer(message):
-        try:
-            return int(input(f'[????] {message}: '))
-        except ValueError:
-            return Console.ask_integer(message)
+    def ask_integer(message: str):
+        while True:
+            try:
+                return int(input(f'[????] {message}: '))
+            except ValueError:
+                pass
 
     @staticmethod
     def question(message):
-        answer = input(f'[????] {message} [Y/n] ').lower()
-        if answer in 'ny':
-            return 'ny'.index(answer)
-        else:
-            return Console.question(message)
+        answer = None
+        while not answer in 'ny':
+            answer = input(f'[????] {message} [Y/n] ').lower()
+        
+        return 'ny'.index(answer)
 
 
 if __name__ == '__main__':
     console = Console()
-    console.ask_integer('Please, type any integer: ')
+    console.ask_integer('Please, type any integer')
+
+    for i in range(1000):
+        console.progress_bar('Test progress bar', i, 1000)

system/lib/features/cut_sprites.py

@@ -5,9 +5,9 @@
 from system.localization import locale
 
 
-def cut_sprites(swf: SupercellSWF, folder_export):
-    os.makedirs(f'{folder_export}/overwrite', exist_ok=True)
-    os.makedirs(f'{folder_export}/shapes', exist_ok=True)
+def cut_sprites(swf: SupercellSWF, export_folder: str):
+    os.makedirs(f'{export_folder}/overwrite', exist_ok=True)
+    os.makedirs(f'{export_folder}/shapes', exist_ok=True)
 
     shapes_count = len(swf.shapes)
     swf.xcod_writer.write_uint16(shapes_count)
@@ -22,7 +22,7 @@ def cut_sprites(swf: SupercellSWF, folder_export):
         shape = swf.shapes[shape_index]
 
         rendered_shape = shape.render(swf)
-        rendered_shape.save(f'{folder_export}/shapes/{shape.id}.png')
+        rendered_shape.save(f'{export_folder}/shapes/{shape.id}.png')
 
         regions_count = len(shape.regions)
         swf.xcod_writer.write_uint16(shape.id)
@@ -40,5 +40,4 @@ def cut_sprites(swf: SupercellSWF, folder_export):
             swf.xcod_writer.write_ubyte(region.rotation // 90)
 
             rendered_region = region.render(swf)
-            rendered_region.save(f'{folder_export}/shape_{shape.id}_{region_index}.png')
-    print()
+            rendered_region.save(f'{export_folder}/shape_{shape.id}_{region_index}.png')

system/lib/features/place_sprites.py

@@ -3,7 +3,7 @@
 from PIL import Image, ImageDraw
 
 from system.lib import Console
-from system.lib.images import pixel_type2str
+from system.lib.images import get_format_by_pixel_type
 from system.lib.xcod import parse_info, FileInfo
 from system.localization import locale
 
@@ -21,7 +21,7 @@ def place_sprites(xcod_path: str, folder: str, overwrite: bool = False) -> (list
         sheets.append(
             Image.open(f'{folder}/textures/{texture_files[i]}')
             if overwrite else
-            Image.new(pixel_type2str(sheet_info.pixel_type), sheet_info.size)
+            Image.new(get_format_by_pixel_type(sheet_info.pixel_type), sheet_info.size)
         )
 
     shapes_count = xcod.read_uint16()

system/lib/features/sc/__init__.py

@@ -56,10 +56,8 @@ def compile_sc(_dir, file_info: FileInfo, sheets: list = None, output_folder: st
 
         if file_type in (27, 28):
             split_image(img)
-            print()
 
         save_texture(sc, img, pixel_type)
-        print()
 
     sc.write(bytes(5))
     print()

system/lib/images.py

@@ -7,8 +7,10 @@
 from system.lib.console import Console
 from system.localization import locale
 
+CHUNK_SIZE = 32
 
-def load_image_from_buffer(img):
+
+def load_image_from_buffer(img: Image) -> None:
     width, height = img.size
     img_loaded = img.load()
 
@@ -20,26 +22,25 @@ def load_image_from_buffer(img):
                 img_loaded[x, y] = tuple(pixel_buffer.read(channels_count))
 
 
-def join_image(img):
+def join_image(img: Image) -> None:
     with open('pixel_buffer', 'rb') as pixel_buffer:
         channels_count = int.from_bytes(pixel_buffer.read(1), 'little')
 
         width, height = img.size
         loaded_img = img.load()
-        chunk_size = 32
 
-        x_chunks_count = width // chunk_size
-        y_chunks_count = height // chunk_size
+        x_chunks_count = width // CHUNK_SIZE
+        y_chunks_count = height // CHUNK_SIZE
 
         for y_chunk in range(y_chunks_count + 1):
             for x_chunk in range(x_chunks_count + 1):
-                for y in range(chunk_size):
-                    pixel_y = y_chunk * chunk_size + y
+                for y in range(CHUNK_SIZE):
+                    pixel_y = y_chunk * CHUNK_SIZE + y
                     if pixel_y >= height:
                         break
 
-                    for x in range(chunk_size):
-                        pixel_x = x_chunk * chunk_size + x
+                    for x in range(CHUNK_SIZE):
+                        pixel_x = x_chunk * CHUNK_SIZE + x
                         if pixel_x >= width:
                             break
 
@@ -55,22 +56,21 @@ def add_pixel(pixel: tuple):
     width, height = img.size
     loaded_image = img.load()
     loaded_clone = img.copy().load()
-    chunk_size = 32
 
-    x_chunks_count = width // chunk_size
-    y_chunks_count = height // chunk_size
+    x_chunks_count = width // CHUNK_SIZE
+    y_chunks_count = height // CHUNK_SIZE
 
     pixel_index = 0
 
     for y_chunk in range(y_chunks_count + 1):
         for x_chunk in range(x_chunks_count + 1):
-            for y in range(chunk_size):
-                pixel_y = (y_chunk * chunk_size) + y
+            for y in range(CHUNK_SIZE):
+                pixel_y = (y_chunk * CHUNK_SIZE) + y
                 if pixel_y >= height:
                     break
 
-                for x in range(chunk_size):
-                    pixel_x = (x_chunk * chunk_size) + x
+                for x in range(CHUNK_SIZE):
+                    pixel_x = (x_chunk * CHUNK_SIZE) + x
                     if pixel_x >= width:
                         break
 
@@ -90,7 +90,7 @@ def get_pixel_size(_type):
     raise Exception(locale.unk_type % _type)
 
 
-def pixel_type2str(_type):
+def get_format_by_pixel_type(_type):
     if _type in (0, 1, 2, 3):
         return 'RGBA'
     elif _type == 4:

system/lib/menu.py

@@ -1,32 +1,31 @@
 import shutil
+import textwrap
+import typing
 
 import colorama
 
 from system.lib.config import config
 from system.localization import locale
 
 
-def print_feature(name: str, description: str = None, console_width: int = -1):
-    print(name, end='')
+def print_feature(feature_id: int, name: str, description: str = None, console_width: int = -1):
+    text = f' {feature_id} {name}'
     if description:
-        print(' ' * (console_width // 2 - len(name)) + ': ' + description, end='')
-    print()
+        text += ' ' * (console_width // 2 - len(text)) + ': ' + description
 
+    print(textwrap.fill(text, console_width))
 
-def print_category(text):
-    return print(colorama.Back.GREEN + colorama.Fore.BLACK + text + ' ' * (10 - len(text)) + colorama.Style.RESET_ALL)
 
-
-def print_line(console_width):
-    print((console_width - 1) * '-')
+def print_category(text: str, background_width: int = 10):
+    print(colorama.Back.GREEN + colorama.Fore.BLACK + text + ' ' * (background_width - len(text)) + colorama.Style.RESET_ALL)
 
 
 class Menu:
     class Item:
-        def __init__(self, name, description=None, handler=None):
-            self.name = name
-            self.description = description
-            self.handler = handler
+        def __init__(self, name: str, description: str = None, handler: typing.Callable = None):
+            self.name: str = name
+            self.description: str = description
+            self.handler: typing.Callable = handler
 
     class Category:
         def __init__(self, _id: int, name: str):
@@ -57,14 +56,14 @@ def choice(self):
             colorama.Style.RESET_ALL
         ).center(console_width + 12))
         print('github.com/Vorono4ka/XCoder'.center(console_width - 1))
-        print_line(console_width)
+        Menu._print_divider_line(console_width)
 
         for category in self.categories:
             print_category(category.name)
             for item_index in range(len(category.items)):
                 item = category.items[item_index]
-                print_feature(f' {category.id * 10 + item_index + 1} {item.name}', item.description, console_width)
-            print_line(console_width)
+                print_feature(category.id * 10 + item_index + 1, item.name, item.description, console_width)
+            Menu._print_divider_line(console_width)
 
         choice = input(locale.choice)
         try:
@@ -73,7 +72,7 @@ def choice(self):
                 return None
         except ValueError:
             return None
-        print_line(console_width)
+        Menu._print_divider_line(console_width)
 
         category_id = choice // 10
         item_index = choice % 10
@@ -85,5 +84,9 @@ def choice(self):
                 break
         return None
 
+    @staticmethod
+    def _print_divider_line(console_width: int):
+        print((console_width - 1) * '-')
+
 
 menu = Menu()

system/lib/objects/point.py

@@ -1,7 +1,7 @@
 class Point:
-    def __init__(self, x=0, y=0):
-        self.x = x
-        self.y = y
+    def __init__(self, x: float = 0, y: float = 0):
+        self.x: float = x
+        self.y: float = y
 
     def __eq__(self, other):
         return self.x == other.x and self.y == other.y
@@ -24,10 +24,10 @@ def __repr__(self):
         return str(self.position)
 
     @property
-    def position(self):
+    def position(self) -> (float, float):
         return self.x, self.y
 
     @position.setter
-    def position(self, value):
+    def position(self, value: (float, float)):
         self.x = value[0]
         self.y = value[1]

system/lib/objects/shape.py

@@ -99,19 +99,19 @@ def load(self, swf, tag: int):
 
         multiplier = 0.5 if swf.use_lowres_texture else 1
 
-        for z in range(self.points_count):
-            self.shape_points[z].x = swf.reader.read_int32() / 20 * multiplier
-            self.shape_points[z].y = swf.reader.read_int32() / 20 * multiplier
-        for z in range(self.points_count):
-            w, h = [swf.reader.read_uint16() * swf.textures[self.texture_id].width / 0xffff * multiplier,
-                    swf.reader.read_uint16() * swf.textures[self.texture_id].height / 0xffff * multiplier]
-            x, y = map(ceil, (w, h))
-            if int(w) == x:
-                x += 1
-            if int(h) == y:
-                y += 1
-
-            self.sheet_points[z].position = (x, y)
+        for i in range(self.points_count):
+            self.shape_points[i].x = swf.reader.read_int32() / 20
+            self.shape_points[i].y = swf.reader.read_int32() / 20
+        for i in range(self.points_count):
+            u, v = (swf.reader.read_uint16() * swf.textures[self.texture_id].width / 0xffff * multiplier,
+                    swf.reader.read_uint16() * swf.textures[self.texture_id].height / 0xffff * multiplier)
+            u_rounded, v_rounded = map(ceil, (u, v))
+            if int(u) == u_rounded:
+                u_rounded += 1
+            if int(v) == v_rounded:
+                v_rounded += 1
+
+            self.sheet_points[i].position = (u_rounded, v_rounded)
 
     def render(self, swf):
         sheet_left = min(point.x for point in self.sheet_points)

system/lib/objects/texture.py

@@ -2,7 +2,7 @@
 
 from PIL import Image
 
-from system.lib.images import pixel_type2str, load_texture, join_image, load_image_from_buffer
+from system.lib.images import get_format_by_pixel_type, load_texture, join_image, load_image_from_buffer
 
 
 class SWFTexture:
@@ -19,11 +19,11 @@ def load(self, swf, tag: int, has_texture: bool):
         self.width, self.height = (swf.reader.read_uint16(), swf.reader.read_uint16())
 
         if has_texture:
-            img = Image.new(pixel_type2str(self.pixel_type), (self.width, self.height))
+            img = Image.new(get_format_by_pixel_type(self.pixel_type), (self.width, self.height))
 
             load_texture(swf.reader, self.pixel_type, img)
 
-            if tag in (27, 28):
+            if tag in (27, 28, 29):
                 join_image(img)
                 print()
             else: