sticker-convert 2.12.2__tar.gz → 2.12.4__tar.gz

{sticker_convert-2.12.2/src/sticker_convert.egg-info → sticker_convert-2.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.12.2
+Version: 2.12.4
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -365,7 +365,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.2.1
 Requires-Dist: anyio~=4.9.0
-Requires-Dist: apngasm_python~=1.3.1
+Requires-Dist: apngasm_python~=1.3.2
 Requires-Dist: av~=13.1.0
 Requires-Dist: beautifulsoup4~=4.13.3
 Requires-Dist: cryptg~=0.5.0.post0
@@ -376,12 +376,13 @@ Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
-Requires-Dist: pyoxipng~=9.0.0
+Requires-Dist: pybrowsers~=0.7.0
+Requires-Dist: pyoxipng~=9.1.0
 Requires-Dist: python-telegram-bot~=22.0
 Requires-Dist: psutil~=7.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3
-Requires-Dist: rlottie_python~=1.3.6
+Requires-Dist: rlottie_python~=1.3.7
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
 Requires-Dist: socksio~=1.0.0
 Requires-Dist: telethon~=1.39.0

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/requirements.txt

@@ -1,6 +1,6 @@
 aiolimiter~=1.2.1
 anyio~=4.9.0
-apngasm_python~=1.3.1
+apngasm_python~=1.3.2
 av~=13.1.0
 beautifulsoup4~=4.13.3
 cryptg~=0.5.0.post0
@@ -11,12 +11,13 @@ memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=11.1.0
-pyoxipng~=9.0.0
+pybrowsers~=0.7.0
+pyoxipng~=9.1.0
 python-telegram-bot~=22.0
 psutil~=7.0.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
-rlottie_python~=1.3.6
+rlottie_python~=1.3.7
 signalstickers-client-fork-laggykiller~=3.3.0.post2
 socksio~=1.0.0
 telethon~=1.39.0

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/cli.py

@@ -139,6 +139,7 @@ class CLI:
             "cache_dir",
             "scale_filter",
             "quantize_method",
+            "chromium_path",
         )
         flags_comp_bool = ("fake_vid",)
         keyword_args: Dict[str, Any]
@@ -427,6 +428,7 @@ class CLI:
             fake_vid=self.compression_presets[preset]["fake_vid"]
             if args.fake_vid is None
             else args.fake_vid,
+            chromium_path=args.chromium_path,
             cache_dir=args.cache_dir,
             scale_filter=self.compression_presets[preset]["scale_filter"]
             if args.scale_filter is None

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/converter.py

@@ -435,15 +435,20 @@ class StickerConvert:
         width = self.codec_info_orig.res[0]
         height = self.codec_info_orig.res[1]
 
-        chrome_path = CRD.get_chrome_path()
+        chrome_path: Optional[str]
+        if self.opt_comp.chromium_path:
+            chrome_path = self.opt_comp.chromium_path
+        else:
+            chrome_path = CRD.get_chrome_path()
         args = [
             "--headless",
+            "--kiosk",
             "--disable-extensions",
             "--disable-infobars",
             "--disable-gpu",
             "--disable-gpu-rasterization",
             "--hide-scrollbars",
-            f"--window-size={width + 100},{height + 100}",
+            f"--window-size={width + 200},{height + 200}",
             "about:blank",
         ]
         if chrome_path is None:

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/downloaders/download_viber.py

@@ -19,7 +19,7 @@ class DownloadViber(DownloadBase):
     # def __init__(self, *args: Any, **kwargs: Any) -> None:
     #     super().__init__(*args, **kwargs)
 
-    def get_pack_info(self, url: str) -> Optional[Tuple[str, str, str]]:
+    def get_pack_info(self, url: str) -> Optional[Tuple[str, str, str, str]]:
         r = requests.get(url, allow_redirects=True)
         soup = BeautifulSoup(r.text, "html.parser")
 
