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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.12.2
+Version: 2.12.3
 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>
@@ -376,6 +376,7 @@ 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: pybrowsers~=0.7.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=22.0
 Requires-Dist: psutil~=7.0.0

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

@@ -11,6 +11,7 @@ memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=11.1.0
+pybrowsers~=0.7.0
 pyoxipng~=9.0.0
 python-telegram-bot~=22.0
 psutil~=7.0.0

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

@@ -438,12 +438,13 @@ class StickerConvert:
         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.3}/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.3}/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.3}/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.3}/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.3}/src/sticker_convert/version.py

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

{sticker_convert-2.12.2 → sticker_convert-2.12.3/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.3
 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>
@@ -376,6 +376,7 @@ 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: pybrowsers~=0.7.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=22.0
 Requires-Dist: psutil~=7.0.0

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

@@ -11,6 +11,7 @@ memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=11.1.0
+pybrowsers~=0.7.0
 pyoxipng~=9.0.0
 python-telegram-bot~=22.0
 psutil~=7.0.0

{sticker_convert-2.12.2 → sticker_convert-2.12.3}/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,