refactor some stuff in the converter

Author: bemxio

Makefile

@@ -15,6 +15,8 @@ EXECUTABLE = bootloader.bin
 
 VIDEO_PATH = video.flv
 
+ASCII_GRADIENT = oxxo
+
 # targets
 all: $(BUILD_DIR)/$(EXECUTABLE)
 
@@ -36,4 +38,5 @@ $(BUILD_DIR)/code.bin: $(SOURCES)
 $(BUILD_DIR)/data.bin: $(VIDEO_PATH)
 	mkdir -p $(BUILD_DIR)
 
-	$(PYTHON) $(SRC_DIR)/vid2data/main.py $< -o $@
+	$(PYTHON) $(SRC_DIR)/converter/main.py $< -o $@ \
+		--gradient $(ASCII_GRADIENT)

src/vid2data/main.py src/converter/main.pysrc/vid2data/main.py renamed to src/converter/main.py

@@ -1,11 +1,18 @@
 from toascii import Video, GrayscaleConverter, ConverterOptions
-from toascii.gradients import OXXO
+from toascii.gradients import BLOCK, HIGH, LOW, OXXO
 import numpy as np
 
 from argparse import ArgumentParser
 from typing import Generator
 from pathlib import Path
 
+GRADIENTS = {
+    "block": BLOCK,
+    "high": HIGH,
+    "low": LOW,
+    "oxxo": OXXO
+}
+
 class CustomConverter(GrayscaleConverter):
     def _asciify_image(self, image: np.ndarray) -> Generator[bytes, None, None]:
         g_l_m = len(self.options.gradient) - 1
@@ -14,25 +21,17 @@ def _asciify_image(self, image: np.ndarray) -> Generator[bytes, None, None]:
             for b, g, r in row:
                 yield self.options.gradient[int((self._luminosity(r, g, b) / 255) * g_l_m)]
 
-def get_filling_amount(size: int) -> int:
-    amount = 0
-
-    while amount < size:
-        amount += 512
-
-    return amount - size + 1
-
-def main(input_path: Path, output_path: Path, width: int = 80, height: int = 25):
+def main(input_path: Path, output_path: Path, gradient: str = "oxxo", width: int = 80, height: int = 25):
     if not input_path.exists():
         raise FileNotFoundError(f"input path `{input_path}` does not exist")
 
-    options = ConverterOptions(gradient=OXXO, width=width, height=height)
+    options = ConverterOptions(gradient=GRADIENTS[gradient], width=width, height=height)
     video = Video(str(input_path), converter=CustomConverter(options))
 
     size = width * height
-    filling = b"\0" * get_filling_amount(size)
+    filling = 512 - (size % 512) + 1
 
-    print(f"Frame size: {size} bytes ({round(size / 512)} sectors, with {len(filling)} bytes of filling)")
+    print(f"Frame size: {size} bytes ({round(size / 512)} sectors, with {filling} bytes of filling)")
     print(f"Terminal size: {width}x{height} (width x height)")
 
     data = b""
@@ -41,9 +40,10 @@ def main(input_path: Path, output_path: Path, width: int = 80, height: int = 25)
         if index == 1:
             length = video.source.frame_count
 
-        data += text.encode("utf-8")[:-1] + filling
+        data += text.encode("utf-8")[:-1] + (b"\0" * filling)
 
-        print(f"Frame {index}/{length} ({round(index / length * 100, 2)}%)", end="\r")
+        print(f"Frame {index}/{length}", end=" ")
+        print(f"({round(index / length * 100, 2)}%)", end="\r")
 
     with open(output_path, "wb") as file:
         file.write(data)
@@ -53,6 +53,9 @@ def main(input_path: Path, output_path: Path, width: int = 80, height: int = 25)
 
     parser.add_argument("input_path", type=Path, help="The input path to the video file.")
     parser.add_argument("--output_path", "-o", type=Path, help="The output path to the data file.", default=Path("video.bin"))
+
+    parser.add_argument("--gradient", type=str, help="The character pattern to use with the ASCII stream.", choices=GRADIENTS.keys(), default="oxxo")
+
     parser.add_argument("--width", type=int, help="The width of the terminal.", default=80)
     parser.add_argument("--height", type=int, help="The height of the terminal.", default=25)