sticker-convert 2.1.14__py3-none-any.whl → 2.1.15__py3-none-any.whl

sticker_convert/__init__.py

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

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/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/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/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.14.dist-info → sticker_convert-2.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.1.14
+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.14.dist-info → sticker_convert-2.1.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
-sticker_convert/__init__.py,sha256=2g8vglQqwWVnyH8IyUbZoj1xJpu730PcWHARF3huLrE,67
-sticker_convert/__main__.py,sha256=W3n9SprqoDQxaWDAqLVA7DiavMdbPLVdtbASTKSpZS0,546
+sticker_convert/__init__.py,sha256=MpIUsAq6cLwAoV4lwfBAws23Exb-Ul9ygSUlMat2sH4,67
+sticker_convert/__main__.py,sha256=HHzFzRsxxhxkCL15_sE1rBAdtprT0NfVUNR591BMvl4,628
 sticker_convert/cli.py,sha256=oWOEi1NriUy2ijzd7G0PqHd-c2GQA903CLtQtlYkP8s,16568
-sticker_convert/converter.py,sha256=k4wy8nYtUFaEFxQ6QRPWPUyAorGgRIWQ0WLElsnKTXw,16780
+sticker_convert/converter.py,sha256=ovukCtlEWNRDTU2OJ_k19cpUg0nMiuY3CVXTMJhSZ7s,16854
 sticker_convert/gui.py,sha256=AXNPOgES0lyp-nhc5HRQMTr69xSAeUqEW1ehXCIadt0,27484
 sticker_convert/job.py,sha256=VEyEW3KV040PbzfPCxUpLU9Im8RVv_hQqGUVBDRz87k,17440
 sticker_convert/job_option.py,sha256=0W97v-39FFMyFUqIx4f8ClOqQjvnVNdcvS6MbWQA7Jo,10803
@@ -76,17 +76,17 @@ sticker_convert/utils/auth/get_kakao_auth.py,sha256=Q3CxzDqzoo9vf_bsbmpKZXeQODEX
 sticker_convert/utils/auth/get_line_auth.py,sha256=pKe2N3QLTyB0wWBpkD9rlDBqHK7LZ5hnAmfPH7XVmFI,1211
 sticker_convert/utils/auth/get_signal_auth.py,sha256=NHGOZEiKkGaJmj58BmR8ynmUsAn_IRzE4jpEHXKUhVM,11874
 sticker_convert/utils/files/cache_store.py,sha256=lNS6ItZ3lwNa7NipkDo7n0wIoAf728dcRV0r0ohmM3s,730
-sticker_convert/utils/files/dir_utils.py,sha256=_jDyyPTVQXiVr4dJhPFaXqaKvch_MWLngwH7eZfezv4,1861
+sticker_convert/utils/files/dir_utils.py,sha256=_dDt3UAisnCyiqWoZsfMIEnX2Mkqz-O4UUWCRR0IWDM,1914
 sticker_convert/utils/files/json_manager.py,sha256=BBndjSY5kvjxurOpnDI2DRsKoLrNBTf5HoGfUqlf-4Y,503
 sticker_convert/utils/files/metadata_handler.py,sha256=KIy8j89DMBW7-gpL9jqhzz96GgBvPHsRYegHXemk_mY,8346
 sticker_convert/utils/files/run_bin.py,sha256=4c8y5c_2wUfm0hbJSOGFcezpW5BVqM5_e9aliPbxvwo,1632
 sticker_convert/utils/media/apple_png_normalize.py,sha256=YGrZ8pZvgfhw8dW-0gf7XcXk_R82lJTX-oTo6SsB7uY,3719
-sticker_convert/utils/media/codec_info.py,sha256=zW_wMAsyZctjQwZVmn63KfUryKNO-LZjOIZrEMuqQeo,4547
+sticker_convert/utils/media/codec_info.py,sha256=rrEcWwpBZwMEifvSdRuSjTVOye_D5vSonqV1OZMs44Y,4834
 sticker_convert/utils/media/decrypt_kakao.py,sha256=gMz64vIGEIPAl4FFWuUbPMHE7vExr46ZFpzMoukvwws,1918
 sticker_convert/utils/media/format_verify.py,sha256=7WvvDSFDkyG1WlkXKqVbmPjKiyEedtqivZcCqSNziD8,6179
-sticker_convert-2.1.14.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.1.14.dist-info/METADATA,sha256=sFHn2rIUtXak2Ve9wm-23Yo6raPrgE9UtNCDhTUbCxU,44697
-sticker_convert-2.1.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sticker_convert-2.1.14.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.1.14.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.1.14.dist-info/RECORD,,
+sticker_convert-2.1.15.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.1.15.dist-info/METADATA,sha256=D1vhJds0tNxpCzpMBgwDLelZxPimaGdLLSKP3yf4ITw,44697
+sticker_convert-2.1.15.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sticker_convert-2.1.15.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.1.15.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.1.15.dist-info/RECORD,,