fix: speed increase

Author: ForNeus57

src/python/app/command/io.py

@@ -1,5 +1,5 @@
 """Module for input/output operations related to parsing commandline"""
-
+from io import BytesIO
 from sys import stdin, stdout
 from typing import BinaryIO
 
@@ -10,7 +10,8 @@ def map_input(input_source: str) -> BinaryIO:
     if input_source is None:
         return stdin.buffer
 
-    return open(input_source, mode='rb')
+    with open(input_source, mode='rb', buffering=16384) as file:
+        return BytesIO(file.read())
 
 
 def map_output(output_source: str) -> BinaryIO:
@@ -19,4 +20,4 @@ def map_output(output_source: str) -> BinaryIO:
     if output_source is None:
         return stdout.buffer
 
-    return open(output_source, mode='wb')
+    return open(output_source, mode='wb', buffering=16384)

src/python/app/command/parser.py

@@ -48,6 +48,8 @@ def prepare_command(command: IOperation) -> Callable[[Namespace], int]:
     """Function that decorates the operation in order to provide input and output to it"""
 
     def wrapper(args: Namespace) -> int:
+        nonlocal command
+
         with map_input(args.input) as input_source:
             data_format = determine_format(input_source)
 
@@ -57,10 +59,10 @@ def wrapper(args: Namespace) -> int:
                                             else KnownFormat.from_string(args.output_format))
 
             input_arr = reader.read_format(input_source)
-            result = command(args, input_arr)
+        result = command(args, input_arr)
 
-            with map_output(args.output) as output_source:
-                writer.write_format(output_source, result)
+        with map_output(args.output) as output_source:
+            writer.write_format(output_source, result)
 
         return 0
 

src/python/app/io/bmp.py

@@ -142,15 +142,15 @@ def write_format(self, file: BinaryIO, input_image: Image) -> None:
 
         file_size = 54 + raw_bitmap_data_size
 
-        file.write(struct.pack('BB', 0x42, 0x4D))  # signature
-        file.write(struct.pack('I', file_size))  # file_size
-        file.write(struct.pack('HH', 0, 0))  # reserved1 & reserved2
-        file.write(struct.pack('I', 54))  # file_offset_to_pixel_array
-
-        file.write(struct.pack('I', 40))  # dbi header size
-        file.write(struct.pack('iiHH', image_width, image_height, 1, bits_per_pixel))
-        file.write(struct.pack('IIiiII', 0, raw_bitmap_data_size, 2834, 2834, 0, 0))
+        file.write(b''.join((
+            struct.pack('BB', 0x42, 0x4D),      # signature
+            struct.pack('I', file_size),        # file_size
+            struct.pack('HH', 0, 0),            # reserved1 & reserved2
+            struct.pack('I', 54),               # file_offset_to_pixel_array
+            struct.pack('I', 40),               # dbi header size
+            struct.pack('iiHH', image_width, image_height, 1, bits_per_pixel),
+            struct.pack('IIiiII', 0, raw_bitmap_data_size, 2834, 2834, 0, 0),
+        )))
 
         for i in range(image_height):
-            file.write(input_arr[i].tobytes())
-            file.write(bytes([0] * padding))
+            file.write(input_arr[i].tobytes() + bytes([0] * padding))

src/python/app/io/png.py

@@ -257,11 +257,16 @@ def from_numpy(cls, data: np.ndarray) -> 'IDATData':
         """Serialize for IDAT binary content"""
 
         new_data = np.concatenate((data, np.full((data.shape[0], data.shape[1], 1), 255, dtype=np.uint8)), axis=2)
+
         stream = bytearray()
+        compressor = zlib.compressobj(level=zlib.Z_BEST_SPEED)
+
         for i in range(new_data.shape[0]):
-            stream += b'\0' + new_data[i].tobytes()
+            stream += compressor.compress(b'\0' + new_data[i].tobytes())
+
+        stream += compressor.flush()
 
-        return cls(compressed_data=zlib.compress(stream))
+        return cls(compressed_data=bytes(stream))
 
     @override
     def type(self) -> ChunkType:
@@ -401,17 +406,17 @@ def from_numpy(cls, data: np.ndarray) -> 'PNG':
                            PNGChunk.from_chunk(end_chunk)])
 
     def __post_init__(self) -> None:
-        if self.chunks[-1].type() != ChunkType.IEND:
+        if self.chunks[-1].chunk_type != ChunkType.IEND:
             raise InvalidFormatException("Last chunk is not end")
 
     def to_numpy(self) -> np.ndarray:
         """Serializer of the data to a numpy array"""
         all_data_compressed = b''.join(x.chunk_data.compressed_data
                                        for x in self.chunks
-                                       if x.type() == ChunkType.IDAT)
+                                       if x.chunk_type == ChunkType.IDAT)
         result = zlib.decompress(all_data_compressed)
 
-        palette = [x.chunk_data.palette_entries for x in self.chunks if x.type() == ChunkType.PLTE]
+        palette = [x.chunk_data.palette_entries for x in self.chunks if x.chunk_type == ChunkType.PLTE]
 
         if len(palette) == 1:
             return palette[np.frombuffer(result)].reshape(self.i_header.chunk_data.height,