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

sticker_convert/job.py

@@ -12,6 +12,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
 from urllib.parse import urlparse
 
 from sticker_convert.converter import StickerConvert
+from sticker_convert.downloaders.download_band import DownloadBand
 from sticker_convert.downloaders.download_discord import DownloadDiscord
 from sticker_convert.downloaders.download_kakao import DownloadKakao
 from sticker_convert.downloaders.download_line import DownloadLine
@@ -28,6 +29,7 @@ from sticker_convert.utils.callback import CallbackReturn, CbQueueType, ResultsL
 from sticker_convert.utils.files.json_resources_loader import OUTPUT_JSON
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
+from sticker_convert.utils.singletons import singletons
 
 
 class Executor:
@@ -136,6 +138,7 @@ class Executor:
 
         work_queue.put(None)
         cb_queue.put("__PROCESS_DONE__")
+        singletons.close()
 
     def start_workers(self, processes: int = 1) -> None:
         self.cb_thread_instance = Thread(
@@ -564,6 +567,9 @@ class Job:
         if self.opt_input.option == "kakao":
             downloaders.append(DownloadKakao.start)
 
+        if self.opt_input.option == "band":
+            downloaders.append(DownloadBand.start)
+
         if self.opt_input.option == "viber":
             downloaders.append(DownloadViber.start)
 

sticker_convert/job_option.py

@@ -75,6 +75,7 @@ class CompOption(BaseOption):
     fake_vid: Optional[bool] = None
     quantize_method: Optional[str] = None
     scale_filter: Optional[str] = None
+    chromium_path: Optional[str] = None
     cache_dir: Optional[str] = None
     default_emoji: str = "😀"
     no_compress: Optional[bool] = None
@@ -109,6 +110,7 @@ class CompOption(BaseOption):
             "fake_vid": self.fake_vid,
             "quantize_method": self.quantize_method,
             "scale_filter": self.scale_filter,
+            "chromium_path": self.chromium_path,
             "cache_dir": self.cache_dir,
             "default_emoji": self.default_emoji,
             "no_compress": self.no_compress,

sticker_convert/resources/compression.json

@@ -328,6 +328,53 @@
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
+    "band": {
+        "size_max": {
+            "img": 0,
+            "vid": 0
+        },
+        "format": {
+            "img": ".png",
+            "vid": ".png"
+        },
+        "fps": {
+            "min": 1,
+            "max": 30,
+            "power": -0.5
+        },
+        "res": {
+            "w": {
+                "min": 100,
+                "max": 370
+            },
+            "h": {
+                "min": 100,
+                "max": 320
+            },
+            "power": 3
+        },
+        "quality": {
+            "min": 10,
+            "max": 95,
+            "power": 5
+        },
+        "color": {
+            "min": 32,
+            "max": 257,
+            "power": 3
+        },
+        "duration": {
+            "min": 83,
+            "max": 4000
+        },
+        "padding_percent": 0,
+        "bg_color": "",
+        "steps": 16,
+        "fake_vid": false,
+        "scale_filter": "bicubic",
+        "quantize_method": "imagequant",
+        "default_emoji": "😀"
+    },
     "viber": {
         "size_max": {
             "img": 0,

sticker_convert/resources/help.json

@@ -52,6 +52,7 @@
         "scale_filter": "Set scale filter. Default as bicubic. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n- box = Similar to nearest, but better downscaling\n- bilinear = Linear interpolation\n- hamming = Similar to bilinear, but better downscaling\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
         "quantize_method": "Set method for quantizing image. Default as imagequant. Valid options are:\n- imagequant = Best quality but slow\n- fastoctree = Fast but image looks chunky\n- none = No image quantizing, large image size as result",
         "cache_dir": "Set custom cache directory.\nUseful for debugging, or speed up conversion if cache_dir is on RAM disk.",
+        "chromium_path": "Set Chromium(-based)/Chrome browser path.\nRequired for converting from SVG files.\nLeave blank to auto detect",
         "default_emoji": "Set the default emoji for uploading Signal and Telegram sticker packs."
     },
     "cred": {

sticker_convert/resources/input.json

@@ -59,6 +59,16 @@
             "author": true
         }
     },
+    "band": {
+        "full_name": "Download from Naver Band",
+        "help": "Download Naver Band stickers from a URL / ID as input",
+        "example": "Example: https://www.band.us/sticker/xxxx OR 2535",
+        "address_lbls": "URL address / ID",
+        "metadata_provides": {
+            "title": true,
+            "author": false
+        }
+    },
     "viber": {
         "full_name": "Download from Viber",
         "help": "Download viber stickers from a URL as input",

sticker_convert/resources/memdump_linux.sh

@@ -7,7 +7,6 @@ PID=$1
 PID_MAPS=/proc/$PID/maps
 PID_MEM=/proc/$PID/mem
 
-rm -f /tmp/viber.dmp.$PID
 grep rw-p $PID_MAPS |
 while IFS='' read -r line || [[ -n "$line" ]]; do
     range=`echo $line | awk '{print $1;}'`

sticker_convert/utils/auth/get_discord_auth.py

@@ -13,7 +13,7 @@ from sticker_convert.utils.process import killall
 
 
 class GetDiscordAuth:
-    def __init__(self, cb_msg: Callable[..., None] = print):
+    def __init__(self, cb_msg: Callable[..., None] = print) -> None:
         chromedriver_download_dir = CONFIG_DIR / "bin"
         os.makedirs(chromedriver_download_dir, exist_ok=True)
 

sticker_convert/utils/auth/get_kakao_desktop_auth.py

@@ -18,21 +18,33 @@ then login to Kakao Desktop and try again."""
 MSG_NO_AUTH = """Kakao Desktop installed,
 but kakao_auth not found.
 Please login to Kakao Desktop and try again."""
+MSG_SIP_ENABLED = """You need to disable SIP:
+1. Restart computer in Recovery mode
+2. Launch Terminal from the Utilities menu
+3. Run the command `csrutil disable`
+4. Restart your computer"""
 MSG_LAUNCH_FAIL = "Failed to launch Kakao"
 MSG_PERMISSION_ERROR = "Failed to read Kakao process memory"
-MSG_UNSUPPORTED = "Only Windows is supported for this method"
 
 
 class GetKakaoDesktopAuth:
-    def __init__(self, cb_ask_str: Callable[..., str] = input):
+    def __init__(self, cb_ask_str: Callable[..., str] = input) -> None:
         self.cb_ask_str = cb_ask_str
 
+    def launch_kakao(self, kakao_bin_path: str) -> None:
+        if platform.system() == "Windows":
+            subprocess.Popen([kakao_bin_path])
+        elif platform.system() == "Darwin":
+            subprocess.Popen(["open", kakao_bin_path])
+        else:
+            subprocess.Popen(["wine", kakao_bin_path])
+
     def relaunch_kakao(self, kakao_bin_path: str) -> Optional[int]:
         killed = killall("kakaotalk")
         if killed:
             time.sleep(5)
 
-        subprocess.Popen([kakao_bin_path])
+        self.launch_kakao(kakao_bin_path)
         time.sleep(20)
 
         return find_pid_by_name("kakaotalk")
@@ -54,7 +66,7 @@ class GetKakaoDesktopAuth:
         try:
             with OpenProcess(pid=int(kakao_pid)) as process:
                 for address in process.search_by_value(  # type: ignore
-                    str, 15, "\x00authorization\x00"
+                    str, 15, "authorization: "
                 ):
                     auth_token_addr = cast(int, address) + 15
                     auth_token_bytes = process.read_process_memory(
@@ -127,11 +139,77 @@ class GetKakaoDesktopAuth:
 
             return auth_token, msg
 
-    def get_kakao_desktop(self) -> Optional[str]:
-        kakao_bin_path = os.path.expandvars(
-            "%programfiles(x86)%\\Kakao\\KakaoTalk\\KakaoTalk.exe"
+    def get_auth_darwin(self, kakao_bin_path: str) -> Tuple[Optional[str], str]:
+        killall("kakaotalk")
+
+        subprocess.run(
+            [
+                "lldb",
+                kakao_bin_path,
+                "-o",
+                "b ptrace",
+                "-o",
+                "r",
+                "-o",
+                "thread return",
+                "-o",
+                "con",
+                "-o",
+                "process save-core /tmp/memdump.kakaotalk.dmp",
+                "-o",
+                "con",
+                "-o",
+                "quit",
+            ],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
         )
-        if Path(kakao_bin_path).is_file():
+
+        with open("/tmp/memdump.kakaotalk.dmp", "rb") as f:
+            mem = f.read()
+
+        os.remove("/tmp/memdump.kakaotalk.dmp")
+
+        auth_token = None
+        for i in re.finditer(b"]mac/", mem):
+            auth_token_term = i.start()
+
+            auth_token_bytes = mem[auth_token_term - 200 : auth_token_term]
+            auth_token_start = auth_token_bytes.find(b"application/json_\x10\x8a") + 19
+            if auth_token_start == -1:
+                continue
+            try:
+                auth_token_candidate = auth_token_bytes[auth_token_start:].decode(
+                    encoding="ascii"
+                )
+            except UnicodeDecodeError:
+                continue
+
+            if 150 > len(auth_token_candidate) > 100:
+                auth_token = auth_token_candidate
+                break
+
+        if auth_token is None:
+            return None, MSG_NO_AUTH
+        else:
+            msg = "Got auth_token successfully:\n"
+            msg += f"{auth_token=}\n"
+
+            return auth_token, msg
+
+    def get_kakao_desktop(self) -> Optional[str]:
+        if platform.system() == "Windows":
+            kakao_bin_path = os.path.expandvars(
+                "%programfiles(x86)%\\Kakao\\KakaoTalk\\KakaoTalk.exe"
+            )
+        elif platform.system() == "Darwin":
+            kakao_bin_path = "/Applications/KakaoTalk.app"
+        else:
+            kakao_bin_path = os.path.expanduser(
+                "~/.wine/drive_c/Program Files (x86)/Kakao/KakaoTalk/KakaoTalk.exe"
+            )
+
+        if Path(kakao_bin_path).exists():
             return kakao_bin_path
 
         return None
@@ -140,15 +218,6 @@ class GetKakaoDesktopAuth:
         self,
         kakao_bin_path: Optional[str] = None,
     ) -> Tuple[Optional[str], str]:
-        if platform.system() != "Windows":
-            return None, MSG_UNSUPPORTED
-
-        if not kakao_bin_path:
-            kakao_bin_path = self.get_kakao_desktop()
-
-        if not kakao_bin_path:
-            return None, MSG_NO_BIN
-
         # get_auth_by_dump()
         # + Fast
         # - Requires admin
@@ -158,23 +227,38 @@ class GetKakaoDesktopAuth:
         # - Slow
         # - Cannot run on macOS
 
-        # If admin, prefer get_auth_by_dump() over get_auth_by_pme(), vice versa
-        methods: List[Callable[[str, bool], Tuple[Optional[str], str]]] = []
-        relaunch = True
-        kakao_auth = None
-        msg = ""
-
-        pme_present = importlib.util.find_spec("PyMemoryEditor") is not None
-        methods.append(self.get_auth_by_dump)
-        if pme_present:
-            methods.append(self.get_auth_by_pme)
-        if check_admin() is False:
-            methods.reverse()
-
-        for method in methods:
-            kakao_auth, msg = method(kakao_bin_path, relaunch)
-            relaunch = False
-            if kakao_auth is not None:
-                break
+        if not kakao_bin_path:
+            kakao_bin_path = self.get_kakao_desktop()
+
+        if not kakao_bin_path:
+            return None, MSG_NO_BIN
+
+        if platform.system() != "Darwin":
+            # If admin, prefer get_auth_by_dump() over get_auth_by_pme(), vice versa
+            methods: List[Callable[[str, bool], Tuple[Optional[str], str]]] = []
+            relaunch = True
+            kakao_auth = None
+            msg = ""
+
+            pme_present = importlib.util.find_spec("PyMemoryEditor") is not None
+            methods.append(self.get_auth_by_dump)
+            if pme_present:
+                methods.append(self.get_auth_by_pme)
+            if check_admin() is False:
+                methods.reverse()
+
+            for method in methods:
+                kakao_auth, msg = method(kakao_bin_path, relaunch)
+                relaunch = False
+                if kakao_auth is not None:
+                    break
+        else:
+            csrutil_status = subprocess.run(
+                ["csrutil", "status"], capture_output=True, text=True
+            ).stdout
+
+            if "enabled" in csrutil_status:
+                return None, MSG_SIP_ENABLED
+            kakao_auth, msg = self.get_auth_darwin(kakao_bin_path)
 
         return kakao_auth, msg

sticker_convert/utils/auth/get_signal_auth.py

@@ -17,7 +17,7 @@ class GetSignalAuth:
         self,
         cb_msg: Callable[..., None] = print,
         cb_ask_str: Callable[..., str] = input,
-    ):
+    ) -> None:
         chromedriver_download_dir = CONFIG_DIR / "bin"
         os.makedirs(chromedriver_download_dir, exist_ok=True)
 
@@ -26,7 +26,7 @@ class GetSignalAuth:
         self.cb_ask_str = cb_ask_str
         self.cb_msg = cb_msg
 
-    def download_signal_desktop(self):
+    def download_signal_desktop(self) -> None:
         download_url = "https://signal.org/en/download/"
 
         webbrowser.open(download_url)

sticker_convert/utils/auth/get_viber_auth.py

@@ -28,7 +28,7 @@ MSG_PERMISSION_ERROR = "Failed to read Viber process memory"
 
 
 class GetViberAuth:
-    def __init__(self, cb_ask_str: Callable[..., str] = input):
+    def __init__(self, cb_ask_str: Callable[..., str] = input) -> None:
         self.cb_ask_str = cb_ask_str
 
     def relaunch_viber(self, viber_bin_path: str) -> Optional[int]:

sticker_convert/utils/auth/telethon_setup.py

@@ -22,7 +22,9 @@ Continue when done"""
 
 
 class TelethonSetup:
-    def __init__(self, opt_cred: CredOption, cb_ask_str: Callable[..., str] = input):
+    def __init__(
+        self, opt_cred: CredOption, cb_ask_str: Callable[..., str] = input
+    ) -> None:
         self.cb_ask_str = cb_ask_str
         self.opt_cred = opt_cred
 

sticker_convert/utils/chrome_remotedebug.py

@@ -5,12 +5,12 @@ import json
 import os
 import platform
 import shutil
+import signal
 import socket
 import subprocess
 import time
 from typing import Any, Dict, List, Optional, Tuple, Union, cast
 
-import browsers  # type: ignore
 import requests
 import websocket
 from PIL import Image
@@ -50,7 +50,7 @@ class CRD:
         chrome_bin: str,
         port: Optional[int] = None,
         args: Optional[List[str]] = None,
-    ):
+    ) -> None:
         if port is None:
             port = get_free_port()
         self.port = port
