sticker-convert 2.8.13__py3-none-any.whl → 2.8.14__py3-none-any.whl

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

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

{sticker_convert-2.8.13.dist-info → sticker_convert-2.8.14.dist-info}/METADATA

@@ -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.dist-info → sticker_convert-2.8.14.dist-info}/RECORD

@@ -6,10 +6,10 @@ sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjt
 sticker_convert/gui.py,sha256=TRPGwMhSMPHnZppHmw2OWHKTJtGoeLpGWD0eRYi4_yk,30707
 sticker_convert/job.py,sha256=vKv1--y4MVmZV_IBpUhEfNEiUeEqrTR1umzlALPXKdw,25775
 sticker_convert/job_option.py,sha256=JHAFCxp7-dDwD-1PbpYLAFRF3OoJu8cj_BjOm5r8Gp8,7732
-sticker_convert/version.py,sha256=9-pwqpZSBU0RJFweDIiL0yO5EXYfWSFjeU-Fw26RIA4,47
+sticker_convert/version.py,sha256=xfnmuNP-PsbPT9tAIe1hZe8BVTotwNbxoJXlFmvcuP4,47
 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=d0950G_Nqpb9cCWgVKVJBtSNFSykv5zrye0uqHAGenY,14193
+sticker_convert/downloaders/download_kakao.py,sha256=hHilDDzYaGU5BQmOwMF0NKnsysxh8loybfoFSNQQdSw,14955
 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
@@ -93,9 +93,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=Xf94jyqk_6M9IlFGMy0wYIgQKn_yg00nD4XW0CgAbew,5732
-sticker_convert-2.8.13.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.8.13.dist-info/METADATA,sha256=7GSocwPMQW299PlQZ9BHiA5LGu-Je1_UfMyh3uBbZ-Q,50404
-sticker_convert-2.8.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sticker_convert-2.8.13.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.8.13.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.8.13.dist-info/RECORD,,
+sticker_convert-2.8.14.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.8.14.dist-info/METADATA,sha256=oMOCYbDpT4foe2pN0gsrfAAG1DASm8ak3uUjc9tpCpA,50376
+sticker_convert-2.8.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sticker_convert-2.8.14.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.8.14.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.8.14.dist-info/RECORD,,