sticker-convert 2.9.4__py3-none-any.whl → 2.10.0__py3-none-any.whl

sticker_convert/cli.py

@@ -14,6 +14,7 @@ from mergedeep import merge  # type: ignore
 from sticker_convert.definitions import CONFIG_DIR, DEFAULT_DIR
 from sticker_convert.job import Job
 from sticker_convert.job_option import CompOption, CredOption, InputOption, OutputOption
+from sticker_convert.utils.auth.get_discord_auth import GetDiscordAuth
 from sticker_convert.utils.auth.get_kakao_auth import GetKakaoAuth
 from sticker_convert.utils.auth.get_line_auth import GetLineAuth
 from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
@@ -164,7 +165,12 @@ class CLI:
         )
 
         parser_cred = parser.add_argument_group("Credentials options")
-        flags_cred_bool = ("signal_get_auth", "kakao_get_auth", "line_get_auth")
+        flags_cred_bool = (
+            "signal_get_auth",
+            "kakao_get_auth",
+            "line_get_auth",
+            "discord_get_auth",
+        )
         for k, v in self.help["cred"].items():
             keyword_args = {}
             if k in flags_cred_bool:
@@ -220,6 +226,8 @@ class CLI:
             "telegram": args.download_telegram,
             "kakao": args.download_kakao,
             "viber": args.download_viber,
+            "discord": args.download_discord,
+            "discord_emoji": args.download_discord_emoji,
         }
 
         download_option = "local"
@@ -456,6 +464,9 @@ class CLI:
             viber_auth=args.viber_auth
             if args.viber_auth
             else creds.get("viber", {}).get("auth"),
+            discord_token=args.discord_token
+            if args.discord_token
+            else creds.get("discord", {}).get("token"),
         )
 
         if args.kakao_get_auth:
@@ -473,23 +484,16 @@ class CLI:
                 self.cb.msg(f"Got auth_token successfully: {auth_token}")
 
         if args.signal_get_auth:
-            get_signal_auth = GetSignalAuth()
-
-            signal_bin_path = None
-            signal_user_data_dir = None
-            if args.signal_data_dir:
-                signal_bin_path = "(User specified)"
-                signal_user_data_dir = args.signal_data_dir
-
-            uuid, password, msg = get_signal_auth.get_cred(
-                signal_bin_path, signal_user_data_dir
-            )
+            m = GetSignalAuth(cb_msg=self.cb.msg, cb_ask_str=self.cb.ask_str)
 
+            uuid, password = m.get_cred()
             if uuid and password:
                 opt_cred.signal_uuid = uuid
                 opt_cred.signal_password = password
 
-            self.cb.msg(msg)
+                self.cb.msg(f"Got uuid and password successfully: {uuid}, {password}")
+
+            self.cb.msg("Failed to get uuid and password")
 
         if args.line_get_auth:
             get_line_auth = GetLineAuth()
@@ -519,6 +523,15 @@ class CLI:
 
             self.cb.msg(msg)
 
+        if args.discord_get_auth:
+            get_discord_auth = GetDiscordAuth(self.cb.msg)
+            discord_token, msg = get_discord_auth.get_cred()
+
+            if discord_token:
+                opt_cred.discord_token = discord_token
+
+            self.cb.msg(msg)
+
         if args.save_cred:
             creds_path = CONFIG_DIR / "creds.json"
             JsonManager.save_json(creds_path, opt_cred.to_dict())

sticker_convert/downloaders/download_base.py

@@ -6,23 +6,24 @@ from pathlib import Path
 from typing import Any, List, Optional, Tuple
 
 import anyio
+import httpx
 import requests
 
-from sticker_convert.job_option import CredOption
+from sticker_convert.job_option import CredOption, InputOption
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 
 
 class DownloadBase:
     def __init__(
         self,
-        url: str,
-        out_dir: Path,
+        opt_input: InputOption,
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> None:
-        self.url = url
-        self.out_dir = out_dir
+        self.url = opt_input.url
+        self.out_dir = opt_input.dir
+        self.input_option = opt_input.option
         self.opt_cred = opt_cred
         self.cb = cb
         self.cb_return = cb_return
@@ -42,36 +43,32 @@ class DownloadBase:
             ("bar", None, {"set_progress_mode": "determinate", "steps": len(targets)})
         )
 
