sticker-convert 2.12.4__py3-none-any.whl → 2.13.1.0__py3-none-any.whl

sticker_convert/gui_components/windows/viber_get_auth_window.py

@@ -59,10 +59,25 @@ class ViberGetAuthWindow(BaseWindow):
                 justify="left",
                 anchor="w",
             )
+        if platform.system() != "Darwin":
+            self.explanation_lbl3 = Label(
+                self.frame_info,
+                text="Note: This will download ProcDump and read memory of Viber Desktop",
+                justify="left",
+                anchor="w",
+            )
+        else:
+            self.explanation_lbl3 = Label(
+                self.frame_info,
+                text="Note: This will read memory of Viber Desktop",
+                justify="left",
+                anchor="w",
+            )
 
         self.explanation_lbl0.grid(column=0, row=0, sticky="w", padx=3, pady=3)
         self.explanation_lbl1.grid(column=0, row=1, sticky="w", padx=3, pady=3)
         self.explanation_lbl2.grid(column=0, row=2, sticky="w", padx=3, pady=3)
+        self.explanation_lbl3.grid(column=0, row=3, sticky="w", padx=3, pady=3)
 
         # Start button frame
         self.launch_btn = Button(
@@ -109,7 +124,7 @@ class ViberGetAuthWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_get_cred(self):
+    def cb_get_cred(self) -> None:
         Thread(target=self.cb_get_cred_thread, daemon=True).start()
 
     def cb_get_cred_thread(self) -> None:

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/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

@@ -64,7 +64,7 @@
         "telethon_setup": "Setup Telethon",
         "kakao_auth_token": "Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx",
         "kakao_get_auth": "Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.",
-        "kakao_get_auth_desktop": "Get Kakao auth_token from Kakao Desktop application.\n(Only working on Windows.)",
+        "kakao_get_auth_desktop": "Get Kakao auth_token from Kakao Desktop application.",
         "kakao_bin_path": "Set Kakao Desktop application path for launching and getting auth_token.\nUseful for portable installation.",
         "kakao_username": "Set Kakao username, which is email or phone number used for signing up Kakao account\nExample: +447700900142\nRequired for generating Kakao auth_token.",
         "kakao_password": "Set Kakao password (Password of Kakao account).\nRequired for generating Kakao auth_token.",

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)
 
@@ -72,7 +72,7 @@ class GetDiscordAuth:
         if chrome_path is not None:
             using_discord_app = True
         else:
