sticker-convert 2.9.1__py3-none-any.whl → 2.9.3__py3-none-any.whl

sticker_convert/downloaders/download_base.py

@@ -92,10 +92,10 @@ class DownloadBase:
                 response = requests.get(
                     url, stream=True, allow_redirects=True, **kwargs
                 )
-                total_length = int(response.headers.get("content-length"))  # type: ignore
-
                 if not response.ok:
                     return b""
+                total_length = int(response.headers.get("content-length"))  # type: ignore
+
                 self.cb.put(f"Downloading {url}")
 
                 if show_progress:

sticker_convert/downloaders/download_kakao.py

@@ -3,16 +3,13 @@ from __future__ import annotations
 
 import itertools
 import json
-import re
-import zipfile
-from io import BytesIO
 from pathlib import Path
 from typing import Any, List, Optional, Tuple, cast
 from urllib.parse import urlparse
 
 import requests
 from bs4 import BeautifulSoup
-from bs4.element import Tag
+from py_mini_racer import MiniRacer
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
@@ -20,94 +17,27 @@ 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
 
-
-def search_bracket(text: str, open_bracket: str = "{", close_bracket: str = "}") -> int:
-    depth = 0
-    is_str = False
-
-    for count, char in enumerate(text):
-        if char == '"':
-            is_str = not is_str
-
-        if is_str is False:
-            if char == open_bracket:
-                depth += 1
-            elif char == close_bracket:
-                depth -= 1
-
-        if depth == 0:
-            return count
-
-    return -1
+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 MetadataKakao:
-    @staticmethod
-    def get_info_from_share_link(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
-
-        app_scheme_link_tag = soup.find("a", id="app_scheme_link")  # type: ignore
-        assert isinstance(app_scheme_link_tag, Tag)
-
-        item_code_fake = cast(str, app_scheme_link_tag["data-i"])
-
-        js = ""
-        for script_tag in soup.find_all("script"):
-            js = script_tag.string
-            if js and "emoticonDeepLink" in js:
-                break
-        if "emoticonDeepLink" not in js:
-            return None, None
-
-        func_start_pos = js.find("function emoticonDeepLink(")
-        js = js[func_start_pos:]
-        bracket_start_pos = js.find("{")
-        func_end_pos = search_bracket(js[bracket_start_pos:]) + bracket_start_pos
-        js = js[bracket_start_pos + 1 : func_end_pos]
-        js = js.split(";")[0]
-
-        minus_num_regex = re.search(r"\-(.*?)\^", js)
-        if not minus_num_regex:
-            return None, None
-        minus_num_str = minus_num_regex.group(1)
-        if not minus_num_str.isnumeric():
-            return None, None
-        minus_num = int(minus_num_str)
-
-        xor_num_regex = re.search(r"\^(.*?)\)", js)
-        if not xor_num_regex:
-            return None, None
-        xor_num_str = xor_num_regex.group(1)
-        if not xor_num_str.isnumeric():
-            return None, None
-        xor_num = int(xor_num_str)
-
-        item_code = str(int(item_code_fake) - minus_num ^ xor_num)
-
-        # https://github.com/Nuitka/Nuitka/issues/385
-        # js2py not working if compiled by nuitka
-        # web2app_start_pos = js.find("daumtools.web2app(")
-        # js = js[:web2app_start_pos] + "return a;}"
-        # get_item_code = js2py.eval_js(js)  # type: ignore
-        # kakao_scheme_link = cast(
-        #     str,
-        #     get_item_code(
-        #         "kakaotalk://store/emoticon/${i}?referer=share_link", item_code_fake
-        #     ),
-        # )
-        # item_code = urlparse(kakao_scheme_link).path.split("/")[-1]
-
-        return pack_title, item_code
-
     @staticmethod
     def get_item_code(title_ko: str, auth_token: str) -> Optional[str]:
         headers = {
@@ -177,15 +107,41 @@ 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]
+
+        return pack_title, item_code
+
     def download_stickers_kakao(self) -> bool:
         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 = MetadataKakao.get_info_from_share_link(
-                self.url
-            )
+            self.pack_title, item_code = self.get_info_from_share_link(self.url)
 
             if item_code:
                 return self.download_animated(item_code)
@@ -268,14 +224,6 @@ class DownloadKakao(DownloadBase):
             self.out_dir, title=self.pack_title, author=self.author
         )
 
-        success = self.download_animated_zip(item_code)
-        if not success:
-            self.cb.put("Trying to download one by one")
-            success = self.download_animated_files(item_code)
-
-        return success
-
-    def download_animated_files(self, item_code: str) -> bool:
         play_exts = [".webp", ".gif", ".png", ""]
         play_types = ["emot", "emoji", ""]  # emot = normal; emoji = mini
         play_path_format = None
