Rearranged Defs

Author: Ben-Brady

mediaify/animation/exports.py

@@ -9,33 +9,31 @@ def load_animation(data: bytes) -> "AnimationFile":
     """Raises:
     - ValueError("Animation was too large")
     - ValueError("Could not Load Animation")
-    - ValueError("Animation Only Has 1 Frame")
     """
     pillow = open_as_pillow(data)
     return encode_as_original(data, pillow)
 
 
-def batch_encode_animation(
+def encode_animation(
         data: bytes,
-        configs: "List[AnimationConfig]" = Default.batch_animation,
-        ) -> "List[AnimationFile|ImageFile]":
+        config: AnimationConfig = Default.animation,
+        ) -> "AnimationFile|ImageFile":
     """Raises:
     - ValueError("Animation was too large")
     - ValueError("Could not Load Animation")
-    - ValueError("Animation Only Has 1 Frame")
     """
     pillow = open_as_pillow(data)
-    return [encode_with_config(data, pillow, config) for config in configs]
+    return encode_with_config(data, pillow, config)
 
 
-def encode_animation(
+def batch_encode_animation(
         data: bytes,
-        config: AnimationConfig = Default.animation,
-        ) -> "AnimationFile|ImageFile":
+        configs: "List[AnimationConfig]" = Default.batch_animation,
+        ) -> "List[AnimationFile|ImageFile]":
     """Raises:
     - ValueError("Animation was too large")
     - ValueError("Could not Load Animation")
     """
     pillow = open_as_pillow(data)
-    return encode_with_config(data, pillow, config)
+    return [encode_with_config(data, pillow, config) for config in configs]
 

mediaify/image/exports.py

@@ -14,25 +14,25 @@ def load_image(data: bytes) -> "ImageFile":
     return encode_with_config(data, pillow, UnencodedConfig())
 
 
-def batch_encode_image(
+def encode_image(
         data: bytes,
-        configs: "List[ImageConfig]" = Default.batch_image,
-        ) -> "List[ImageFile]":
+        config: ImageConfig = Default.image,
+        ) -> "ImageFile":
     """Raises:
     - ValueError: Image is too big to process
     - ValueError: Could not Load Image
     """
     pillow = open_as_pillow(data)
-    return [encode_with_config(data, pillow, config) for config in configs]
+    return encode_with_config(data, pillow, config)
 
 
-def encode_image(
+def batch_encode_image(
         data: bytes,
-        config: ImageConfig = Default.image,
-        ) -> "ImageFile":
+        configs: "List[ImageConfig]" = Default.batch_image,
+        ) -> "List[ImageFile]":
     """Raises:
     - ValueError: Image is too big to process
     - ValueError: Could not Load Image
     """
     pillow = open_as_pillow(data)
-    return encode_with_config(data, pillow, config)
+    return [encode_with_config(data, pillow, config) for config in configs]

mediaify/video/exports.py

@@ -15,6 +15,16 @@ def load_video(data: bytes) -> "VideoFile":
     return encode_as_original(data, info)
 
 
+def encode_video(
+        data: bytes,
+        config: "VideoConfig" = Default.video,
+        ) -> "VideoFile|AnimationFile|ImageFile":
+    with NamedTemporaryFile() as f:
+        f.write(data)
+        info = get_video_info(f.name)
+        return encode_video_with_config(data, f.name, info, config)
+
+
 def batch_encode_video(
         data: bytes,
         configs: "List[VideoConfig]" = Default.batch_video,
@@ -26,13 +36,3 @@ def batch_encode_video(
             encode_video_with_config(data, f.name, info, config)
             for config in configs
         ]
-
-
-def encode_video(
-        data: bytes,
-        config: "VideoConfig" = Default.video,
-        ) -> "VideoFile|AnimationFile|ImageFile":
-    with NamedTemporaryFile() as f:
-        f.write(data)
-        info = get_video_info(f.name)
-        return encode_video_with_config(data, f.name, info, config)