sticker-convert 2.14.0.0__py3-none-any.whl → 2.15.1.0__py3-none-any.whl

sticker_convert/gui_components/windows/discord_get_auth_window.py

@@ -1,13 +1,12 @@
 #!/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.auth.auth_discord import AuthDiscord
 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):
@@ -16,9 +15,6 @@ class DiscordGetAuthWindow(BaseWindow):
 
         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)
 
@@ -68,7 +64,7 @@ class DiscordGetAuthWindow(BaseWindow):
         Thread(target=self.cb_login_thread, daemon=True).start()
 
     def cb_login_thread(self, *args: Any) -> None:
-        m = GetDiscordAuth(cb_msg=self.gui.cb_msg)
+        m = AuthDiscord(self.gui.get_opt_cred(), self.gui.cb)
         discord_token, msg = m.get_cred()
         if discord_token:
             if not self.gui.creds.get("discord"):
@@ -79,4 +75,4 @@ class DiscordGetAuthWindow(BaseWindow):
             self.gui.save_creds()
             self.gui.highlight_fields()
 
-        self.cb_msg_block_discord(msg)
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))

sticker_convert/gui_components/windows/kakao_get_auth_window.py

@@ -1,17 +1,16 @@
 #!/usr/bin/env python3
 import platform
-from functools import partial
 from threading import Thread
 from typing import Any, Optional
 
 from ttkbootstrap import Button, Entry, Frame, Label, LabelFrame  # type: ignore
 
+from sticker_convert.auth.auth_kakao_android_login import AuthKakaoAndroidLogin
+from sticker_convert.auth.auth_kakao_desktop_login import AuthKakaoDesktopLogin
+from sticker_convert.auth.auth_kakao_desktop_memdump import AuthKakaoDesktopMemdump
 from sticker_convert.gui_components.frames.right_clicker import RightClicker
 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_kakao_auth_android_login import GetKakaoAuthAndroidLogin
-from sticker_convert.utils.auth.get_kakao_auth_desktop_login import GetKakaoAuthDesktopLogin
-from sticker_convert.utils.auth.get_kakao_auth_desktop_memdump import GetKakaoAuthDesktopMemdump
 
 
 class KakaoGetAuthWindow(BaseWindow):
@@ -20,9 +19,6 @@ class KakaoGetAuthWindow(BaseWindow):
 
         self.title("Get Kakao auth_token")
 
-        self.cb_msg_block_kakao = partial(self.gui.cb_msg_block, parent=self)
-        self.cb_ask_str_kakao = partial(self.gui.cb_ask_str, parent=self)
-
         self.frame_desktop_memdump = LabelFrame(
             self.scrollable_frame, text="Method 1: KakaoTalk Desktop memdump"
         )
@@ -137,8 +133,15 @@ class KakaoGetAuthWindow(BaseWindow):
             self.frame_desktop_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_username"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_username"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
@@ -160,8 +163,15 @@ class KakaoGetAuthWindow(BaseWindow):
             self.frame_desktop_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_password"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_password"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
@@ -179,8 +189,15 @@ class KakaoGetAuthWindow(BaseWindow):
             self.frame_desktop_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_device_uuid"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_device_uuid"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
@@ -254,8 +271,15 @@ class KakaoGetAuthWindow(BaseWindow):
             self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_username"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_username"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
@@ -277,8 +301,15 @@ class KakaoGetAuthWindow(BaseWindow):
             self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_password"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_password"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
@@ -296,8 +327,15 @@ class KakaoGetAuthWindow(BaseWindow):
             self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_country_code"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_country_code"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
@@ -315,8 +353,15 @@ class KakaoGetAuthWindow(BaseWindow):
             self.frame_android_login,
             text="?",
             width=1,
-            command=lambda: self.cb_msg_block_kakao(
-                self.gui.help["cred"]["kakao_phone_number"]
+            command=lambda: self.gui.cb.put(
+                (
+                    "msg_block",
+                    None,
+                    {
+                        "message": self.gui.help["cred"]["kakao_phone_number"],
+                        "parent": self,
+                    },
+                )
             ),
             bootstyle="secondary",  # type: ignore
         )
@@ -375,12 +420,7 @@ class KakaoGetAuthWindow(BaseWindow):
 
     def cb_get_auth_desktop_login_thread(self, *_: Any) -> None:
         self.gui.save_creds()
-        m = GetKakaoAuthDesktopLogin(
-            opt_cred=self.gui.get_opt_cred(),
-            cb_msg=self.gui.cb_msg,
-            cb_msg_block=self.cb_msg_block_kakao,
-            cb_ask_str=self.cb_ask_str_kakao,
-        )
+        m = AuthKakaoDesktopLogin(self.gui.get_opt_cred(), self.gui.cb)
 
         auth_token, msg = m.get_cred()
 
