sticker-convert 2.1.9__py3-none-any.whl → 2.1.11__py3-none-any.whl

sticker_convert/__init__.py

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

sticker_convert/utils/auth/get_signal_auth.py

@@ -16,6 +16,7 @@ from selenium.webdriver.chrome.service import Service
 from selenium.common.exceptions import JavascriptException
 
 from ..files.run_bin import RunBin # type: ignore
+from ..files.dir_utils import DirUtils # type: ignore
 
 # https://stackoverflow.com/a/17197027
 def strings(filename: str, min: int = 4) -> Generator[str, None, None]:
@@ -32,20 +33,9 @@ def strings(filename: str, min: int = 4) -> Generator[str, None, None]:
             yield result
 
 class GetSignalAuth:
-    def __init__(self, signal_bin_version: str = 'beta', chromedriver_download_dir: str = './bin', cb_msg=print, cb_ask_str=input):
-        if platform.system() == 'Windows':
-            fallback_dir = os.path.expandvars('%APPDATA%\\sticker-convert')
-        else:
-            fallback_dir = os.path.expanduser('~/.config/sticker-convert')
-
-        appimage_path = os.getenv('APPIMAGE')
-        if appimage_path:
-            chromedriver_download_dir = os.path.join(os.path.split(appimage_path)[0], 'bin')
-        
+    def __init__(self, signal_bin_version: str = 'beta', cb_msg=print, cb_ask_str=input):
+        chromedriver_download_dir = os.path.join(DirUtils.get_config_dir(), 'bin')
         os.makedirs(chromedriver_download_dir, exist_ok=True)
-        if not os.access(chromedriver_download_dir, os.W_OK):
-            os.makedirs(fallback_dir, exist_ok=True)
-            chromedriver_download_dir = fallback_dir
 
         self.signal_bin_version = signal_bin_version
         self.chromedriver_download_dir = chromedriver_download_dir

sticker_convert/utils/media/codec_info.py

@@ -6,7 +6,7 @@ from typing import Optional
 
 import imageio.v3 as iio
 from rlottie_python import LottieAnimation  # type: ignore
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
 import mmap
 
 
@@ -69,16 +69,19 @@ class CodecInfo:
 
     @staticmethod
     def get_file_codec(file: str) -> Optional[str]:
-        file_ext = CodecInfo.get_file_ext(file)
-
-        if file_ext == ".webp":
-            plugin = "pillow"
+        codec = None
+        try:
+            codec = Image.open(file).format
+        except UnidentifiedImageError:
+            pass
+        
+        # Unable to distinguish apng and png
+        if codec not in (None, 'PNG'):
+            return codec.lower()
         else:
-            plugin = "pyav"
-        metadata = iio.immeta(file, plugin=plugin, exclude_applied=False)
-        codec = metadata.get("codec", None)
-
-        return codec
+            metadata = iio.immeta(file, plugin="pyav", exclude_applied=False)
+            codec = metadata.get("codec", None)
+            return codec
 
     @staticmethod
     def get_file_res(file: str) -> tuple[int, int]:

{sticker_convert-2.1.9.dist-info → sticker_convert-2.1.11.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-sticker_convert/__init__.py,sha256=zf1bu4kQQP4LSB6ob4bAcE49gUjCSK8vwKnkF_7mnPc,66
+sticker_convert/__init__.py,sha256=jfcI-Nq9bhNcUPfJL46bHZg9Jg_mwzMqiiiJ-hgtz_4,67
 sticker_convert/__main__.py,sha256=W3n9SprqoDQxaWDAqLVA7DiavMdbPLVdtbASTKSpZS0,546
 sticker_convert/cli.py,sha256=21D5lAghcB3f5V7vk_qS6Di-NtGlH1ilAqDCPpzVUak,16534
 sticker_convert/converter.py,sha256=k4wy8nYtUFaEFxQ6QRPWPUyAorGgRIWQ0WLElsnKTXw,16780
@@ -74,19 +74,19 @@ sticker_convert/utils/fake_cb_msg.py,sha256=LYHWKqjL4GdNG2HUCbvVNsRjQOErJBXsJS-k
 sticker_convert/utils/url_detect.py,sha256=x163bVIH4rEimozvFHMC-XBmxyecf3qpBjJIBt8WPeE,793
 sticker_convert/utils/auth/get_kakao_auth.py,sha256=Q3CxzDqzoo9vf_bsbmpKZXeQODEXQ5leijKjjMt2Gv8,9306
 sticker_convert/utils/auth/get_line_auth.py,sha256=pKe2N3QLTyB0wWBpkD9rlDBqHK7LZ5hnAmfPH7XVmFI,1211
-sticker_convert/utils/auth/get_signal_auth.py,sha256=19rv5JCzFD8GOBhR2ThW5MLFWOxiDxJZk7rK8Qo9zME,12330
+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/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=GEfpA3OPNfB9pnsj6sFeVGFBJ34_etkmEAWaTXcnoJ4,4265
+sticker_convert/utils/media/codec_info.py,sha256=zX9zXUy0qxxxvJIJMF7KBUm4seOeJN-ZFcJE2yqsuOs,4421
 sticker_convert/utils/media/decrypt_kakao.py,sha256=gMz64vIGEIPAl4FFWuUbPMHE7vExr46ZFpzMoukvwws,1918
 sticker_convert/utils/media/format_verify.py,sha256=7WvvDSFDkyG1WlkXKqVbmPjKiyEedtqivZcCqSNziD8,6179
-sticker_convert-2.1.9.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.1.9.dist-info/METADATA,sha256=yyJDvxP8jqAbH6WM_UbUb3aqBdwNF5ayZ6td6gxk88o,44696
-sticker_convert-2.1.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sticker_convert-2.1.9.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.1.9.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.1.9.dist-info/RECORD,,
+sticker_convert-2.1.11.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.1.11.dist-info/METADATA,sha256=NSKhAwvKvr9esES64SYlWCtb7nPeh3IJ96sf2udkcjk,44697
+sticker_convert-2.1.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sticker_convert-2.1.11.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.1.11.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.1.11.dist-info/RECORD,,