sticker-convert 2.8.13__tar.gz → 2.8.14__tar.gz

{sticker_convert-2.8.13/src/sticker_convert.egg-info → sticker_convert-2.8.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.13
+Version: 2.8.14
 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>
@@ -371,7 +371,6 @@ Requires-Dist: av~=12.1.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.5.1
 Requires-Dist: imagequant~=1.1.1
-Requires-Dist: js2py~=0.74
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4

{sticker_convert-2.8.13 → sticker_convert-2.8.14}/requirements.txt

@@ -5,7 +5,6 @@ av~=12.1.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.1
 imagequant~=1.1.1
-js2py~=0.74
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4

{sticker_convert-2.8.13 → sticker_convert-2.8.14}/src/sticker_convert/downloaders/download_kakao.py

@@ -3,13 +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 js2py  # type: ignore
 import requests
 from bs4 import BeautifulSoup
 from bs4.element import Tag
@@ -72,17 +72,39 @@ class MetadataKakao:
         js = js[func_start_pos:]
         bracket_start_pos = js.find("{")
         func_end_pos = search_bracket(js[bracket_start_pos:]) + bracket_start_pos
-        js = js[: func_end_pos + 1]
-        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]
+        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
 

{sticker_convert-2.8.13 → sticker_convert-2.8.14}/src/sticker_convert/version.py

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

{sticker_convert-2.8.13 → sticker_convert-2.8.14/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.13
+Version: 2.8.14
 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>
@@ -371,7 +371,6 @@ Requires-Dist: av~=12.1.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.5.1
 Requires-Dist: imagequant~=1.1.1
-Requires-Dist: js2py~=0.74
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4

{sticker_convert-2.8.13 → sticker_convert-2.8.14}/src/sticker_convert.egg-info/requires.txt

@@ -5,7 +5,6 @@ av~=12.1.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.1
 imagequant~=1.1.1
-js2py~=0.74
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4