@@ -42,8 +42,17 @@ class DownloadViber(DownloadBase):
         first_sticker_url = cast(str, pack_dict["stickerFirstItemUrl"])
         zip_url = "/".join(first_sticker_url.split("/")[:-1]) + ".zip"
         pack_id = pack_dict["id"].split(".")[-1]
+        if is_custom:
+            cover_url = (
+                "https://custom-sticker-pack.cdn.viber.com/custom-stickers/{}/thumb.png"
+            )
+        else:
+            cover_url = (
+                "https://sm-content.viber.com/static/images/product/{}/sticker.png"
+            )
+        cover_url = cover_url.format(pack_dict["id"])
 
-        return title, zip_url, pack_id
+        return title, zip_url, cover_url, pack_id
 
     def decompress(
         self, zip_file: bytes, exts: Optional[Tuple[str, ...]] = None
@@ -84,7 +93,7 @@ class DownloadViber(DownloadBase):
         if pack_info is None:
             self.cb.put("Download failed: Cannot get pack info")
             return 0, 0
-        title, zip_url, pack_id = pack_info
+        title, zip_url, cover_url, pack_id = pack_info
 
         anim_url = f"https://content.cdn.viber.com/stickers/ASVG/{pack_id}.zip"
         anim_file = self.download_file(anim_url)
@@ -94,6 +103,7 @@ class DownloadViber(DownloadBase):
             count += self.decompress(zip_file, (".mp3",))
         else:
             count = self.decompress(zip_file, (".mp3", ".png"))
+        self.download_file(cover_url, self.out_dir / "cover.png")
 
         MetadataHandler.set_metadata(self.out_dir, title=title)
 

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/gui.py

@@ -137,6 +137,7 @@ class GUI(Window):
         self.fake_vid_var = BooleanVar()
         self.scale_filter_var = StringVar(self)
         self.quantize_method_var = StringVar(self)
+        self.chromium_path_var = StringVar(self)
         self.cache_dir_var = StringVar(self)
         self.default_emoji_var = StringVar(self)
         self.steps_var = IntVar(self)
@@ -321,6 +322,7 @@ class GUI(Window):
             "comp": {
                 "no_compress": self.no_compress_var.get(),
                 "preset": self.comp_preset_var.get(),
+                "chromium_path": self.chromium_path_var.get(),
                 "cache_dir": self.cache_dir_var.get(),
                 "processes": self.processes_var.get(),
             },
@@ -377,6 +379,9 @@ class GUI(Window):
                 self.compression_presets["custom"], comp_custom
             )
         self.cache_dir_var.set(self.settings.get("comp", {}).get("cache_dir", ""))
+        self.chromium_path_var.set(
+            self.settings.get("comp", {}).get("chromium_path", "")
+        )
         self.processes_var.set(
             self.settings.get("comp", {}).get("processes", ceil(cpu_count() / 2))
         )
@@ -568,6 +573,9 @@ class GUI(Window):
             fake_vid=self.fake_vid_var.get(),
             scale_filter=self.scale_filter_var.get(),
             quantize_method=self.quantize_method_var.get(),
+            chromium_path=self.chromium_path_var.get()
+            if self.chromium_path_var.get() != ""
+            else None,
             cache_dir=self.cache_dir_var.get()
             if self.cache_dir_var.get() != ""
             else None,

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -293,6 +293,17 @@ class AdvancedCompressionWindow(BaseWindow):
             bootstyle="secondary",  # type: ignore
         )
 
