sticker-convert 2.1.13__tar.gz → 2.1.15__tar.gz

{sticker-convert-2.1.13/src/sticker_convert.egg-info → sticker-convert-2.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.13
+Version: 2.1.15
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>

{sticker-convert-2.1.13 → sticker-convert-2.1.15}/src/sticker_convert/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 '''sticker-convert'''
-__version__ = '2.1.13'
+__version__ = '2.1.15'

{sticker-convert-2.1.13 → sticker-convert-2.1.15}/src/sticker_convert/__main__.py

@@ -3,8 +3,10 @@ def main():
     import multiprocessing
     import sys
     import os
+    from .__init__ import __version__
 
     multiprocessing.freeze_support()
+    print(f"sticker-convert {__version__}")
     script_path = os.path.dirname(__file__)
     if not os.path.isdir(script_path):
         script_path = os.path.dirname(sys.argv[0])

{sticker-convert-2.1.13 → sticker-convert-2.1.15}/src/sticker_convert/converter.py

@@ -218,8 +218,9 @@ class StickerConvert:
             self.frames_import_imageio()
 
     def frames_import_imageio(self):
-        if self.in_f_ext in '.webp':
-            # ffmpeg do not support webp decoding (yet)
+        # ffmpeg do not support webp decoding (yet)
+        # ffmpeg could fail to decode apng if file is buggy
+        if self.in_f_ext in ('.webp', '.apng', 'png'):
             for frame in iio.imiter(self.in_f, plugin='pillow', mode='RGBA'):
                 self.frames_raw.append(frame)
             return

{sticker-convert-2.1.13 → sticker-convert-2.1.15}/src/sticker_convert/job.py

@@ -410,7 +410,7 @@ class Job:
         
         if self.out_urls:
             with open(os.path.join(self.opt_output.dir, 'export-result.txt'), 'w+') as f:
-                f.writelines(self.out_urls)
+                f.write('\n'.join(self.out_urls))
         else:
             self.cb_msg('An error occured while exporting stickers')
             return False

{sticker-convert-2.1.13 → sticker-convert-2.1.15}/src/sticker_convert/utils/files/dir_utils.py

@@ -61,4 +61,5 @@ class DirUtils:
         if (config_dir := DirUtils._get_curr_dir_if_writable()) != None:
             return config_dir
         else:
+            os.makedirs(fallback_dir, exist_ok=True)
             return fallback_dir

{sticker-convert-2.1.13 → sticker-convert-2.1.15}/src/sticker_convert/utils/media/codec_info.py

@@ -75,17 +75,25 @@ class CodecInfo:
     def get_file_codec(file: str) -> Optional[str]:
         codec = None
         try:
-            codec = Image.open(file).format
+            im = Image.open(file)
+            codec = im.format
         except UnidentifiedImageError:
             pass
         
         # Unable to distinguish apng and png
-        if codec not in (None, 'PNG'):
-            return codec.lower()
-        else:
+        if codec == None:
             metadata = iio.immeta(file, plugin="pyav", exclude_applied=False)
             codec = metadata.get("codec", None)
+            if codec == None:
+                raise RuntimeError(f"Unable to get codec for file {file}")
             return codec
+        elif codec == "PNG":
+            if im.is_animated:
+                return "apng"
+            else:
+                return "png"
+        else:
+            return codec.lower()
 
     @staticmethod
     def get_file_res(file: str) -> tuple[int, int]:
@@ -95,7 +103,7 @@ class CodecInfo:
             with LottieAnimation.from_tgs(file) as anim:
                 width, height = anim.lottie_animation_get_size()
         else:
-            if file_ext == ".webp":
+            if file_ext in (".webp", ".png", ".apng"):
                 plugin = "pillow"
             else:
                 plugin = "pyav"
@@ -114,7 +122,7 @@ class CodecInfo:
             with LottieAnimation.from_tgs(file) as anim:
                 frames = anim.lottie_animation_get_totalframe()
         else:
-            if file_ext == ".webp":
+            if file_ext in (".webp", ".png", ".apng"):
                 frames = Image.open(file).n_frames
             else:
                 frames = frames = len([* iio.imiter(file, plugin="pyav")])

{sticker-convert-2.1.13 → sticker-convert-2.1.15/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.13
+Version: 2.1.15
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>