[Style] Remove unnecessary **kwargs in Media._convert() -- finally!

Author: AllenHeartcore

GkmasObjectManager/adv/adventure.py

@@ -28,7 +28,7 @@ def _get_commands(self) -> list[dict]:
             ]
         return self.commands
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
+    def _convert(self, raw: bytes) -> bytes:
         # only for compatibility with GkmasResource
         return bytes(
             json.dumps(

GkmasObjectManager/media/audio.py

@@ -28,7 +28,7 @@ def _init_mimetype(self):
         self.mimetype = "audio"
         self.raw_format = self._name_ext
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
+    def _convert(self, raw: bytes) -> bytes:
         audio = AudioSegment.from_file(BytesIO(raw))
         return audio.export(format=self.converted_format).read()
 
@@ -40,7 +40,7 @@ def _init_mimetype(self):
         self.mimetype = "audio"
         self.default_converted_format = "wav"
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
+    def _convert(self, raw: bytes) -> bytes:
         env = UnityPy.load(raw)
         values = list(env.container.values())
         assert len(values) == 1, f"{self.name} contains {len(values)} audio clips."
@@ -65,7 +65,7 @@ def _make_vgmstream_args(self, tmp_in: str, tmp_out: str, suffix: str) -> list:
             tmp_in,
         ]
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
+    def _convert(self, raw: bytes) -> bytes:
         # uses pydub in vastly different ways,
         # thus this class is not inherited from GkmasAudio
 

GkmasObjectManager/media/dummy.py

@@ -62,8 +62,8 @@ def __init__(self, name: str, downloader: Callable[[], dict]):
         #   but about *correctness* where the same format with a different
         #   image_resize wouldn't even trigger _convert() otherwise.
         # This is of type Union[None, str, Tuple[int, int]],
-        #   which used to be a global const, but was soon deprecated since
-        #   inside Image we use kwargs.get(), where we can't enforce type hint.
+        #   which used to be a global const, but was soon deprecated
+        #   since we use kwargs.get() and can't enforce type hint.
         # On the other hand, we can't record the sanitized "new size" tuple here,
         #   since it's about checking cache against user input *before* conversion,
         #   and we don't want to move _determine_new_size() to this class.
@@ -75,7 +75,7 @@ def _init_mimetype(self):
         self.default_converted_format = ""  # TO BE OVERRIDDEN (choose one)
         # yeah these two lines appear twice... this time just as a hint
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
+    def _convert(self, raw: bytes) -> bytes:
         raise NotImplementedError  # TO BE OVERRIDDEN
 
     def get_data(self, **kwargs) -> dict:
@@ -119,7 +119,7 @@ def get_data(self, **kwargs) -> dict:
             self.converted = None  # invalidate cache
             self.image_resize = image_resize
 
-        _bytes = self._get_converted(**kwargs)
+        _bytes = self._get_converted()
         return {
             "bytes": _bytes,
             "mimetype": (
@@ -165,10 +165,10 @@ def _get_raw(self) -> bytes:
             self.raw = data["bytes"]
         return data["bytes"]  # cached or not, this is "valid"
 
-    def _get_converted(self, **kwargs) -> bytes:
+    def _get_converted(self) -> bytes:
         if self.converted is not None:
             return self.converted  # assumes proper invalidation beforehand
-        converted = self._convert(self._get_raw(), **kwargs)  # e.g., image_resize
+        converted = self._convert(self._get_raw())
         if self.ENABLE_CACHE:
             self.converted = converted
         return converted

GkmasObjectManager/media/image.py

@@ -23,11 +23,10 @@ def _init_mimetype(self):
         self.mimetype = "image"
         self.raw_format = self._name_ext
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
-        return self._img2bytes(Image.open(BytesIO(raw)), **kwargs)
+    def _convert(self, raw: bytes) -> bytes:
+        return self._img2bytes(Image.open(BytesIO(raw)))
 
-    # don't put 'image_resize' in signature to match the parent class
-    def _img2bytes(self, img: Image, **kwargs) -> bytes:
+    def _img2bytes(self, img: Image) -> bytes:
 
         image_resize = self.image_resize
         if image_resize:
@@ -108,8 +107,8 @@ def _init_mimetype(self):
         self.mimetype = "image"
         self.default_converted_format = "png"
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
+    def _convert(self, raw: bytes) -> bytes:
         env = UnityPy.load(raw)
         values = list(env.container.values())
         assert len(values) == 1, f"{self.name} contains {len(values)} images."
-        return super()._img2bytes(values[0].read().image, **kwargs)
+        return super()._img2bytes(values[0].read().image)

GkmasObjectManager/media/video.py

@@ -18,7 +18,7 @@ def _init_mimetype(self):
         self.mimetype = "video"
         self.default_converted_format = "mp4"
 
-    def _convert(self, raw: bytes, **kwargs) -> bytes:
+    def _convert(self, raw: bytes) -> bytes:
 
         stream_in = ffmpeg.input("pipe:0")
         stream_out = ffmpeg.output(