+        self.chromium_path_help_btn = self.add_help_btn(
+            self.gui.help["comp"]["chromium_path"]
+        )
+        self.chromium_path_lbl = Label(
+            self.frame_advcomp, text="Chromium/Chrome directory"
+        )
+        self.chromium_path_entry = Entry(
+            self.frame_advcomp, textvariable=self.gui.chromium_path_var, width=30
+        )
+        self.chromium_path_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+
         self.cache_dir_help_btn = self.add_help_btn(self.gui.help["comp"]["cache_dir"])
         self.cache_dir_lbl = Label(self.frame_advcomp, text="Custom cache directory")
         self.cache_dir_entry = Entry(
@@ -412,6 +423,12 @@ class AdvancedCompressionWindow(BaseWindow):
             column=2, row=r, columnspan=4, sticky="nes", padx=3, pady=3
         )
         r += 1
+        self.chromium_path_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.chromium_path_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.chromium_path_entry.grid(
+            column=2, row=r, columnspan=4, sticky="nes", padx=3, pady=3
+        )
+        r += 1
         self.cache_dir_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.cache_dir_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
         self.cache_dir_entry.grid(

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/gui_components/windows/kakao_get_auth_window.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python3
-import platform
-import subprocess
 from functools import partial
 from threading import Thread
 from typing import Any, Optional
@@ -37,7 +35,7 @@ class KakaoGetAuthWindow(BaseWindow):
         # Method 1 frame
         self.explanation1_1_lbl = Label(
             self.frame_from_desktop,
-            text="This will get Kakao auth_token from Kakao Desktop (Windows only)",
+            text="This will get Kakao auth_token from Kakao Desktop",
             justify="left",
             anchor="w",
         )
@@ -70,14 +68,12 @@ class KakaoGetAuthWindow(BaseWindow):
             command=self.cb_launch_desktop,
             width=24,
             bootstyle="secondary",  # type: ignore
-            state="normal" if platform.system() == "Windows" else "disabled",
         )
         self.get_auth_desktop_btn = Button(
             self.frame_from_desktop,
             text="Get auth_token",
             command=self.cb_from_desktop,
             width=24,
-            state="normal" if platform.system() == "Windows" else "disabled",
         )
 
         self.explanation1_1_lbl.grid(
@@ -270,7 +266,7 @@ class KakaoGetAuthWindow(BaseWindow):
             bin_path = m.get_kakao_desktop()
 
         if bin_path is not None:
-            subprocess.Popen([bin_path])
+            m.launch_kakao(bin_path)
         else:
             self.cb_msg_block_kakao(
                 "Error: Cannot launch Kakao Desktop. Is it installed?"

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/job_option.py

@@ -75,6 +75,7 @@ class CompOption(BaseOption):
     fake_vid: Optional[bool] = None
     quantize_method: Optional[str] = None
     scale_filter: Optional[str] = None
+    chromium_path: Optional[str] = None
     cache_dir: Optional[str] = None
     default_emoji: str = "😀"
     no_compress: Optional[bool] = None
@@ -109,6 +110,7 @@ class CompOption(BaseOption):
             "fake_vid": self.fake_vid,
             "quantize_method": self.quantize_method,
             "scale_filter": self.scale_filter,
+            "chromium_path": self.chromium_path,
             "cache_dir": self.cache_dir,
             "default_emoji": self.default_emoji,
             "no_compress": self.no_compress,

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/resources/help.json

@@ -52,6 +52,7 @@
         "scale_filter": "Set scale filter. Default as bicubic. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n- box = Similar to nearest, but better downscaling\n- bilinear = Linear interpolation\n- hamming = Similar to bilinear, but better downscaling\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
         "quantize_method": "Set method for quantizing image. Default as imagequant. Valid options are:\n- imagequant = Best quality but slow\n- fastoctree = Fast but image looks chunky\n- none = No image quantizing, large image size as result",
         "cache_dir": "Set custom cache directory.\nUseful for debugging, or speed up conversion if cache_dir is on RAM disk.",
+        "chromium_path": "Set Chromium(-based)/Chrome browser path.\nRequired for converting from SVG files.\nLeave blank to auto detect",
         "default_emoji": "Set the default emoji for uploading Signal and Telegram sticker packs."
     },
     "cred": {

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/utils/auth/get_discord_auth.py

@@ -74,7 +74,10 @@ class GetDiscordAuth:
         else:
             chrome_path = CRD.get_chrome_path()
         if chrome_path is None:
-            return None, "Please install Discord Desktop or Chrome and try again"
+            return (
+                None,
+                "Please install Discord Desktop or Chrome/Chromium and try again",
+            )
 
         token = None
         if using_discord_app:

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/utils/auth/get_kakao_desktop_auth.py

@@ -18,21 +18,33 @@ then login to Kakao Desktop and try again."""
 MSG_NO_AUTH = """Kakao Desktop installed,
 but kakao_auth not found.
 Please login to Kakao Desktop and try again."""
+MSG_SIP_ENABLED = """You need to disable SIP:
+1. Restart computer in Recovery mode
+2. Launch Terminal from the Utilities menu
+3. Run the command `csrutil disable`
+4. Restart your computer"""
 MSG_LAUNCH_FAIL = "Failed to launch Kakao"
 MSG_PERMISSION_ERROR = "Failed to read Kakao process memory"
-MSG_UNSUPPORTED = "Only Windows is supported for this method"
 
 
 class GetKakaoDesktopAuth:
     def __init__(self, cb_ask_str: Callable[..., str] = input):
         self.cb_ask_str = cb_ask_str
 
+    def launch_kakao(self, kakao_bin_path: str):
+        if platform.system() == "Windows":
+            subprocess.Popen([kakao_bin_path])
+        elif platform.system() == "Darwin":
+            subprocess.Popen(["open", kakao_bin_path])
+        else:
+            subprocess.Popen(["wine", kakao_bin_path])
+
     def relaunch_kakao(self, kakao_bin_path: str) -> Optional[int]:
         killed = killall("kakaotalk")
         if killed:
             time.sleep(5)
 
-        subprocess.Popen([kakao_bin_path])
+        self.launch_kakao(kakao_bin_path)
         time.sleep(20)
 
         return find_pid_by_name("kakaotalk")
@@ -54,7 +66,7 @@ class GetKakaoDesktopAuth:
         try:
             with OpenProcess(pid=int(kakao_pid)) as process:
                 for address in process.search_by_value(  # type: ignore
-                    str, 15, "\x00authorization\x00"
+                    str, 15, "authorization: "
                 ):
                     auth_token_addr = cast(int, address) + 15
                     auth_token_bytes = process.read_process_memory(
@@ -127,11 +139,77 @@ class GetKakaoDesktopAuth:
 
             return auth_token, msg
 
-    def get_kakao_desktop(self) -> Optional[str]:
-        kakao_bin_path = os.path.expandvars(
-            "%programfiles(x86)%\\Kakao\\KakaoTalk\\KakaoTalk.exe"
+    def get_auth_darwin(self, kakao_bin_path: str) -> Tuple[Optional[str], str]:
+        killall("kakaotalk")
+
+        subprocess.run(
+            [
+                "lldb",
+                kakao_bin_path,
+                "-o",
+                "b ptrace",
+                "-o",
+                "r",
+                "-o",
+                "thread return",
+                "-o",
+                "con",
+                "-o",
+                "process save-core /tmp/memdump.kakaotalk.dmp",
+                "-o",
+                "con",
+                "-o",
+                "quit",
+            ],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
         )
-        if Path(kakao_bin_path).is_file():
+
+        with open("/tmp/memdump.kakaotalk.dmp", "rb") as f:
+            mem = f.read()
+
+        os.remove("/tmp/memdump.kakaotalk.dmp")
+
+        auth_token = None
+        for i in re.finditer(b"]mac/", mem):
+            auth_token_term = i.start()
+
+            auth_token_bytes = mem[auth_token_term - 200 : auth_token_term]
+            auth_token_start = auth_token_bytes.find(b"application/json_\x10\x8a") + 19
+            if auth_token_start == -1:
+                continue
+            try:
+                auth_token_candidate = auth_token_bytes[auth_token_start:].decode(
+                    encoding="ascii"
+                )
+            except UnicodeDecodeError:
+                continue
+
+            if 150 > len(auth_token_candidate) > 100:
+                auth_token = auth_token_candidate
+                break
+
+        if auth_token is None:
+            return None, MSG_NO_AUTH
+        else:
+            msg = "Got auth_token successfully:\n"
+            msg += f"{auth_token=}\n"
+
+            return auth_token, msg
+
+    def get_kakao_desktop(self) -> Optional[str]:
+        if platform.system() == "Windows":
+            kakao_bin_path = os.path.expandvars(
+                "%programfiles(x86)%\\Kakao\\KakaoTalk\\KakaoTalk.exe"
+            )
+        elif platform.system() == "Darwin":
+            kakao_bin_path = "/Applications/KakaoTalk.app"
+        else:
+            kakao_bin_path = os.path.expanduser(
+                "~/.wine/drive_c/Program Files (x86)/Kakao/KakaoTalk/KakaoTalk.exe"
+            )
+
+        if Path(kakao_bin_path).exists():
             return kakao_bin_path
 
         return None
@@ -140,15 +218,6 @@ class GetKakaoDesktopAuth:
         self,
         kakao_bin_path: Optional[str] = None,
     ) -> Tuple[Optional[str], str]:
-        if platform.system() != "Windows":
-            return None, MSG_UNSUPPORTED
-
-        if not kakao_bin_path:
-            kakao_bin_path = self.get_kakao_desktop()
-
-        if not kakao_bin_path:
-            return None, MSG_NO_BIN
-
         # get_auth_by_dump()
         # + Fast
         # - Requires admin
@@ -158,23 +227,38 @@ class GetKakaoDesktopAuth:
         # - Slow
         # - Cannot run on macOS
 
-        # If admin, prefer get_auth_by_dump() over get_auth_by_pme(), vice versa
-        methods: List[Callable[[str, bool], Tuple[Optional[str], str]]] = []
-        relaunch = True
-        kakao_auth = None
-        msg = ""
-
-        pme_present = importlib.util.find_spec("PyMemoryEditor") is not None
-        methods.append(self.get_auth_by_dump)
-        if pme_present:
-            methods.append(self.get_auth_by_pme)
-        if check_admin() is False:
-            methods.reverse()
-
-        for method in methods:
-            kakao_auth, msg = method(kakao_bin_path, relaunch)
-            relaunch = False
-            if kakao_auth is not None:
-                break
+        if not kakao_bin_path:
+            kakao_bin_path = self.get_kakao_desktop()
+
+        if not kakao_bin_path:
+            return None, MSG_NO_BIN
+
+        if platform.system() != "Darwin":
+            # If admin, prefer get_auth_by_dump() over get_auth_by_pme(), vice versa
+            methods: List[Callable[[str, bool], Tuple[Optional[str], str]]] = []
+            relaunch = True
+            kakao_auth = None
+            msg = ""
+
+            pme_present = importlib.util.find_spec("PyMemoryEditor") is not None
+            methods.append(self.get_auth_by_dump)
+            if pme_present:
+                methods.append(self.get_auth_by_pme)
+            if check_admin() is False:
+                methods.reverse()
+
+            for method in methods:
+                kakao_auth, msg = method(kakao_bin_path, relaunch)
+                relaunch = False
+                if kakao_auth is not None:
+                    break
+        else:
+            csrutil_status = subprocess.run(
+                ["csrutil", "status"], capture_output=True, text=True
+            ).stdout
+
+            if "enabled" in csrutil_status:
+                return None, MSG_SIP_ENABLED
+            kakao_auth, msg = self.get_auth_darwin(kakao_bin_path)
 
         return kakao_auth, msg

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/utils/auth/telegram_api.py

@@ -388,8 +388,8 @@ class TelethonAPI(TelegramAPI):
         else:
             sent_message = cast(
                 Message,
-                await self.client.send_file("Stickers", msg, force_document=True),
-            )  # type: ignore
+                await self.client.send_file("Stickers", msg, force_document=True),  # type: ignore
+            )
 
         for _ in range(5):
             # https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/utils/chrome_remotedebug.py

@@ -8,8 +8,9 @@ import shutil
 import socket
 import subprocess
 import time
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, Tuple, Union, cast
 
+import browsers  # type: ignore
 import requests
 import websocket
 from PIL import Image
@@ -19,6 +20,23 @@ from PIL import Image
 # https://chromedevtools.github.io/devtools-protocol/
 
 
+BROWSER_PREF = [
+    "chrome",
+    "chrome-canary",
+    "chromium",
+    "msedge",
+    "msedge-beta",
+    "msedge-dev",
+    "msedge-canary",
+    "brave",
+    "brave-beta",
+    "brave-nightly",
+    "opera",
+    "opera-beta",
+    "opera-developer",
+]
+
+
 def get_free_port() -> int:
     with socket.socket() as sock:
         sock.bind(("", 0))
@@ -66,47 +84,19 @@ class CRD:
 
     @staticmethod
     def get_chrome_path() -> Optional[str]:
-        chrome_bin: Optional[str]
-        if platform.system() == "Darwin":
-            chrome_bin = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-
-            if os.path.isfile(chrome_bin) is False:
-                return None
-
-            return chrome_bin
-
-        elif platform.system() == "Windows":
-            chrome_x64 = f"{os.environ.get('PROGRAMW6432') or os.environ.get('PROGRAMFILES')}\\Google\\Chrome\\Application"
-            chrome_x86 = (
-                f"{os.environ.get('PROGRAMFILES(X86)')}\\Google\\Chrome\\Application"
-            )
-
-            chrome_dir = (
-                chrome_x64
-                if os.path.isdir(chrome_x64)
-                else chrome_x86
-                if os.path.isdir(chrome_x86)
-                else None
-            )
-
-            if chrome_dir is None:
-                return None
-
-            return chrome_dir + "\\chrome.exe"
-
-        else:
-            for executable in (
-                "google-chrome",
-                "google-chrome-stable",
-                "google-chrome-beta",
-                "google-chrome-dev",
-                "chromium-browser",
-                "chromium",
-            ):
-                chrome_bin = shutil.which(executable)
-                if chrome_bin is not None:
-                    return chrome_bin
+        bs: List[Tuple[int, str]] = []
+        for b in browsers.browsers():
+            browser_type = b["browser_type"]
+            path = b["path"]
+            try:
+                rank = BROWSER_PREF.index(browser_type)
+            except ValueError:
+                continue
+            bs.append((rank, path))
+        if len(bs) == 0:
             return None
+        bs = sorted(bs, key=lambda x: x[0])
+        return bs[0][1]
 
     def connect(self, target_id: int = 0):
         self.cmd_id = 1

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert/version.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "2.12.2"
+__version__ = "2.12.4"

{sticker_convert-2.12.2 → sticker_convert-2.12.4/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.12.2
+Version: 2.12.4
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -365,7 +365,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.2.1
 Requires-Dist: anyio~=4.9.0
-Requires-Dist: apngasm_python~=1.3.1
+Requires-Dist: apngasm_python~=1.3.2
 Requires-Dist: av~=13.1.0
 Requires-Dist: beautifulsoup4~=4.13.3
 Requires-Dist: cryptg~=0.5.0.post0
@@ -376,12 +376,13 @@ Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
-Requires-Dist: pyoxipng~=9.0.0
+Requires-Dist: pybrowsers~=0.7.0
+Requires-Dist: pyoxipng~=9.1.0
 Requires-Dist: python-telegram-bot~=22.0
 Requires-Dist: psutil~=7.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3
-Requires-Dist: rlottie_python~=1.3.6
+Requires-Dist: rlottie_python~=1.3.7
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
 Requires-Dist: socksio~=1.0.0
 Requires-Dist: telethon~=1.39.0

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/src/sticker_convert.egg-info/requires.txt

@@ -1,6 +1,6 @@
 aiolimiter~=1.2.1
 anyio~=4.9.0
-apngasm_python~=1.3.1
+apngasm_python~=1.3.2
 av~=13.1.0
 beautifulsoup4~=4.13.3
 cryptg~=0.5.0.post0
@@ -11,12 +11,13 @@ memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=11.1.0
-pyoxipng~=9.0.0
+pybrowsers~=0.7.0
+pyoxipng~=9.1.0
 python-telegram-bot~=22.0
 psutil~=7.0.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
-rlottie_python~=1.3.6
+rlottie_python~=1.3.7
 signalstickers-client-fork-laggykiller~=3.3.0.post2
 socksio~=1.0.0
 telethon~=1.39.0

{sticker_convert-2.12.2 → sticker_convert-2.12.4}/tests/test_download.py

@@ -415,6 +415,7 @@ def test_download_kakao_animated_gif_store_link_with_token(tmp_path: LocalPath)
 
 
 @pytest.mark.skipif(not TEST_DOWNLOAD, reason="TEST_DOWNLOAD not set")
+@pytest.mark.skipif(not KAKAO_TOKEN, reason="No credentials")
 def test_download_kakao_animated_gif_share_link(tmp_path: LocalPath) -> None:
     _run_sticker_convert(
         tmp_path=tmp_path,
@@ -430,6 +431,7 @@ def test_download_kakao_animated_gif_share_link(tmp_path: LocalPath) -> None:
 
 
 @pytest.mark.skipif(not TEST_DOWNLOAD, reason="TEST_DOWNLOAD not set")
+@pytest.mark.skipif(not KAKAO_TOKEN, reason="No credentials")
 def test_download_kakao_mini_share_link(tmp_path: LocalPath) -> None:
     _run_sticker_convert(
         tmp_path=tmp_path,
@@ -450,7 +452,7 @@ def test_download_viber_custom_sticker_packs(tmp_path: LocalPath) -> None:
         tmp_path=tmp_path,
         source="viber",
         url="https://stickers.viber.com/pages/custom-sticker-packs/11eefcc8e3c228308e3fafd9b834679a19de752fb5c38390",
-        expected_file_count=2,
+        expected_file_count=3,
         expected_file_formats=[".png"],
         with_title=True,
         with_author=False,
@@ -465,7 +467,7 @@ def test_download_viber_official_sticker_packs(tmp_path: LocalPath) -> None:
         tmp_path=tmp_path,
         source="viber",
         url="https://stickers.viber.com/pages/spring_2024",
-        expected_file_count=14,
+        expected_file_count=15,
         expected_file_formats=[".png"],
         with_title=True,
         with_author=False,
@@ -479,7 +481,7 @@ def test_download_viber_official_sticker_packs_sound(tmp_path: LocalPath) -> Non
         tmp_path=tmp_path,
         source="viber",
         url="https://stickers.viber.com/pages/onenationunderloveUA",
-        expected_file_count=24,
+        expected_file_count=25,
         expected_file_formats=[".png", ".mp3"],
         with_title=True,
         with_author=False,
@@ -493,8 +495,8 @@ def test_download_viber_official_sticker_packs_animated(tmp_path: LocalPath) ->
         tmp_path=tmp_path,
         source="viber",
         url="https://stickers.viber.com/pages/earthday",
-        expected_file_count=32,
-        expected_file_formats=[".svg"],
+        expected_file_count=33,
+        expected_file_formats=[".svg", ".png"],
         with_title=True,
         with_author=False,
         with_emoji=False,