@@ -393,21 +433,16 @@ class KakaoGetAuthWindow(BaseWindow):
             self.gui.save_creds()
             self.gui.highlight_fields()
 
-        self.cb_msg_block_kakao(msg)
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
 
     def cb_get_auth_desktop_login(self) -> None:
         Thread(target=self.cb_get_auth_desktop_login_thread, daemon=True).start()
 
     def cb_get_auth_android_login_thread(self, *_: Any) -> None:
         self.gui.save_creds()
-        m = GetKakaoAuthAndroidLogin(
-            opt_cred=self.gui.get_opt_cred(),
-            cb_msg=self.gui.cb_msg,
-            cb_msg_block=self.cb_msg_block_kakao,
-            cb_ask_str=self.cb_ask_str_kakao,
-        )
+        m = AuthKakaoAndroidLogin(self.gui.get_opt_cred(), self.gui.cb)
 
-        auth_token = m.get_cred()
+        auth_token, msg = m.get_cred()
 
         if auth_token:
             if not self.gui.creds.get("kakao"):
@@ -415,16 +450,13 @@ class KakaoGetAuthWindow(BaseWindow):
             self.gui.creds["kakao"]["auth_token"] = auth_token
             self.gui.kakao_auth_token_var.set(auth_token)
 
-            self.cb_msg_block_kakao(f"Got auth_token successfully: {auth_token}")
             self.gui.save_creds()
             self.gui.highlight_fields()
-        else:
-            self.cb_msg_block_kakao("Failed to get auth_token")
+
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
 
     def cb_launch_desktop(self) -> None:
-        m = GetKakaoAuthDesktopMemdump(
-            cb_ask_str=self.cb_ask_str_kakao,
-        )
+        m = AuthKakaoDesktopMemdump(self.gui.get_opt_cred(), self.gui.cb)
         if self.gui.kakao_bin_path_var.get() != "":
             bin_path = self.gui.kakao_bin_path_var.get()
         else:
@@ -433,20 +465,16 @@ class KakaoGetAuthWindow(BaseWindow):
         if bin_path is not None:
             m.launch_kakao(bin_path)
         else:
-            self.cb_msg_block_kakao(
-                "Error: Cannot launch Kakao Desktop. Is it installed?"
-            )
+            msg = "Error: Cannot launch Kakao Desktop. Is it installed?"
+            self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
 
     def cb_get_auth_desktop_memdump(self) -> None:
         Thread(target=self.cb_get_auth_desktop_memdump_thread, daemon=True).start()
 
     def cb_get_auth_desktop_memdump_thread(self, *_: Any) -> None:
         self.gui.save_creds()
-        self.gui.cb_msg("Getting auth_token, this may take a minute...")
-        self.gui.cb_bar("indeterminate")
-        m = GetKakaoAuthDesktopMemdump(
-            cb_ask_str=self.cb_ask_str_kakao,
-        )
+        self.gui.cb.bar("indeterminate")
+        m = AuthKakaoDesktopMemdump(self.gui.get_opt_cred(), self.gui.cb)
 
         bin_path: Optional[str]
         if self.gui.kakao_bin_path_var.get() != "":
@@ -464,5 +492,5 @@ class KakaoGetAuthWindow(BaseWindow):
             self.gui.save_creds()
             self.gui.highlight_fields()
 
-        self.cb_msg_block_kakao(msg)
-        self.gui.cb_bar("clear")
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
+        self.gui.cb.bar("clear")

sticker_convert/gui_components/windows/line_get_auth_window.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
 import webbrowser
-from functools import partial
 from threading import Thread
 from typing import Any
 
 from ttkbootstrap import Button, Frame, Label  # type: ignore
 
+from sticker_convert.auth.auth_line import AuthLine
 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_line_auth import GetLineAuth
 
 
 class LineGetAuthWindow(BaseWindow):
@@ -17,8 +16,6 @@ class LineGetAuthWindow(BaseWindow):
 
         self.title("Get Line cookie")
 
-        self.cb_msg_block_line = partial(self.gui.cb_msg_block, parent=self)
-
         self.frame_info = Frame(self.scrollable_frame)
         self.frame_btn = Frame(self.scrollable_frame)
 
@@ -72,7 +69,7 @@ class LineGetAuthWindow(BaseWindow):
         line_login_site = "https://store.line.me/login"
         success = webbrowser.open(line_login_site)
         if not success:
-            self.gui.cb_ask_str(
+            self.gui.cb.ask_str(
                 "Cannot open web browser for you. Install web browser and open:",
                 initialvalue=line_login_site,
             )
@@ -81,22 +78,16 @@ class LineGetAuthWindow(BaseWindow):
         Thread(target=self.cb_get_cookies_thread, daemon=True).start()
 
     def cb_get_cookies_thread(self, *_: Any) -> None:
-        m = GetLineAuth()
+        m = AuthLine(self.gui.get_opt_cred(), self.gui.cb)
 
         line_cookies = None
-        line_cookies = m.get_cred()
-
+        line_cookies, msg = m.get_cred()
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
         if line_cookies:
             if not self.gui.creds.get("line"):
                 self.gui.creds["line"] = {}
             self.gui.creds["line"]["cookies"] = line_cookies
             self.gui.line_cookies_var.set(line_cookies)
-
-            self.cb_msg_block_line("Got Line cookies successfully")
             self.gui.save_creds()
             self.gui.highlight_fields()
             return
-
-        self.cb_msg_block_line(
-            "Failed to get Line cookies. Have you logged in the web browser?"
-        )

sticker_convert/gui_components/windows/signal_get_auth_window.py

@@ -1,13 +1,12 @@
 #!/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.auth.auth_signal import AuthSignal
 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_signal_auth import GetSignalAuth
 
 
 class SignalGetAuthWindow(BaseWindow):
@@ -16,9 +15,6 @@ class SignalGetAuthWindow(BaseWindow):
 
         self.title("Get Signal uuid and password")
 
-        self.cb_msg_block_signal = partial(self.gui.cb_msg_block, parent=self)
-        self.cb_ask_str_signal = partial(self.gui.cb_ask_str, parent=self)
-
         self.frame_info = Frame(self.scrollable_frame)
         self.frame_start_btn = Frame(self.scrollable_frame)
 
@@ -68,9 +64,10 @@ class SignalGetAuthWindow(BaseWindow):
         Thread(target=self.cb_login_thread, daemon=True).start()
 
     def cb_login_thread(self, *args: Any) -> None:
-        m = GetSignalAuth(cb_msg=self.gui.cb_msg, cb_ask_str=self.cb_ask_str_signal)
+        m = AuthSignal(self.gui.get_opt_cred(), self.gui.cb)
 
-        uuid, password = m.get_cred()
+        uuid, password, msg = m.get_cred()
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
         if uuid and password:
             if not self.gui.creds.get("signal"):
                 self.gui.creds["signal"] = {}
@@ -79,11 +76,6 @@ class SignalGetAuthWindow(BaseWindow):
             self.gui.signal_uuid_var.set(uuid)
             self.gui.signal_password_var.set(password)
 
-            self.cb_msg_block_signal(
-                f"Got uuid and password successfully:\nuuid={uuid}\npassword={password}"
-            )
             self.gui.save_creds()
             self.gui.highlight_fields()
             return
-
-        self.cb_msg_block_signal("Failed to get uuid and password")

sticker_convert/gui_components/windows/viber_get_auth_window.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import platform
-from functools import partial
 from pathlib import Path
 from subprocess import Popen
 from threading import Thread
@@ -9,9 +8,9 @@ from typing import Any
 
 from ttkbootstrap import Button, Entry, Frame, Label  # type: ignore
 
+from sticker_convert.auth.auth_viber import AuthViber
 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_viber_auth import GetViberAuth
 
 
 class ViberGetAuthWindow(BaseWindow):
@@ -20,9 +19,6 @@ class ViberGetAuthWindow(BaseWindow):
 
         self.title("Get Viber auth data")
 
-        self.cb_msg_block_viber = partial(self.gui.cb_msg_block, parent=self)
-        self.cb_ask_str_viber = partial(self.gui.cb_ask_str, parent=self)
-
         self.frame_info = Frame(self.scrollable_frame)
         self.frame_btns = Frame(self.scrollable_frame)
         self.frame_config = Frame(self.scrollable_frame)
@@ -128,7 +124,7 @@ class ViberGetAuthWindow(BaseWindow):
         Thread(target=self.cb_get_cred_thread, daemon=True).start()
 
     def cb_get_cred_thread(self) -> None:
-        m = GetViberAuth(self.cb_ask_str_viber)
+        m = AuthViber(self.gui.get_opt_cred(), self.gui.cb)
 
         viber_bin_path = None
         if self.gui.viber_bin_path_var.get():
@@ -145,19 +141,20 @@ class ViberGetAuthWindow(BaseWindow):
             self.gui.save_creds()
             self.gui.highlight_fields()
 
-        self.cb_msg_block_viber(msg)
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
 
     def cb_launch_viber(self) -> None:
-        m = GetViberAuth(self.cb_ask_str_viber)
+        m = AuthViber(self.gui.get_opt_cred(), self.gui.cb)
         viber_bin_path = m.get_viber_desktop()
 
-        if self.gui.viber_auth_var.get():
-            viber_bin_path = self.gui.viber_auth_var.get()
+        if self.gui.viber_bin_path_var.get():
+            viber_bin_path = self.gui.viber_bin_path_var.get()
 
         if viber_bin_path:
             Popen([viber_bin_path])
         else:
-            self.cb_msg_block_viber("Error: Viber Desktop not installed.")
+            msg = "Error: Viber Desktop not installed."
+            self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
 
     def cb_setdir(self) -> None:
         orig_input_dir = self.gui.viber_bin_path_var.get()

sticker_convert/job.py

@@ -8,7 +8,7 @@ from datetime import datetime
 from multiprocessing import Manager, Process, Value
 from pathlib import Path
 from threading import Thread
-from typing import Any, Callable, Dict, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Union
 from urllib.parse import urlparse
 
 from sticker_convert.converter import StickerConvert
@@ -32,21 +32,18 @@ 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
 
+if TYPE_CHECKING:
+    from sticker_convert.utils.callback import CallbackCli, CallbackGui
+
 
 class Executor:
-    def __init__(
-        self,
-        cb_msg: Callable[..., None],
-        cb_msg_block: Callable[..., None],
-        cb_bar: Callable[..., None],
-        cb_ask_bool: Callable[..., bool],
-        cb_ask_str: Callable[..., str],
-    ) -> None:
-        self.cb_msg = cb_msg
-        self.cb_msg_block = cb_msg_block
-        self.cb_bar = cb_bar
-        self.cb_ask_bool = cb_ask_bool
-        self.cb_ask_str = cb_ask_str
+    def __init__(self, cb: Union[CallbackGui, CallbackCli]) -> None:
+        self.cb_msg = cb.cb_msg
+        self.cb_msg_block = cb.cb_msg_block
+        self.cb_msg_dynamic = cb.cb_msg_dynamic
+        self.cb_bar = cb.cb_bar
+        self.cb_ask_bool = cb.cb_ask_bool
+        self.cb_ask_str = cb.cb_ask_str
 
         self.manager = Manager()
         self.work_queue: WorkQueueType = self.manager.Queue()
@@ -90,7 +87,7 @@ class Executor:
     def cb(
         self,
         action: Optional[str],
-        args: Optional[Tuple[str, ...]] = None,
+        args: Optional[Tuple[Any, ...]] = None,
         kwargs: Optional[Dict[str, Any]] = None,
     ) -> None:
         if args is None:
@@ -105,6 +102,8 @@ class Executor:
             self.cb_bar(update_bar=1)
         elif action == "msg_block":
             self.cb_return.set_response(self.cb_msg_block(*args, **kwargs))
+        elif action == "msg_dynamic":
+            self.cb_msg_dynamic(*args, **kwargs)
         elif action == "ask_bool":
             self.cb_return.set_response(self.cb_ask_bool(*args, **kwargs))
         elif action == "ask_str":
@@ -208,31 +207,16 @@ class Job:
         opt_comp: CompOption,
         opt_output: OutputOption,
         opt_cred: CredOption,
-        cb_msg: Callable[..., None],
-        cb_msg_block: Callable[..., None],
-        cb_bar: Callable[..., None],
-        cb_ask_bool: Callable[..., bool],
-        cb_ask_str: Callable[..., str],
+        cb: Union[CallbackCli, CallbackGui],
     ) -> None:
         self.opt_input = opt_input
         self.opt_comp = opt_comp
         self.opt_output = opt_output
         self.opt_cred = opt_cred
-        self.cb_msg = cb_msg
-        self.cb_msg_block = cb_msg_block
-        self.cb_bar = cb_bar
-        self.cb_ask_bool = cb_ask_bool
-        self.cb_ask_str = cb_ask_str
 
         self.out_urls: List[str] = []
 
-        self.executor = Executor(
-            self.cb_msg,
-            self.cb_msg_block,
-            self.cb_bar,
-            self.cb_ask_bool,
-            self.cb_ask_str,
-        )
+        self.executor = Executor(cb)
 
     def start(self) -> int:
         if Path(self.opt_input.dir).is_dir() is False:

sticker_convert/uploaders/upload_telegram.py

@@ -6,10 +6,10 @@ from typing import Any, Dict, List, Optional, Tuple, Union, cast
 import anyio
 from telegram import Sticker
 
+from sticker_convert.auth.telegram_api import BotAPI, TelegramAPI, TelegramSticker, TelethonAPI
 from sticker_convert.converter import StickerConvert
 from sticker_convert.job_option import CompOption, CredOption, OutputOption
 from sticker_convert.uploaders.upload_base import UploadBase
-from sticker_convert.utils.auth.telegram_api import BotAPI, TelegramAPI, TelegramSticker, TelethonAPI
 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