-        async with anyio.create_task_group() as tg:
-            for url, dest in targets:
-                tg.start_soon(self.download_file_async, url, dest, retries, **kwargs)
+        async with httpx.AsyncClient() as client:
+            async with anyio.create_task_group() as tg:
+                for url, dest in targets:
+                    tg.start_soon(
+                        self.download_file_async, client, url, dest, retries, **kwargs
+                    )
 
     async def download_file_async(
         self,
+        client: httpx.AsyncClient,
         url: str,
         dest: Path,
         retries: int = 3,
         **kwargs: Any,
     ) -> None:
+        self.cb.put(f"Downloading {url}")
         for retry in range(retries):
-            try:
-                response = requests.get(url, allow_redirects=True, **kwargs)
-
-                if not response.ok:
-                    self.cb.put("update_bar")
-                    raise requests.exceptions.RequestException(
-                        f"Error {response.status_code}"
-                    )
+            response = await client.get(url, follow_redirects=True, **kwargs)
 
-                self.cb.put(f"Downloading {url}")
-                with open(dest, "wb+") as f:
-                    f.write(response.content)
+            if response.is_success:
+                async with await anyio.open_file(dest, "wb+") as f:
+                    await f.write(response.content)
                 self.cb.put(f"Downloaded {url}")
-                break
-
-            except requests.exceptions.RequestException as e:
+            else:
                 self.cb.put(
-                    f"Cannot download {url} (tried {retry+1}/{retries} times): {e}"
+                    f"Error {response.status_code}: {url} (tried {retry+1}/{retries} times)"
                 )
 
         self.cb.put("update_bar")

sticker_convert/downloaders/download_discord.py

@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+import json
+from pathlib import Path
+from typing import Dict, List, Optional, Tuple, cast
+from urllib.parse import urlparse
+
+import requests
+
+from sticker_convert.downloaders.download_base import DownloadBase
+from sticker_convert.job_option import CredOption, InputOption
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.emoji import extract_emojis
+from sticker_convert.utils.files.metadata_handler import MetadataHandler
+
+# References:
+# https://github.com/ThaTiemsz/Discord-Emoji-Downloader/blob/master/assets/app.js
+# https://github.com/zgibberish/discord-emoji-scraper/blob/main/emoji_scraper.py
+
+
+class DownloadDiscord(DownloadBase):
+    # def __init__(self, *args: Any, **kwargs: Any) -> None:
+    #     super().__init__(*args, **kwargs)
+
+    def download_stickers_discord(self) -> bool:
+        if self.opt_cred is None or self.opt_cred.discord_token == "":
+            self.cb.put("Error: Downloading from Discord requires token")
+            return False
+
+        gid: Optional[str] = None
+        if self.url.isnumeric():
+            gid = self.url
+        else:
+            url_parsed = urlparse(self.url)
+            if url_parsed.netloc == "discord.com":
+                gid = url_parsed.path.split("/")[2]
+
+        if gid is None or gid.isnumeric() is False:
+            self.cb.put("Error: Invalid url")
+            return False
+
+        headers = {
+            "Authorization": self.opt_cred.discord_token,
+        }
+
+        r = requests.get(f"https://discord.com/api/v10/guilds/{gid}", headers=headers)
+        r_json = json.loads(r.text)
+
+        if self.input_option == "discord_emoji":
+            stickers = r_json["emojis"]
+        else:
+            stickers = r_json["stickers"]
+
+        targets: List[Tuple[str, Path]] = []
+        emoji_dict: Dict[str, str] = {}
+        for i, sticker in enumerate(stickers):
+            f_id = str(i).zfill(3)
+            sticker_id = sticker["id"]
+            if self.input_option == "discord_emoji":
+                f_ext = ".gif" if sticker["animated"] else ".png"
+                sticker_url = f"https://cdn.discordapp.com/emojis/{sticker_id}{f_ext}?size=4096&quality=lossless"
+            else:
+                # https://discord.com/developers/docs/resources/sticker#sticker-object-sticker-format-types
+                format_type = cast(int, sticker["format_type"])
+                f_ext = [".png", ".png", ".json", ".gif"][format_type - 1]
+                sticker_url = f"https://cdn.discordapp.com/stickers/{sticker_id}{f_ext}?size=4096&quality=lossless"
+                emoji_dict[f_id] = extract_emojis(sticker["tags"])
+            f_name = f_id + f_ext
+            f_path = Path(self.out_dir, f_name)
+            targets.append((sticker_url, f_path))
+
+        self.download_multiple_files(targets)
+
+        server_name = r_json["name"]
+        MetadataHandler.set_metadata(
+            self.out_dir,
+            title=server_name,
+            author=server_name,
+            emoji_dict=emoji_dict if self.input_option == "discord" else None,
+        )
+
+        return True
+
+    @staticmethod
+    def start(
+        opt_input: InputOption,
+        opt_cred: Optional[CredOption],
+        cb: CallbackProtocol,
+        cb_return: CallbackReturn,
+    ) -> bool:
+        downloader = DownloadDiscord(opt_input, opt_cred, cb, cb_return)
+        return downloader.download_stickers_discord()

