sticker-convert 2.12.1__py3-none-any.whl → 2.12.3__py3-none-any.whl

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/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/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/utils/auth/telegram_api.py

@@ -386,7 +386,10 @@ class TelethonAPI(TelegramAPI):
         if isinstance(msg, str):
             sent_message = await self.client.send_message("Stickers", msg)
         else:
-            sent_message = cast(Message, await self.client.send_file("Stickers", msg))  # type: ignore
+            sent_message = cast(
+                Message,
+                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
@@ -426,7 +429,7 @@ class TelethonAPI(TelegramAPI):
     ) -> Tuple[int, int]:
         stickers_ok = 0
         if self.is_emoji:
-            repl = await self._send_and_recv("/newemojipack")
+            repl = await self._send_and_recv("/newpack")
         elif stickers_list[0][3] == "static":
             repl = await self._send_and_recv("/newsticker")
         elif stickers_list[0][3] == "video":

sticker_convert/utils/auth/telethon_setup.py

@@ -3,6 +3,7 @@ from typing import Callable, Tuple
 
 import anyio
 from telethon import TelegramClient  # type: ignore
+from telethon.errors import SessionPasswordNeededError  # type: ignore
 
 from sticker_convert.definitions import CONFIG_DIR
 from sticker_convert.job_option import CredOption
@@ -38,7 +39,11 @@ class TelethonSetup:
             phone_number = self.cb_ask_str("Enter phone number: ")
             await client.send_code_request(phone_number)
             code = self.cb_ask_str("Enter code: ")
