sticker-convert 2.1.9__tar.gz → 2.1.11__tar.gz

{sticker-convert-2.1.9/src/sticker_convert.egg-info → sticker-convert-2.1.11}/PKG-INFO

@@ -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 → sticker-convert-2.1.11}/src/sticker_convert/__init__.py

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

{sticker-convert-2.1.9 → sticker-convert-2.1.11}/src/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-2.1.9 → sticker-convert-2.1.11}/src/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 → sticker-convert-2.1.11/src/sticker_convert.egg-info}/PKG-INFO

@@ -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>