sticker_convert/downloaders/download_kakao.py

@@ -12,7 +12,7 @@ from bs4 import BeautifulSoup
 from py_mini_racer import MiniRacer
 
 from sticker_convert.downloaders.download_base import DownloadBase
-from sticker_convert.job_option import CredOption
+from sticker_convert.job_option import CredOption, InputOption
 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
@@ -326,11 +326,10 @@ class DownloadKakao(DownloadBase):
 
     @staticmethod
     def start(
-        url: str,
-        out_dir: Path,
+        opt_input: InputOption,
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
-        downloader = DownloadKakao(url, out_dir, opt_cred, cb, cb_return)
+        downloader = DownloadKakao(opt_input, opt_cred, cb, cb_return)
         return downloader.download_stickers_kakao()

sticker_convert/downloaders/download_line.py

@@ -15,7 +15,7 @@ from bs4 import BeautifulSoup
 from PIL import Image
 
 from sticker_convert.downloaders.download_base import DownloadBase
-from sticker_convert.job_option import CredOption
+from sticker_convert.job_option import CredOption, InputOption
 from sticker_convert.utils.auth.get_line_auth import GetLineAuth
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
@@ -462,11 +462,10 @@ class DownloadLine(DownloadBase):
 
     @staticmethod
     def start(
-        url: str,
-        out_dir: Path,
+        opt_input: InputOption,
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
-        downloader = DownloadLine(url, out_dir, opt_cred, cb, cb_return)
+        downloader = DownloadLine(opt_input, opt_cred, cb, cb_return)
         return downloader.download_stickers_line()

sticker_convert/downloaders/download_signal.py

@@ -8,7 +8,7 @@ from signalstickers_client.models import StickerPack
 from signalstickers_client.stickersclient import StickersClient
 
 from sticker_convert.downloaders.download_base import DownloadBase
-from sticker_convert.job_option import CredOption
+from sticker_convert.job_option import CredOption, InputOption
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
@@ -82,11 +82,10 @@ class DownloadSignal(DownloadBase):
 
     @staticmethod
     def start(
-        url: str,
-        out_dir: Path,
+        opt_input: InputOption,
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
-        downloader = DownloadSignal(url, out_dir, opt_cred, cb, cb_return)
+        downloader = DownloadSignal(opt_input, opt_cred, cb, cb_return)
         return downloader.download_stickers_signal()

sticker_convert/downloaders/download_telegram.py

@@ -9,7 +9,7 @@ from telegram.error import TelegramError
 from telegram.ext import AIORateLimiter, ApplicationBuilder
 
 from sticker_convert.downloaders.download_base import DownloadBase
-from sticker_convert.job_option import CredOption
+from sticker_convert.job_option import CredOption, InputOption
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 
@@ -120,11 +120,10 @@ class DownloadTelegram(DownloadBase):
 
     @staticmethod
     def start(
-        url: str,
-        out_dir: Path,
+        opt_input: InputOption,
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
-        downloader = DownloadTelegram(url, out_dir, opt_cred, cb, cb_return)
+        downloader = DownloadTelegram(opt_input, opt_cred, cb, cb_return)
         return downloader.download_stickers_telegram()

sticker_convert/downloaders/download_viber.py

@@ -10,7 +10,7 @@ import requests
 from bs4 import BeautifulSoup
 
 from sticker_convert.downloaders.download_base import DownloadBase
-from sticker_convert.job_option import CredOption
+from sticker_convert.job_option import CredOption, InputOption
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 
@@ -85,11 +85,10 @@ class DownloadViber(DownloadBase):
 
     @staticmethod
     def start(
-        url: str,
-        out_dir: Path,
+        opt_input: InputOption,
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
-        downloader = DownloadViber(url, out_dir, opt_cred, cb, cb_return)
+        downloader = DownloadViber(opt_input, opt_cred, cb, cb_return)
         return downloader.download_stickers_viber()

sticker_convert/gui.py

@@ -150,7 +150,6 @@ class GUI(Window):
         # Credentials
         self.signal_uuid_var = StringVar(self)
         self.signal_password_var = StringVar(self)
-        self.signal_data_dir_var = StringVar(self)
         self.telegram_token_var = StringVar(self)
         self.telegram_userid_var = StringVar(self)
         self.kakao_auth_token_var = StringVar(self)
@@ -161,6 +160,7 @@ class GUI(Window):
         self.line_cookies_var = StringVar(self)
         self.viber_auth_var = StringVar(self)
         self.viber_bin_path_var = StringVar(self)
+        self.discord_token_var = StringVar(self)
 
         # Config
         self.settings_save_cred_var = BooleanVar()
@@ -388,6 +388,7 @@ class GUI(Window):
         )
         self.line_cookies_var.set(self.creds.get("line", {}).get("cookies", ""))
         self.viber_auth_var.set(self.creds.get("viber", {}).get("auth", ""))
+        self.discord_token_var.set(self.creds.get("discord", {}).get("token", ""))
 
     def get_input_name(self) -> str:
         return [
@@ -549,6 +550,7 @@ class GUI(Window):
             kakao_phone_number=self.kakao_phone_number_var.get(),
             line_cookies=self.line_cookies_var.get(),
             viber_auth=self.viber_auth_var.get(),
+            discord_token=self.discord_token_var.get(),
         )
 
     def start_process(self) -> None:
@@ -702,8 +704,13 @@ class GUI(Window):
             if not url:
                 self.input_frame.address_entry.config(bootstyle="warning")  # type: ignore
 
-            elif download_option != input_option and not (
-                input_option in ("kakao", "line") and url.isnumeric()
+            elif (
+                download_option is None
+                or input_option.startswith(download_option) is False
+                and not (
+                    input_option in ("kakao", "line", "discord", "discord_emoji")
+                    and url.isnumeric()
+                )
             ):
                 self.input_frame.address_entry.config(bootstyle="danger")  # type: ignore
                 self.input_frame.address_tip.config(
@@ -788,6 +795,11 @@ class GUI(Window):
         else:
             self.cred_frame.kakao_auth_token_entry.config(bootstyle="default")  # type: ignore
 
+        if input_option.startswith("discord") and not self.discord_token_var.get():
+            self.cred_frame.discord_token_entry.config(bootstyle="warning")  # type: ignore
+        else:
+            self.cred_frame.discord_token_entry.config(bootstyle="default")  # type: ignore
+
         # Check for Input and Compression mismatch
         if (
             not self.no_compress_var.get()

sticker_convert/gui_components/frames/cred_frame.py

@@ -5,6 +5,7 @@ from typing import TYPE_CHECKING, Any
 from ttkbootstrap import Button, Entry, Label, LabelFrame  # type: ignore
 
 from sticker_convert.gui_components.frames.right_clicker import RightClicker
+from sticker_convert.gui_components.windows.discord_get_auth_window import DiscordGetAuthWindow
 from sticker_convert.gui_components.windows.kakao_get_auth_window import KakaoGetAuthWindow
 from sticker_convert.gui_components.windows.line_get_auth_window import LineGetAuthWindow
 from sticker_convert.gui_components.windows.signal_get_auth_window import SignalGetAuthWindow
@@ -118,6 +119,20 @@ class CredFrame(LabelFrame):
             bootstyle="secondary",  # type: ignore
         )
 
+        self.discord_token_lbl = Label(
+            self, text="Discord token", width=18, justify="left", anchor="w"
+        )
+        self.discord_token_entry = Entry(
+            self, textvariable=self.gui.discord_token_var, width=35
+        )
+        self.discord_token_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
+        self.discord_get_auth_btn = Button(
+            self,
+            text="Generate",
+            command=self.cb_discord_get_auth,
+            bootstyle="secondary",  # type: ignore
+        )
+
         self.help_btn = Button(
             self,
             text="Get help",
@@ -151,7 +166,10 @@ class CredFrame(LabelFrame):
         self.viber_auth_lbl.grid(column=0, row=7, sticky="w", padx=3, pady=3)
         self.viber_auth_entry.grid(column=1, row=7, sticky="w", padx=3, pady=3)
         self.viber_get_auth_btn.grid(column=2, row=7, sticky="e", padx=3, pady=3)
-        self.help_btn.grid(column=2, row=8, sticky="e", padx=3, pady=3)
+        self.discord_token_lbl.grid(column=0, row=8, sticky="w", padx=3, pady=3)
+        self.discord_token_entry.grid(column=1, row=8, sticky="w", padx=3, pady=3)
+        self.discord_get_auth_btn.grid(column=2, row=8, sticky="e", padx=3, pady=3)
+        self.help_btn.grid(column=2, row=9, sticky="e", padx=3, pady=3)
 
     def cb_cred_help(self, *_: Any) -> None:
         faq_site = "https://github.com/laggykiller/sticker-convert#faq"
@@ -171,6 +189,9 @@ class CredFrame(LabelFrame):
     def cb_viber_get_auth(self, *_: Any) -> None:
         ViberGetAuthWindow(self.gui)
 
+    def cb_discord_get_auth(self, *_: Any) -> None:
+        DiscordGetAuthWindow(self.gui)
+
     def set_states(self, state: str) -> None:
         self.signal_uuid_entry.config(state=state)
         self.signal_password_entry.config(state=state)

sticker_convert/gui_components/windows/discord_get_auth_window.py

@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+from functools import partial
+from threading import Thread
+from typing import Any
+
+from ttkbootstrap import Button, Frame, Label  # type: ignore
+
+from sticker_convert.gui_components.gui_utils import GUIUtils
+from sticker_convert.gui_components.windows.base_window import BaseWindow
+from sticker_convert.utils.auth.get_discord_auth import GetDiscordAuth
+
+
+class DiscordGetAuthWindow(BaseWindow):
+    def __init__(self, *args: Any, **kwargs: Any):
+        super(DiscordGetAuthWindow, self).__init__(*args, **kwargs)
+
+        self.title("Get Discord token")
+
+        self.cb_msg_block_discord = partial(self.gui.cb_msg_block, parent=self)
+        self.cb_ask_str_discord = partial(self.gui.cb_ask_str, parent=self)
+
+        self.frame_info = Frame(self.scrollable_frame)
+        self.frame_start_btn = Frame(self.scrollable_frame)
+
+        self.frame_info.grid(column=0, row=0, sticky="news", padx=3, pady=3)
+        self.frame_start_btn.grid(column=0, row=1, sticky="news", padx=3, pady=3)
+
+        # Info frame
+        self.explanation1_lbl = Label(
+            self.frame_info,
+            text="Please install Discord Desktop or Chrome",
+            justify="left",
+            anchor="w",
+        )
+        self.explanation2_lbl = Label(
+            self.frame_info,
+            text="After installation, you need to login to Discord",
+            justify="left",
+            anchor="w",
+        )
+        self.explanation3_lbl = Label(
+            self.frame_info,
+            text="Token will be automatically fetched",
+            justify="left",
+            anchor="w",
+        )
+
+        self.explanation1_lbl.grid(
+            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation2_lbl.grid(
+            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation3_lbl.grid(
+            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
+        )
+
+        # Start button frame
+        self.login_btn = Button(
+            self.frame_start_btn, text="Get token", command=self.cb_login
+        )
+
+        self.login_btn.pack()
+
+        GUIUtils.finalize_window(self)
+
+    def cb_login(self):
+        Thread(target=self.cb_login_thread, daemon=True).start()
+
+    def cb_login_thread(self, *args: Any):
+        m = GetDiscordAuth(cb_msg=self.gui.cb_msg)
+        discord_token, msg = m.get_cred()
+        if discord_token:
+            if not self.gui.creds.get("discord"):
+                self.gui.creds["discord"] = {}
+            self.gui.creds["discord"]["token"] = discord_token
+            self.gui.discord_token_var.set(discord_token)
+
+            self.gui.save_creds()
+            self.gui.highlight_fields()
+
+        self.cb_msg_block_discord(msg)