sticker-convert 2.11.8__tar.gz → 2.12.0__tar.gz

{sticker_convert-2.11.8/src/sticker_convert.egg-info → sticker_convert-2.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.11.8
+Version: 2.12.0
 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>
@@ -374,7 +374,6 @@ Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.4
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
-Requires-Dist: mini-racer~=0.12.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
 Requires-Dist: pyoxipng~=9.0.0
@@ -437,7 +436,7 @@ Dynamic: license-file
 | [Telegram](docs/guide_telegram.md)    | ✅ (Require `token` or telethon)    | ✅ (Require `token` & `user_id` or telethon or manually) |
 | [WhatsApp](docs/guide_whatsapp.md)    | ⭕ (By Android or WhatsApp Web)     | ⭕ (Create `.wastickers`, import by Sticker Maker)       |
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
-| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'share link' for animated) | 🚫 (Need to submit for manual approval)                  |
+| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'auth_token' for animated) | 🚫 (Need to submit for manual approval)                  |
 | [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                                |
 | [Discord](docs/guide_discord.md)      | ✅ (Require `token`)                | 🚫                                                       |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload)       |
@@ -462,7 +461,7 @@ Dynamic: license-file
         - For more information: https://github.com/doubleplusc/Line-sticker-downloader
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Kakao
-    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx` OR `kakaotalk://store/emoticon/4404400` OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
+    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx`  OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
@@ -550,7 +549,7 @@ Input options:
                          OR https://line.me/S/sticker/1234/?lang=en OR line://shop/detail/1234 OR 1234)
   --download-kakao DOWNLOAD_KAKAO
                         Download kakao stickers from a URL / ID as input
-                        (Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400
+                        (Example: https://e.kakao.com/t/xxxxx 
                         OR https://emoticon.kakao.com/items/xxxxx OR 4404400)
   --download-viber DOWNLOAD_VIBER
                         Download viber stickers from a URL as input

{sticker_convert-2.11.8 → sticker_convert-2.12.0}/README.md

@@ -44,7 +44,7 @@
 | [Telegram](docs/guide_telegram.md)    | ✅ (Require `token` or telethon)    | ✅ (Require `token` & `user_id` or telethon or manually) |
 | [WhatsApp](docs/guide_whatsapp.md)    | ⭕ (By Android or WhatsApp Web)     | ⭕ (Create `.wastickers`, import by Sticker Maker)       |
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)                  |
-| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'share link' for animated) | 🚫 (Need to submit for manual approval)                  |
+| [Kakao](docs/guide_kakao.md)          | ✅ (Need 'auth_token' for animated) | 🚫 (Need to submit for manual approval)                  |
 | [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                                |
 | [Discord](docs/guide_discord.md)      | ✅ (Require `token`)                | 🚫                                                       |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload)       |
@@ -69,7 +69,7 @@
         - For more information: https://github.com/doubleplusc/Line-sticker-downloader
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Kakao
-    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx` OR `kakaotalk://store/emoticon/4404400` OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
+    - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx`  OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
 - Viber
     - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
@@ -157,7 +157,7 @@ Input options:
                          OR https://line.me/S/sticker/1234/?lang=en OR line://shop/detail/1234 OR 1234)
   --download-kakao DOWNLOAD_KAKAO
                         Download kakao stickers from a URL / ID as input
-                        (Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400
+                        (Example: https://e.kakao.com/t/xxxxx 
                         OR https://emoticon.kakao.com/items/xxxxx OR 4404400)
   --download-viber DOWNLOAD_VIBER
                         Download viber stickers from a URL as input

{sticker_convert-2.11.8 → sticker_convert-2.12.0}/requirements.txt

@@ -9,7 +9,6 @@ httpx~=0.28.1
 imagequant~=1.1.4
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
-mini-racer~=0.12.4
 numpy>=1.22.4
 Pillow~=11.1.0
 pyoxipng~=9.0.0

{sticker_convert-2.11.8 → sticker_convert-2.12.0}/src/sticker_convert/converter.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import json
 import os
 from fractions import Fraction
 from io import BytesIO
@@ -7,12 +8,14 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
 import numpy as np
+from bs4 import BeautifulSoup
 from PIL import Image
 from PIL import __version__ as PillowVersion
 from PIL import features
 
 from sticker_convert.job_option import CompOption
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.chrome_remotedebug import CRD
 from sticker_convert.utils.files.cache_store import CacheStore
 from sticker_convert.utils.media.codec_info import CodecInfo, rounding
 from sticker_convert.utils.media.format_verify import FormatVerify
@@ -423,9 +426,78 @@ class StickerConvert:
             # ffmpeg do not support webp decoding (yet)
             # ffmpeg could fail to decode apng if file is buggy
             self._frames_import_pillow()
+        elif suffix == ".svg":
+            self._frames_import_svg()
         else:
             self._frames_import_pyav()
 
+    def _frames_import_svg(self) -> None:
+        width = self.codec_info_orig.res[0]
+        height = self.codec_info_orig.res[1]
+
+        chrome_path = CRD.get_chrome_path()
+        args = [
+            "--headless",
+            "--disable-extensions",
+            "--disable-infobars",
+            "--disable-gpu",
+            "--disable-gpu-rasterization",
+            "--hide-scrollbars",
+            f"--window-size={width + 100},{height + 100}",
+            "about:blank",
+        ]
+        if chrome_path is None:
+            raise RuntimeError("[F] Chrome/Chromium required for importing svg")
+        self.cb.put("[W] Importing SVG takes long time")
+
+        if isinstance(self.in_f, bytes):
+            svg = self.in_f.decode()
+        else:
+            with open(self.in_f) as f:
+                svg = f.read()
+        soup = BeautifulSoup(svg, "html.parser")
+        svg_tag = soup.find_all("svg")[0]
+
+        if svg_tag.get("width") is None:
+            svg_tag["width"] = width
+        if svg_tag.get("height") is None:
+            svg_tag["height"] = height
+        svg = str(soup)
+
+        crd = None
+        try:
+            crd = CRD(chrome_path, args=args)
+            crd.connect(-1)
+            crd.open_html_str(svg)
+            crd.set_transparent_bg()
+            crd.exec_js('svg = document.getElementsByTagName("svg")[0]')
+            x = json.loads(crd.exec_js("svg.getBoundingClientRect().x"))["result"][
+                "result"
+            ]["value"]
+            y = json.loads(crd.exec_js("svg.getBoundingClientRect().y"))["result"][
+                "result"
+            ]["value"]
+            clip = {"x": x, "y": y, "width": width, "height": height, "scale": 1}
+
+            if self.codec_info_orig.fps > 0:
+                crd.exec_js("svg.pauseAnimations()")
+                for i in range(self.codec_info_orig.frames):
+                    curr_time = (
+                        i
+                        / self.codec_info_orig.frames
+                        * self.codec_info_orig.duration
+                        / 1000
+                    )
+                    crd.exec_js(f"svg.setCurrentTime({curr_time})")
+                    self.frames_raw.append(
+                        np.asarray(crd.screenshot(clip).convert("RGBA"))
+                    )
+            else:
+                self.frames_raw.append(np.asarray(crd.screenshot(clip).convert("RGBA")))
+        finally:
+            if crd is not None:
+                crd.close()
+
     def _frames_import_pillow(self) -> None:
         with Image.open(self.in_f) as im:
             # Note: im.convert("RGBA") would return rgba image of current frame only

{sticker_convert-2.11.8 → sticker_convert-2.12.0}/src/sticker_convert/definitions.py

@@ -82,3 +82,10 @@ def get_config_dir() -> Path:
 
 # Directory for saving configs
 CONFIG_DIR = get_config_dir()
+
+# When importing SVG, import at this fps
+SVG_SAMPLE_FPS = 30
+
+# If width and height not set in SVG tag, import at this dimension
+SVG_DEFAULT_WIDTH = 1024
+SVG_DEFAULT_HEIGHT = 1024

{sticker_convert-2.11.8 → sticker_convert-2.12.0}/src/sticker_convert/downloaders/download_kakao.py

@@ -4,12 +4,10 @@ from __future__ import annotations
 import itertools
 import json
 from pathlib import Path
-from typing import Any, List, Optional, Tuple, cast
+from typing import Any, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
-from bs4 import BeautifulSoup
-from py_mini_racer import MiniRacer
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption, InputOption
@@ -17,34 +15,32 @@ from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.decrypt_kakao import DecryptKakao
 
-JSINJECT = """
-class osclass {
-    android = true;
-}
-class uaclass {
-    os = new osclass();
-}
-class util {
-    static userAgent() {
-        return new uaclass();
-    }
-}
-class daumtools {
-    static web2app(dataDict) {
-        return dataDict['urlScheme'];
-    }
-}
-class document {
-    static querySelectorAll(selectors) {
-        return [];
-    }
-}
-"""
-
 
 class MetadataKakao:
     @staticmethod
-    def get_item_code(title_ko: str, auth_token: str) -> Optional[str]:
+    def get_item_code_from_hash(hash: str, auth_token: str) -> Optional[str]:
+        headers = {
+            "Authorization": auth_token,
+        }
+
+        data = {"hashedItemCode": hash}
+
+        response = requests.post(
+            "https://talk-pilsner.kakao.com/emoticon/api/store/v3/item-code-by-hash",
+            headers=headers,
+            data=data,
+        )
+
+        if response.status_code != 200:
+            return None
+
+        response_json = json.loads(response.text)
+        item_code = response_json["itemCode"]
+
+        return item_code
+
+    @staticmethod
+    def get_item_code_from_title(title_ko: str, auth_token: str) -> Optional[str]:
         headers = {
             "Authorization": auth_token,
         }
@@ -112,66 +108,53 @@ class DownloadKakao(DownloadBase):
         self.pack_info_unauthed: Optional[dict[str, Any]] = None
         self.pack_info_authed: Optional[dict[str, Any]] = None
 
-    def get_info_from_share_link(self, url: str) -> Tuple[Optional[str], Optional[str]]:
-        headers = {"User-Agent": "Android"}
-
-        response = requests.get(url, headers=headers)
-        soup = BeautifulSoup(response.content.decode("utf-8", "ignore"), "html.parser")
-
-        pack_title_tag = soup.find("title")  # type: ignore
-        if not pack_title_tag:
-            return None, None
-
-        pack_title: str = pack_title_tag.string  # type: ignore
-
-        js = ""
-        for script_tag in soup.find_all("script"):
-            js = script_tag.string
-            if js and "daumtools.web2app" in js:
-                break
-        if "daumtools.web2app" not in js:
-            return None, None
-
-        js = JSINJECT + js
-
-        ctx = MiniRacer()
-        kakao_url = cast(str, ctx.eval(js))
-        item_code = urlparse(kakao_url).path.split("/")[2]
-
-        # Share link redirect to preview link if use desktop headers
-        # This allows us to find pack author
-        headers_desktop = {"User-Agent": "Chrome"}
-
-        response = requests.get(url, headers=headers_desktop, allow_redirects=True)
-        response.url
-
-        pack_title_url = urlparse(response.url).path.split("/")[-1]
-        pack_info_unauthed = MetadataKakao.get_pack_info_unauthed(pack_title_url)
-        if pack_info_unauthed:
-            self.author = pack_info_unauthed["result"]["artist"]
-
-        return pack_title, item_code
-
     def download_stickers_kakao(self) -> Tuple[int, int]:
         self.auth_token = None
         if self.opt_cred:
             self.auth_token = self.opt_cred.kakao_auth_token
 
         if urlparse(self.url).netloc == "emoticon.kakao.com":
-            self.pack_title, item_code = self.get_info_from_share_link(self.url)
+            item_code = None
+            if self.auth_token is not None:
+                hash = urlparse(self.url).path.split("/")[-1]
+                item_code = MetadataKakao.get_item_code_from_hash(hash, self.auth_token)
 
-            if item_code:
-                return self.download_animated(item_code)
-            self.cb.put("Download failed: Cannot download metadata for sticker pack")
-            return 0, 0
+            # Share link redirect to preview link if use desktop headers
+            # This allows us to find pack author
+            headers_desktop = {"User-Agent": "Chrome"}
+
+            r = requests.get(self.url, headers=headers_desktop, allow_redirects=True)
+
+            self.pack_title = urlparse(r.url).path.split("/")[-1]
+            pack_info_unauthed = MetadataKakao.get_pack_info_unauthed(self.pack_title)
+            if pack_info_unauthed is None:
+                self.cb.put(
+                    "Download failed: Cannot download metadata for sticker pack"
+                )
+                return 0, 0
+
+            self.author = pack_info_unauthed["result"]["artist"]
+            thumbnail_urls = pack_info_unauthed["result"]["thumbnailUrls"]
 
-        if self.url.isnumeric() or self.url.startswith("kakaotalk://store/emoticon/"):
-            item_code = self.url.replace("kakaotalk://store/emoticon/", "")
+            if item_code is None:
+                if self.auth_token is None:
+                    self.cb.put(
+                        "Warning: Downloading animated sticker requires auth_token"
+                    )
+                else:
+                    self.cb.put(
+                        "Warning: auth_token invalid, cannot download animated sticker"
+                    )
+                self.cb.put("Downloading static stickers...")
+                self.download_static(thumbnail_urls)
+            else:
+                return self.download_animated(item_code)
 
+        if self.url.isnumeric():
             self.pack_title = None
             if self.auth_token:
                 self.pack_info_authed = MetadataKakao.get_pack_info_authed(
-                    item_code, self.auth_token
+                    self.url, self.auth_token
                 )
                 if self.pack_info_authed:
                     self.pack_title = self.pack_info_authed["itemUnitInfo"][0]["title"]
@@ -182,7 +165,7 @@ class DownloadKakao(DownloadBase):
                     )
                     self.cb.put("Continuing without getting pack_title")
 
-            return self.download_animated(item_code)
+            return self.download_animated(self.url)
 
         if urlparse(self.url).netloc == "e.kakao.com":
             self.pack_title = urlparse(self.url).path.split("/")[-1]
@@ -201,7 +184,9 @@ class DownloadKakao(DownloadBase):
             thumbnail_urls = self.pack_info_unauthed["result"]["thumbnailUrls"]
 
             if self.auth_token:
-                item_code = MetadataKakao.get_item_code(title_ko, self.auth_token)
+                item_code = MetadataKakao.get_item_code_from_title(
+                    title_ko, self.auth_token
+                )
                 if item_code:
                     return self.download_animated(item_code)
                 msg = "Warning: Cannot get item code.\n"

{sticker_convert-2.11.8 → sticker_convert-2.12.0}/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]]:
+    def get_pack_info(self, url: str) -> Optional[Tuple[str, str, str]]:
         r = requests.get(url, allow_redirects=True)
         soup = BeautifulSoup(r.text, "html.parser")
 
@@ -41,10 +41,13 @@ class DownloadViber(DownloadBase):
         title = pack_dict["title"]
         first_sticker_url = cast(str, pack_dict["stickerFirstItemUrl"])
         zip_url = "/".join(first_sticker_url.split("/")[:-1]) + ".zip"
+        pack_id = pack_dict["id"].split(".")[-1]
 
-        return title, zip_url
+        return title, zip_url, pack_id
 
-    def decompress(self, zip_file: bytes) -> int:
+    def decompress(
+        self, zip_file: bytes, exts: Optional[Tuple[str, ...]] = None
+    ) -> int:
         with zipfile.ZipFile(BytesIO(zip_file)) as zf:
             self.cb.put("Unzipping...")
 
@@ -58,9 +61,14 @@ class DownloadViber(DownloadBase):
             )
 
             for sticker in zf_files:
+                ext = Path(sticker).suffix
+                if "frame" in sticker or ".db" in sticker or sticker.endswith("/"):
+                    continue
+                if exts is not None and ext not in exts:
+                    continue
                 num = sticker.split(".")[0][-2:].zfill(3)
                 data = zf.read(sticker)
-                ext = Path(sticker).suffix
+
                 self.cb.put(f"Read {sticker}")
 
                 out_path = Path(self.out_dir, num + ext)
@@ -76,10 +84,16 @@ class DownloadViber(DownloadBase):
         if pack_info is None:
             self.cb.put("Download failed: Cannot get pack info")
             return 0, 0
-        title, zip_url = pack_info
+        title, zip_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)
         zip_file = self.download_file(zip_url)
-        count = self.decompress(zip_file)
+        if anim_file:
+            count = self.decompress(anim_file, (".svg",))
+            count += self.decompress(zip_file, (".mp3",))
+        else:
+            count = self.decompress(zip_file, (".mp3", ".png"))
 
         MetadataHandler.set_metadata(self.out_dir, title=title)
 

{sticker_convert-2.11.8 → sticker_convert-2.12.0}/src/sticker_convert/resources/input.json

@@ -52,7 +52,7 @@
     "kakao": {
         "full_name": "Download from Kakao",
         "help": "Download kakao stickers from a URL / ID as input",
-        "example": "Example: https://e.kakao.com/t/xxxxx OR kakaotalk://store/emoticon/4404400\nOR https://emoticon.kakao.com/items/xxxxx OR 4404400",
+        "example": "Example: https://e.kakao.com/t/xxxxx \nOR https://emoticon.kakao.com/items/xxxxx OR 4404400",
         "address_lbls": "URL address / ID",
         "metadata_provides": {
             "title": true,