@@ -84,6 +84,14 @@ class CRD:
 
     @staticmethod
     def get_chrome_path() -> Optional[str]:
+        import logging
+
+        import browsers  # type: ignore
+
+        # browsers module would turn on info logging
+        logger = logging.getLogger()
+        logger.setLevel(logging.CRITICAL)
+
         bs: List[Tuple[int, str]] = []
         for b in browsers.browsers():
             browser_type = b["browser_type"]
@@ -98,7 +106,7 @@ class CRD:
         bs = sorted(bs, key=lambda x: x[0])
         return bs[0][1]
 
-    def connect(self, target_id: int = 0):
+    def connect(self, target_id: int = 0) -> None:
         self.cmd_id = 1
         r = None
         targets: List[Any] = []
@@ -137,7 +145,7 @@ class CRD:
 
         raise RuntimeError("Websocket keep disconnecting")
 
-    def exec_js(self, js: str, context_id: Optional[int] = None):
+    def exec_js(self, js: str, context_id: Optional[int] = None) -> Union[str, bytes]:
         command: Dict[str, Any] = {
             "id": self.cmd_id,
             "method": "Runtime.evaluate",
@@ -155,11 +163,11 @@ class CRD:
         }
         return self.send_cmd(command)
 
-    def screenshot(self, clip: Optional[Dict[str, int]] = None):
+    def screenshot(self, clip: Optional[Dict[str, int]] = None) -> Image.Image:
         command: Dict[str, Any] = {
             "id": self.cmd_id,
             "method": "Page.captureScreenshot",
-            "params": {},
+            "params": {"captureBeyondViewport": True, "optimizeForSpeed": True},
         }
         if clip:
             command["params"]["clip"] = clip