-            chrome_path = CRD.get_chrome_path()
+            chrome_path = CRD.get_chromium_path()
         if chrome_path is None:
             return (
                 None,

sticker_convert/utils/auth/get_kakao_desktop_auth.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-import importlib.util
 import os
 import platform
 import re
@@ -8,9 +7,9 @@ import time
 from functools import partial
 from getpass import getpass
 from pathlib import Path
-from typing import Callable, List, Optional, Tuple, cast
+from typing import Callable, Optional, Tuple, Union, cast
 
-from sticker_convert.utils.process import check_admin, find_pid_by_name, get_mem, killall
+from sticker_convert.utils.process import find_pid_by_name, get_mem, killall
 
 MSG_NO_BIN = """Kakao Desktop not detected.
 Download and install Kakao Desktop,
@@ -28,10 +27,10 @@ MSG_PERMISSION_ERROR = "Failed to read Kakao process memory"
 
 
 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):
+    def launch_kakao(self, kakao_bin_path: str) -> None:
         if platform.system() == "Windows":
             subprocess.Popen([kakao_bin_path])
         elif platform.system() == "Darwin":
@@ -97,13 +96,20 @@ class GetKakaoDesktopAuth:
         self, kakao_bin_path: str, relaunch: bool = True
     ) -> Tuple[Optional[str], str]:
         auth_token = None
-
-        if relaunch:
-            kakao_pid = self.relaunch_kakao(kakao_bin_path)
+        kakao_pid: Union[str, int, None]
+        if platform.system() == "Windows":
+            is_wine = False
+            if relaunch:
+                kakao_pid = self.relaunch_kakao(kakao_bin_path)
+            else:
+                kakao_pid = find_pid_by_name("kakaotalk")
+            if kakao_pid is None:
+                return None, MSG_LAUNCH_FAIL
         else:
-            kakao_pid = find_pid_by_name("kakaotalk")
-        if kakao_pid is None:
-            return None, MSG_LAUNCH_FAIL
+            is_wine = True
+            kakao_pid = "KakaoTalk.exe"
+            if relaunch and self.relaunch_kakao(kakao_bin_path) is None:
+                return None, MSG_LAUNCH_FAIL
 
         if self.cb_ask_str == input:
             pw_func = getpass
@@ -111,10 +117,10 @@ class GetKakaoDesktopAuth:
             pw_func = partial(
                 self.cb_ask_str, initialvalue="", cli_show_initialvalue=False
             )
-        s, msg = get_mem(kakao_pid, pw_func)
+        s = get_mem(kakao_pid, pw_func, is_wine)
 
         if s is None:
-            return None, msg
+            return None, "Failed to dump memory"
 
         auth_token = None
         for i in re.finditer(b"authorization: ", s):
@@ -140,6 +146,13 @@ class GetKakaoDesktopAuth:
             return auth_token, msg
 
     def get_auth_darwin(self, kakao_bin_path: str) -> Tuple[Optional[str], str]:
+        csrutil_status = subprocess.run(
+            ["csrutil", "status"], capture_output=True, text=True
+        ).stdout
+
+        if "enabled" in csrutil_status:
+            return None, MSG_SIP_ENABLED
+
         killall("kakaotalk")
 
         subprocess.run(
@@ -205,9 +218,10 @@ class GetKakaoDesktopAuth:
         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"
-            )
+            wineprefix = os.environ.get("WINEPREFIX")
+            if not (wineprefix and Path(wineprefix).exists()):
+                wineprefix = os.path.expanduser("~/.wine")
+            kakao_bin_path = f"{wineprefix}/drive_c/Program Files (x86)/Kakao/KakaoTalk/KakaoTalk.exe"
 
         if Path(kakao_bin_path).exists():
             return kakao_bin_path
@@ -220,7 +234,7 @@ class GetKakaoDesktopAuth:
     ) -> Tuple[Optional[str], str]:
         # get_auth_by_dump()
         # + Fast
-        # - Requires admin
+        # - Requires downloading procdump, or builtin method that needs admin
 
         # get_auth_by_pme()
         # + No admin (If have permission to read process)
@@ -233,32 +247,13 @@ class GetKakaoDesktopAuth:
         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
+        if platform.system() == "Windows":
+            kakao_auth, msg = self.get_auth_by_dump(kakao_bin_path)
+            if kakao_auth is None:
+                kakao_auth, msg = self.get_auth_by_pme(kakao_bin_path, False)
+        elif platform.system() == "Darwin":
             kakao_auth, msg = self.get_auth_darwin(kakao_bin_path)
+        else:
+            kakao_auth, msg = self.get_auth_by_dump(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]:
@@ -130,10 +130,10 @@ class GetViberAuth:
             pw_func = partial(
                 self.cb_ask_str, initialvalue="", cli_show_initialvalue=False
             )
-        s, msg = get_mem(viber_pid, pw_func)
+        s = get_mem(viber_pid, pw_func)
 
         if s is None:
-            return None, msg
+            return None, "Failed to dump memory"
 
         member_id_addr = s.find(b"X-Viber-Auth-Mid: ")
         m_token_addr = s.find(b"X-Viber-Auth-Token: ")
@@ -217,8 +217,6 @@ class GetViberAuth:
             methods.append(self.get_auth_by_dump)
             if pme_present:
                 methods.append(self.get_auth_by_pme)
-            if check_admin() is False:
-                methods.reverse()
         else:
             if not os.path.isfile("/.dockerenv"):
                 methods.append(self.get_auth_by_dump)

sticker_convert/utils/auth/telegram_api.py

@@ -342,10 +342,12 @@ class TelethonAPI(TelegramAPI):
         self.cb = cb
         self.cb_return = cb_return
 
-        success, self.client, _, _ = await TelethonSetup(
+        success, client, _, _ = await TelethonSetup(
             self.opt_cred, self.cb_ask_str
         ).start_async()
 
+        if success is True and client is not None:
+            self.client = client
         return success
 
     async def exit(self) -> None:

sticker_convert/utils/auth/telethon_setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from typing import Callable, Tuple
+from typing import Callable, Optional, Tuple
 
 import anyio
 from telethon import TelegramClient  # type: ignore
@@ -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
 
@@ -56,28 +58,39 @@ class TelethonSetup:
     def guide(self) -> None:
         self.cb_ask_str(GUIDE_MSG)
 
-    def get_api_info(self) -> None:
+    def get_api_info(self) -> bool:
         api_id_ask = "Enter api_id: "
         wrong_hint = ""
+
         while True:
             telethon_api_id = self.cb_ask_str(wrong_hint + api_id_ask)
-            if telethon_api_id.isnumeric():
+            if telethon_api_id == "":
+                return False
+            elif telethon_api_id.isnumeric():
                 self.opt_cred.telethon_api_id = int(telethon_api_id)
                 break
             else:
                 wrong_hint = "Error: api_id should be numeric\n"
+
         self.opt_cred.telethon_api_hash = self.cb_ask_str("Enter api_hash: ")
+        if self.opt_cred.telethon_api_hash == "":
+            return False
+        return True
 
     def signin(self) -> Tuple[bool, TelegramClient, int, str]:
         return anyio.run(self.signin_async)
 
-    def start(self) -> Tuple[bool, TelegramClient, int, str]:
+    def start(self) -> Tuple[bool, Optional[TelegramClient], int, str]:
+        cred_valid = False
         if self.opt_cred.telethon_api_id == 0 or self.opt_cred.telethon_api_hash == "":
             self.guide()
-            self.get_api_info()
-        return self.signin()
+            cred_valid = self.get_api_info()
+        if cred_valid:
+            return self.signin()
+        else:
+            return False, None, 0, ""
 
-    async def start_async(self) -> Tuple[bool, TelegramClient, int, str]:
+    async def start_async(self) -> Tuple[bool, Optional[TelegramClient], int, str]:
         if self.opt_cred.telethon_api_id == 0 or self.opt_cred.telethon_api_hash == "":
             self.guide()
             self.get_api_info()

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
+from typing import Any, Dict, List, Optional, 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
@@ -83,22 +83,16 @@ class CRD:
         self.chrome_proc = subprocess.Popen(launch_cmd)
 
     @staticmethod
-    def get_chrome_path() -> Optional[str]:
-        bs: List[Tuple[int, str]] = []
-        for b in browsers.browsers():
-            browser_type = b["browser_type"]
-            path = b["path"]
-            try:
-                rank = BROWSER_PREF.index(browser_type)
-            except ValueError:
-                continue
-            bs.append((rank, path))
-        if len(bs) == 0:
-            return None
-        bs = sorted(bs, key=lambda x: x[0])
-        return bs[0][1]
-
-    def connect(self, target_id: int = 0):
+    def get_chromium_path() -> Optional[str]:
+        if platform.system() == "Windows":
+            from sticker_convert.utils.chromiums.windows import get_chromium_path
+        elif platform.system() == "Darwin":
+            from sticker_convert.utils.chromiums.osx import get_chromium_path
+        else:
+            from sticker_convert.utils.chromiums.linux import get_chromium_path
+        return get_chromium_path()
+
+    def connect(self, target_id: int = 0) -> None:
         self.cmd_id = 1
         r = None
         targets: List[Any] = []
@@ -137,7 +131,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 +149,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 +168,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 +192,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/chromiums/linux.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+import configparser
+import os
+import re
+from typing import Optional
+
+# Adopted from https://github.com/roniemartinez/browsers/blob/master/browsers/linux.py
+
+LINUX_DESKTOP_ENTRY_LIST = (
+    ("chrome", ("google-chrome",)),
+    ("chromium", ("chromium", "chromium_chromium")),
+    ("brave", ("brave-browser", "brave_brave")),
+    ("brave-beta", ("brave-browser-beta",)),
+    ("brave-nightly", ("brave-browser-nightly",)),
+    ("msedge", ("microsoft-edge",)),
+    ("opera", ("opera_opera",)),
+    ("opera-beta", ("opera-beta_opera-beta",)),
+    ("opera-developer", ("opera-developer_opera-developer",)),
+    ("vivaldi", ("vivaldi_vivaldi-stable",)),
+)
+
+# $XDG_DATA_HOME and $XDG_DATA_DIRS are not always set
+XDG_DATA_LOCATIONS = (
+    "~/.local/share/applications",
+    "/usr/share/applications",
+    "/var/lib/snapd/desktop/applications",
+)
+
+VERSION_PATTERN = re.compile(
+    r"\b(\S+\.\S+)\b"
+)  # simple pattern assuming all version strings have a dot on them
+
+
+def get_chromium_path() -> Optional[str]:
+    for _, desktop_entries in LINUX_DESKTOP_ENTRY_LIST:
+        for application_dir in XDG_DATA_LOCATIONS:
+            for desktop_entry in desktop_entries:
+                path = os.path.join(application_dir, f"{desktop_entry}.desktop")
+
+                if not os.path.isfile(path):
+                    continue
+
+                config = configparser.ConfigParser(interpolation=None)
+                config.read(path, encoding="utf-8")
+                executable_path = config.get("Desktop Entry", "Exec")
+
+                if executable_path.lower().endswith(" %u"):
+                    executable_path = executable_path[:-3].strip()
+
+                return executable_path
+
+    return None