-            await client.sign_in(phone_number, code)
+            try:
+                await client.sign_in(phone_number, code)
+            except SessionPasswordNeededError:
+                password = self.cb_ask_str("Enter password: ")
+                await client.sign_in(password=password)
             authed = await client.is_user_authorized()
 
         return (

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/version.py

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

{sticker_convert-2.12.1.dist-info → sticker_convert-2.12.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.12.1
+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.1.dist-info → sticker_convert-2.12.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
 sticker_convert/cli.py,sha256=MWzq9QJJ7HYBD73DmSgRIPo-u58mTGEIoUUpJKNjI0Q,22358
-sticker_convert/converter.py,sha256=Dnl5nkvSgIvfbcKp0n4ytoW6ZeHim5dNnrhAs3MZXx8,39423
+sticker_convert/converter.py,sha256=FVHsWKIIzewkxZ2apOFgPqEvzFSXPmQeAcnFEY7vYDM,39446
 sticker_convert/definitions.py,sha256=BqROmOvqIqw8ANaqZXIxJAXGD0HgjAvCfFouQ4SaWHc,2254
 sticker_convert/gui.py,sha256=D9L-lFif4P4MANglis_wpjkzlUuGPuq8AybWGyPVP8E,33824
 sticker_convert/job.py,sha256=gEd6yF8WPUR1_7q9SVhnwdD5usrDxwowNnR5q9uS8Yc,28011
 sticker_convert/job_option.py,sha256=NysZtKVVG7EzRkLnVaeYJY0uNlYKFmjoststB1cvVrY,8020
-sticker_convert/version.py,sha256=X4mGfBbxTe9tfGYfCUF1Mq5UfjWo1Dvtav-e_li2cOc,47
+sticker_convert/version.py,sha256=8-CYgCWklTwkUtd4SiyvYPiHKcvCUejjHFpw4ScOsls,47
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_base.py,sha256=MI5pCT_tkfoaFlrD1oNynDj1Rv1CK0APuNVElTEAEis,5110
 sticker_convert/downloaders/download_discord.py,sha256=6AFpLAYL2hRvVcsqUtzDUC31U66U02ZcnKXDnZRi2jk,3496
@@ -14,7 +14,7 @@ sticker_convert/downloaders/download_kakao.py,sha256=-k9uTo_vn5CUjb0XPCKPmtYfftw
 sticker_convert/downloaders/download_line.py,sha256=c-hTzEarGQP0b-pnPl29NuSKcaZWUeRo_94YpJzz72M,17911
 sticker_convert/downloaders/download_signal.py,sha256=3wv-BLd4qggly4AdtwV8f3vUpCVZ-8GnoPLoWngY3Pk,3728
 sticker_convert/downloaders/download_telegram.py,sha256=iGmOcVjU2Ai19t1lyDY2JhQIc--O5XMyNCGXZAA4DVY,2028
-sticker_convert/downloaders/download_viber.py,sha256=ApHy4sDUOmVwplHfLbso_gyOKn9zccqvRnHENzR_UUM,3790
+sticker_convert/downloaders/download_viber.py,sha256=SFnyaVEd_33J1KvRhcHDJqnLKGsbLMeA2NomVHm2ulM,4226
 sticker_convert/gui_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/gui_components/gui_utils.py,sha256=okho2cA1Scem_m6rPiYifreFzpFrM21-yUkiAv64EUI,3431
 sticker_convert/gui_components/frames/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -85,18 +85,18 @@ sticker_convert/uploaders/upload_telegram.py,sha256=WlUyLJlW83XZz6RhA76jHMXA6TNU
 sticker_convert/uploaders/upload_viber.py,sha256=_vOK0UgP7V7ZeFG6pR3sVf3A744Q6J19qzO-2hDvt5w,6583
 sticker_convert/uploaders/xcode_imessage.py,sha256=iTTT8gDYOTNkKqXeSWUBuWfxu7xeE418t2Z1YQFR5L0,11365
 sticker_convert/utils/callback.py,sha256=spYUGlklOs1yPZAxoqwOWgR1sdimpfM8a27if3TaVYk,6155
-sticker_convert/utils/chrome_remotedebug.py,sha256=9xdzAbIjs5n5kEOEfOSHCStQit7ABUFuSeJrzOyL9z8,7058
+sticker_convert/utils/chrome_remotedebug.py,sha256=uzUBlUtuO0cRcDxO7hnPWvbdt5NJBnCXvAnStK2zAVQ,6445
 sticker_convert/utils/emoji.py,sha256=AqB26JY-PkYzNwPLReSnqLiQKe-bR9UXnLclAbgubJ8,367
 sticker_convert/utils/process.py,sha256=EAQZ9WpiKmkvToIv8G1HNY4V7m0jXyyePTmeP2XOZzE,4688
 sticker_convert/utils/url_detect.py,sha256=vCbhQbcW1X_UtdfQlICGY8pMX34KQ6sCtDJZbp0NrSg,876
-sticker_convert/utils/auth/get_discord_auth.py,sha256=i5SaXU9Ly6Ci_iBYCYIPcQB5FaAehi9DidB4jbKJMVg,4215
+sticker_convert/utils/auth/get_discord_auth.py,sha256=MeyLzB8hlMTv8l2-6HBW45hppwogSH2gyI1L-VAOEkM,4273
 sticker_convert/utils/auth/get_kakao_auth.py,sha256=Wok5sp0GGBgTwwlfYB7lVq82ndBAOGTcqsWEaWAXFNE,10760
 sticker_convert/utils/auth/get_kakao_desktop_auth.py,sha256=BBfFI08cVOmi6akenQwMI0Uiatmn76wI8QYHnbvopxg,5809
 sticker_convert/utils/auth/get_line_auth.py,sha256=8l8ha2vQmk3rHGvDE7PkcxQXbH3oe62LKbI3qVUtvqc,2196
 sticker_convert/utils/auth/get_signal_auth.py,sha256=oDTcIUcRM8_zfmR6UoBvzBhIscwLRe7n2zw4aw0j8_Q,4564
 sticker_convert/utils/auth/get_viber_auth.py,sha256=mUTrcxq5bTrzSXEVaeTPqVQIdZdwvIhrbMgBUb7dU30,8173
-sticker_convert/utils/auth/telegram_api.py,sha256=WQi3dat8IZy13nXfyDS25XTS3HKp5BhVzgHimgbPnmw,24169
-sticker_convert/utils/auth/telethon_setup.py,sha256=3hH0KglsotFBxT3gwFjHiDuREyahFIlmx-ZL1_-zM2A,2714
+sticker_convert/utils/auth/telegram_api.py,sha256=hX9fT0Pp8yMxcKSXLe9Mvy12mQ_rWj-KTyamABI8YWA,24232
+sticker_convert/utils/auth/telethon_setup.py,sha256=QW0RAP3KwnxK9ZHmCo_iGqc1NiskOzsGa1kcmPT9PsQ,2972
 sticker_convert/utils/files/cache_store.py,sha256=etfe614OAhAyrnM5fGeESKq6R88YLNqkqkxSzEmZ0V0,1047
 sticker_convert/utils/files/json_manager.py,sha256=Vr6pZJdLMkrJJWN99210aduVHb0ILyf0SSTaw4TZqgc,541
 sticker_convert/utils/files/json_resources_loader.py,sha256=flZFixUXRTrOAhvRQpuSQgmJ69yXL94sxukcowLT1JQ,1049
@@ -107,9 +107,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=_F_iV3k2GYtb8vYZUSKrWl9E7XEW6LDywbnJ-DM6kbk,16476
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=oM32P186tWe9YxvBQRPr8D3FEmBN3b2rEe_2S_MwxyQ,6236
-sticker_convert-2.12.1.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.12.1.dist-info/METADATA,sha256=jLTEMneqqjJo5i2YSsRy3WtNie_SWf2F2pTfxhK3_aU,53484
-sticker_convert-2.12.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-sticker_convert-2.12.1.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.12.1.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.12.1.dist-info/RECORD,,
+sticker_convert-2.12.3.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.12.3.dist-info/METADATA,sha256=bnBpAawPOvQ4air1vK1aofJ9xTGJ8LBsXqZTAEzy7TA,53517
+sticker_convert-2.12.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+sticker_convert-2.12.3.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.12.3.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.12.3.dist-info/RECORD,,