@@ -174,11 +182,11 @@ class CRD:
             str, json.loads(r).get("result", {}).get("result", {}).get("value", "")
         )
 
-    def navigate(self, url: str):
+    def navigate(self, url: str) -> None:
         command = {"id": self.cmd_id, "method": "Page.navigate", "params": {"url": url}}
         self.send_cmd(command)
 
-    def open_html_str(self, html: str):
+    def open_html_str(self, html: str) -> None:
         command: Dict[str, Any] = {
             "id": self.cmd_id,
             "method": "Page.navigate",
@@ -198,24 +206,28 @@ class CRD:
         }
         self.send_cmd(command)
 
-    def runtime_enable(self):
+    def runtime_enable(self) -> None:
         command = {
             "method": "Runtime.enable",
         }
         self.send_cmd(command)
 
-    def runtime_disable(self):
+    def runtime_disable(self) -> None:
         command = {
             "method": "Runtime.disable",
         }
         self.send_cmd(command)
 
-    def reload(self):
+    def reload(self) -> None:
         command = {
             "method": "Page.reload",
         }
         self.send_cmd(command)
 
-    def close(self):
+    def close(self) -> None:
+        command = {
+            "method": "Browser.close",
+        }
+        self.send_cmd(command)
         self.ws.close()
-        self.chrome_proc.kill()
+        os.kill(self.chrome_proc.pid, signal.SIGTERM)

sticker_convert/utils/media/codec_info.py

@@ -20,7 +20,7 @@ from sticker_convert.definitions import SVG_DEFAULT_HEIGHT, SVG_DEFAULT_WIDTH, S
 warnings.filterwarnings("ignore", category=XMLParsedAsHTMLWarning)
 
 
-def lcm(a: int, b: int):
+def lcm(a: int, b: int) -> int:
     return abs(a * b) // gcd(a, b)
 
 

sticker_convert/utils/singletons.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+from typing import Any, Dict, Protocol
+
+
+class SingletonProtocol(Protocol):
+    def close(self) -> Any: ...
+
+
+class Singletons:
+    def __init__(self) -> None:
+        self.objs: Dict[str, SingletonProtocol] = {}
+
+    def close(self) -> None:
+        for obj in self.objs.values():
+            obj.close()
+
+
+singletons = Singletons()

sticker_convert/utils/url_detect.py

@@ -25,6 +25,9 @@ class UrlDetect:
         if domain in ("e.kakao.com", "emoticon.kakao.com"):
             return "kakao"
 
+        if domain == "www.band.us":
+            return "band"
+
         if domain == "stickers.viber.com":
             return "viber"
 

sticker_convert/version.py

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