@@ -376,46 +324,6 @@ class DownloadKakao(DownloadBase):
 
         return True
 
-    def download_animated_zip(self, item_code: str) -> bool:
-        pack_url = f"http://item.kakaocdn.net/dw/{item_code}.file_pack.zip"
-
-        zip_file = self.download_file(pack_url)
-        if zip_file:
-            self.cb.put(f"Downloaded {pack_url}")
-        else:
-            self.cb.put(f"Cannot download {pack_url}")
-            return False
-
-        with zipfile.ZipFile(BytesIO(zip_file)) as zf:
-            self.cb.put("Unzipping...")
-            self.cb.put(
-                (
-                    "bar",
-                    None,
-                    {"set_progress_mode": "determinate", "steps": len(zf.namelist())},
-                )
-            )
-
-            for num, f_path in enumerate(sorted(zf.namelist())):
-                ext = Path(f_path).suffix
-
-                if ext in (".gif", ".webp"):
-                    data = DecryptKakao.xor_data(zf.read(f_path))
-                    self.cb.put(f"Decrypted {f_path}")
-                else:
-                    data = zf.read(f_path)
-                    self.cb.put(f"Read {f_path}")
-
-                out_path = Path(self.out_dir, str(num).zfill(3) + ext)
-                with open(out_path, "wb") as f:
-                    f.write(data)
-
-                self.cb.put("update_bar")
-
-        self.cb.put(f"Finished getting {pack_url}")
-
-        return True
-
     @staticmethod
     def start(
         url: str,

sticker_convert/gui_components/frames/cred_frame.py

@@ -181,3 +181,5 @@ class CredFrame(LabelFrame):
         self.kakao_get_auth_btn.config(state=state)
         self.line_cookies_entry.config(state=state)
         self.line_get_auth_btn.config(state=state)
+        self.viber_auth_lbl.config(state=state)
+        self.viber_auth_entry.config(state=state)

sticker_convert/version.py

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

{sticker_convert-2.9.1.dist-info → sticker_convert-2.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.9.1
+Version: 2.9.3
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -367,17 +367,18 @@ License-File: LICENSE
 Requires-Dist: aiolimiter ~=1.1.0
 Requires-Dist: anyio ~=4.4.0
 Requires-Dist: apngasm-python ~=1.3.1
-Requires-Dist: av ~=12.1.0
+Requires-Dist: av ~=12.2.0
 Requires-Dist: beautifulsoup4 ~=4.12.3
-Requires-Dist: rookiepy ~=0.5.1
+Requires-Dist: rookiepy ~=0.5.2
 Requires-Dist: imagequant ~=1.1.1
 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 ~=10.3.0
+Requires-Dist: Pillow ~=10.4.0
 Requires-Dist: pyoxipng ~=9.0.0
 Requires-Dist: python-telegram-bot ~=21.3
-Requires-Dist: psutil ~=5.9.8
+Requires-Dist: psutil ~=6.0.0
 Requires-Dist: PyMemoryEditor ~=1.5.22
 Requires-Dist: requests ~=2.32.3
 Requires-Dist: rlottie-python ~=1.3.6
@@ -392,7 +393,7 @@ Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
 
 - A python script for creating, downloading, converting+compressing and uploading stickers from multiple instant messaging applications.
 - With GUI and CLI that runs on Windows, MacOS and Linux
-- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber (Download only), iMessage (Create Xcode sticker pack project)
+- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber, iMessage (Create Xcode sticker pack project)
 - Supports static and animated stickers, with transparency support
 
 ## Downloads
@@ -430,7 +431,7 @@ Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
 | [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)            |
-| [Viber](docs/guide_viber.md)          | ✅                                  | 🚫 (Manually upload through Viber app)             |
+| [Viber](docs/guide_viber.md)          | ✅                                  | ✅ (Require `viber_auth`)                          |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload) |
 
 ✅ = Supported ⭕ = Partially supported 🚫 = Not supported
@@ -459,7 +460,7 @@ Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
     - 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`)
-    - Upload: The program can convert images to png with 490x490 for uploading to viber manually. It should be noted that Viber is able to resize images for you, so it may not be necessary to use sticker-convert for creating Viber sticker pack.
+    - Upload: Supported. Viber authentication data required for uploading Viber stickers, which could be fetched from Viber Desktop application automatically.
 - iMessage
     - Download: Not supported.
     - Upload: The program can create Xcode project for iMessage sticker pack, which could then be compiled and sideloaded using Xcode.

{sticker_convert-2.9.1.dist-info → sticker_convert-2.9.3.dist-info}/RECORD

@@ -6,10 +6,10 @@ sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjt
 sticker_convert/gui.py,sha256=hZOp2SyEYKbCRm9SRTItBqEk724SHtSqK_Txo0wpL8Q,31194
 sticker_convert/job.py,sha256=4C2WwB3PFldacqI8UPnM10thM087VLEl9wn6P9_LtS0,26128
 sticker_convert/job_option.py,sha256=yFwHEhW8Gzp9dfiXakkCREfejAIJhiOxwD4Wlg9jcPk,7805
-sticker_convert/version.py,sha256=baBhLdXSz6WrhsijOG00KYOzp3-KSIDIG59dfAQPMrQ,46
+sticker_convert/version.py,sha256=-3orOmwxQLXzeq93BjsCFkrDamN1_r5Ng80gy5-PF0w,46
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sticker_convert/downloaders/download_base.py,sha256=x18bI2mPpbXRnSmStBHEb1IvN-VPCilOHLQUs6YPUEU,4041
-sticker_convert/downloaders/download_kakao.py,sha256=TCygK-LiSkk3yEYZymZsHVwtW5JmQX6JeIneh25XxFA,14984
+sticker_convert/downloaders/download_base.py,sha256=WGEtri16p6GCG7hhQ603pKS8efoB72oCBHTuJ_RVmG0,4041
+sticker_convert/downloaders/download_kakao.py,sha256=kE3LikphcFrFjAf-eJhmkj0Ko_JG9QpWFTp_YiWEzRA,11605
 sticker_convert/downloaders/download_line.py,sha256=9WzOWujTbZdAqBi52k21OUEfRmcV1loCaJiDmg6dklw,17853
 sticker_convert/downloaders/download_signal.py,sha256=PfwscdbcEd_5C3Ecs0F8Qc8si1sLzLodAdnsHVwXgac,3063
 sticker_convert/downloaders/download_telegram.py,sha256=jufMqc78aXOPDr7fQf9ykkNyhQ7KVCp4gRBxs09NgMo,4614
@@ -20,7 +20,7 @@ sticker_convert/gui_components/frames/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 sticker_convert/gui_components/frames/comp_frame.py,sha256=9k_UntKKi2G_g0byzoj1rdTqOq7q9mcnXiy799bYnr0,7257
 sticker_convert/gui_components/frames/config_frame.py,sha256=b3X4QAnGpde0OhthXHmjSyU_Yb5tYRUFXmy04Yi8Zmo,4316
 sticker_convert/gui_components/frames/control_frame.py,sha256=_XiOJ9JPUfiysDghGG04sEVLrXG9TMVlDZ60W0LhYVI,835
-sticker_convert/gui_components/frames/cred_frame.py,sha256=QCAmDfSgL-ykGxPsL_9kWFssbtVdrh17IWW28oxzdDg,7429
+sticker_convert/gui_components/frames/cred_frame.py,sha256=AJHxxBdEa-xOteevVBsSfAHtcJklU3pu2TqvZny9o4w,7527
 sticker_convert/gui_components/frames/input_frame.py,sha256=5Vz1d6J1jkofvvzm43DxeIW_CjWfxa2QPYFnkAAiAfM,5040
 sticker_convert/gui_components/frames/output_frame.py,sha256=n2WLk22h61DoZli8WbFhd-h2CqWAebDXnBa051JBuOc,4260
 sticker_convert/gui_components/frames/progress_frame.py,sha256=LWUZg_iL7iiNTfu7N5Ct_pklZdghxihENi7DP9YozOE,4915
@@ -98,9 +98,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=1QfW3wgZ5vOk7T4XtLHYvJK1x8RbASRPSvhKEPkcu9A,15747
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=MH68GLJfXeL8WFT8emtj355K5BLAtUX64tQ59nugx2c,5673
-sticker_convert-2.9.1.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.9.1.dist-info/METADATA,sha256=Sim5kcFjuwRWedkvQhuAIyCMmpYRQ-bA3cAIqQiZuFw,51091
-sticker_convert-2.9.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sticker_convert-2.9.1.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.9.1.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.9.1.dist-info/RECORD,,
+sticker_convert-2.9.3.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.9.3.dist-info/METADATA,sha256=AhL6yrezU5-qhw5E2euXRDGz9fRplznnme-gVs4O0bo,51023
+sticker_convert-2.9.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+sticker_convert-2.9.3.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.9.3.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.9.3.dist-info/RECORD,,

{sticker_convert-2.9.1.dist-info → sticker_convert-2.9.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any