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

sticker_convert/cli.py

@@ -11,18 +11,18 @@ from typing import Any, Dict
 
 from mergedeep import merge  # type: ignore
 
+from sticker_convert.auth.auth_discord import AuthDiscord
+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.auth.auth_line import AuthLine
+from sticker_convert.auth.auth_signal import AuthSignal
+from sticker_convert.auth.auth_telethon import AuthTelethon
+from sticker_convert.auth.auth_viber import AuthViber
 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_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
-from sticker_convert.utils.auth.get_line_auth import GetLineAuth
-from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
-from sticker_convert.utils.auth.get_viber_auth import GetViberAuth
-from sticker_convert.utils.auth.telethon_setup import TelethonSetup
-from sticker_convert.utils.callback import Callback
+from sticker_convert.utils.callback import CallbackCli
 from sticker_convert.utils.files.json_manager import JsonManager
 from sticker_convert.utils.url_detect import UrlDetect
 from sticker_convert.version import __version__
@@ -30,13 +30,13 @@ from sticker_convert.version import __version__
 
 class CLI:
     def __init__(self) -> None:
-        self.cb = Callback()
+        self.cb = CallbackCli()
 
     def cli(self) -> None:
         try:
             from sticker_convert.utils.files.json_resources_loader import COMPRESSION_JSON, EMOJI_JSON, HELP_JSON, INPUT_JSON, OUTPUT_JSON
         except RuntimeError as e:
-            self.cb.msg(str(e))
+            self.cb.put(str(e))
             return
 
         self.help = HELP_JSON
@@ -216,15 +216,7 @@ class CLI:
         self.opt_cred = self.get_opt_cred(args)
 
         job = Job(
-            self.opt_input,
-            self.opt_comp,
-            self.opt_output,
-            self.opt_cred,
-            self.cb.msg,
-            self.cb.msg_block,
-            self.cb.bar,
-            self.cb.ask_bool,
-            self.cb.ask_str,
+            self.opt_input, self.opt_comp, self.opt_output, self.opt_cred, self.cb
         )
 
         signal.signal(signal.SIGINT, job.cancel)
@@ -258,9 +250,9 @@ class CLI:
             detected_download_option = UrlDetect.detect(url)
             if detected_download_option:
                 download_option = detected_download_option
-                self.cb.msg(f"Detected URL input source: {download_option}")
+                self.cb.put(f"Detected URL input source: {download_option}")
             else:
-                self.cb.msg(f"Error: Unrecognied URL input source for url: {url}")
+                self.cb.put(f"Error: Unrecognied URL input source for url: {url}")
                 sys.exit()
 
         opt_input = InputOption(
@@ -343,21 +335,21 @@ class CLI:
             if output_option == "local":
                 preset = "custom"
                 args.no_compress = True
-                self.cb.msg(
+                self.cb.put(
                     "Auto compression option set to no_compress (Reason: Export to local directory only)"
                 )
             elif "telegram_emoji" in output_option:
                 preset = "telegram_emoji"
-                self.cb.msg(f"Auto compression option set to {preset}")
+                self.cb.put(f"Auto compression option set to {preset}")
             elif "telegram" in output_option:
                 preset = "telegram"
-                self.cb.msg(f"Auto compression option set to {preset}")
+                self.cb.put(f"Auto compression option set to {preset}")
             elif output_option == "imessage":
                 preset = "imessage_small"
-                self.cb.msg(f"Auto compression option set to {preset}")
+                self.cb.put(f"Auto compression option set to {preset}")
             else:
                 preset = output_option
-                self.cb.msg(f"Auto compression option set to {preset}")
+                self.cb.put(f"Auto compression option set to {preset}")
 
         opt_comp = CompOption(
             preset=preset,
@@ -464,13 +456,13 @@ class CLI:
             try:
                 creds = JsonManager.load_json(creds_path)
             except JSONDecodeError:
-                self.cb.msg("Warning: creds.json content is corrupted")
+                self.cb.put("Warning: creds.json content is corrupted")
                 creds = {}
         else:
             creds = {}
 
         if creds:
-            self.cb.msg("Loaded credentials from creds.json")
+            self.cb.put("Loaded credentials from creds.json")
 
         opt_cred = CredOption(
             signal_uuid=args.signal_uuid
@@ -514,23 +506,16 @@ class CLI:
         )
 
         if args.kakao_get_auth_android_login:
-            get_kakao_auth_android_login = GetKakaoAuthAndroidLogin(
-                opt_cred=opt_cred,
-                cb_msg=self.cb.msg,
-                cb_msg_block=self.cb.msg_block,
-                cb_ask_str=self.cb.ask_str,
-            )
-            auth_token = get_kakao_auth_android_login.get_cred()
+            get_kakao_auth_android_login = AuthKakaoAndroidLogin(opt_cred, self.cb)
+            auth_token, msg = get_kakao_auth_android_login.get_cred()
 
             if auth_token:
                 opt_cred.kakao_auth_token = auth_token
 
-                self.cb.msg(f"Got auth_token successfully: {auth_token}")
+            self.cb.put(msg)
 
         if args.kakao_get_auth_desktop_memdump:
-            get_kakao_auth_desktop_memdump = GetKakaoAuthDesktopMemdump(
-                cb_ask_str=self.cb.ask_str,
-            )
+            get_kakao_auth_desktop_memdump = AuthKakaoDesktopMemdump(opt_cred, self.cb)
             kakao_bin_path = None
             if args.kakao_bin_path:
                 kakao_bin_path = args.kakao_bin_path
@@ -539,62 +524,51 @@ class CLI:
             if auth_token:
                 opt_cred.kakao_auth_token = auth_token
 
-            self.cb.msg(msg)
+            self.cb.put(msg)
 
         if args.kakao_get_auth_desktop_login:
-            get_kakao_auth_desktop_login = GetKakaoAuthDesktopLogin(
-                opt_cred=opt_cred,
-                cb_msg=self.cb.msg,
-                cb_msg_block=self.cb.msg_block,
-                cb_ask_str=self.cb.ask_str,
-            )
+            get_kakao_auth_desktop_login = AuthKakaoDesktopLogin(opt_cred, self.cb)
             auth_token, msg = get_kakao_auth_desktop_login.get_cred()
 
             if auth_token:
                 opt_cred.kakao_auth_token = auth_token
 
-            self.cb.msg(msg)
+            self.cb.put(msg)
 
         if args.signal_get_auth:
-            m = GetSignalAuth(cb_msg=self.cb.msg, cb_ask_str=self.cb.ask_str)
+            m = AuthSignal(opt_cred, self.cb)
 
-            uuid, password = m.get_cred()
+            uuid, password, msg = m.get_cred()
             if uuid and password:
                 opt_cred.signal_uuid = uuid
                 opt_cred.signal_password = password
 
-                self.cb.msg(f"Got uuid and password successfully: {uuid}, {password}")
-
-            self.cb.msg("Failed to get uuid and password")
+            self.cb.put(msg)
 
         if args.telethon_setup:
-            telethon_setup = TelethonSetup(opt_cred, self.cb.ask_str)
-            success, _, telethon_api_id, telethon_api_hash = telethon_setup.start()
+            telethon_setup = AuthTelethon(opt_cred, self.cb)
+            success, _, telethon_api_id, telethon_api_hash, msg = telethon_setup.start(
+                check_auth_only=True
+            )
 
             if success:
                 opt_cred.telethon_api_id = telethon_api_id
                 opt_cred.telethon_api_hash = telethon_api_hash
 
-                self.cb.msg("Telethon setup successful")
-            else:
-                self.cb.msg("Telethon setup failed")
+            self.cb.put(msg)
 
         if args.line_get_auth:
-            get_line_auth = GetLineAuth()
+            get_line_auth = AuthLine(opt_cred, self.cb)
 
-            line_cookies = get_line_auth.get_cred()
+            line_cookies, msg = get_line_auth.get_cred()
 
             if line_cookies:
                 opt_cred.line_cookies = line_cookies
 
-                self.cb.msg("Got Line cookies successfully")
-            else:
-                self.cb.msg(
-                    "Failed to get Line cookies. Have you logged in the web browser?"
-                )
+            self.cb.put(msg)
 
         if args.viber_get_auth:
-            get_viber_auth = GetViberAuth(self.cb.ask_str)
+            get_viber_auth = AuthViber(opt_cred, self.cb)
 
             viber_bin_path = None
             if args.viber_bin_path:
@@ -605,20 +579,20 @@ class CLI:
             if viber_auth:
                 opt_cred.viber_auth = viber_auth
 
-            self.cb.msg(msg)
+            self.cb.put(msg)
 
         if args.discord_get_auth:
-            get_discord_auth = GetDiscordAuth(self.cb.msg)
+            get_discord_auth = AuthDiscord(opt_cred, self.cb)
             discord_token, msg = get_discord_auth.get_cred()
 
             if discord_token:
                 opt_cred.discord_token = discord_token
 
-            self.cb.msg(msg)
+            self.cb.put(msg)
 
         if args.save_cred:
             creds_path = CONFIG_DIR / "creds.json"
             JsonManager.save_json(creds_path, opt_cred.to_dict())
-            self.cb.msg("Saved credentials to creds.json")
+            self.cb.put("Saved credentials to creds.json")
 
         return opt_cred

sticker_convert/downloaders/download_line.py

@@ -14,9 +14,9 @@ import requests
 from bs4 import BeautifulSoup
 from PIL import Image
 
+from sticker_convert.auth.auth_line import AuthLine
 from sticker_convert.downloaders.download_base import DownloadBase
 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
 from sticker_convert.utils.media.apple_png_normalize import ApplePngNormalize
@@ -190,7 +190,7 @@ class DownloadLine(DownloadBase):
                         'Warning: Line cookies invalid, you will not be able to add text to "Custom stickers"'
                     )
 
-            if not GetLineAuth.validate_cookies(cookies):
+            if not AuthLine.validate_cookies(cookies):
                 self.cb.put(
                     'Warning: Line cookies invalid, you will not be able to add text to "Custom stickers"'
                 )

sticker_convert/downloaders/download_telegram.py

@@ -5,9 +5,9 @@ from urllib.parse import urlparse
 
 import anyio
 
+from sticker_convert.auth.telegram_api import BotAPI, TelegramAPI, TelethonAPI
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption, InputOption
-from sticker_convert.utils.auth.telegram_api import BotAPI, TelegramAPI, TelethonAPI
 from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 

sticker_convert/gui.py

@@ -4,19 +4,18 @@ import os
 import platform
 import signal
 import sys
-from functools import partial
 from json.decoder import JSONDecodeError
 from math import ceil
 from multiprocessing import Event, cpu_count
 from pathlib import Path
 from threading import Thread
-from typing import Any, Callable, Dict, Optional, Union, cast
+from typing import Any, Callable, Dict, Optional, cast
 from urllib.parse import urlparse
 
 from mergedeep import merge  # type: ignore
 from PIL import ImageFont
-from ttkbootstrap import BooleanVar, DoubleVar, IntVar, StringVar, Toplevel, Window  # type: ignore
-from ttkbootstrap.dialogs import Messagebox, Querybox  # type: ignore
+from ttkbootstrap import BooleanVar, DoubleVar, IntVar, StringVar, Window  # type: ignore
+from ttkbootstrap.dialogs import Messagebox  # type: ignore
 
 from sticker_convert.definitions import CONFIG_DIR, DEFAULT_DIR, ROOT_DIR
 from sticker_convert.gui_components.frames.comp_frame import CompFrame
@@ -29,6 +28,7 @@ from sticker_convert.gui_components.frames.progress_frame import ProgressFrame
 from sticker_convert.gui_components.gui_utils import GUIUtils
 from sticker_convert.job import Job
 from sticker_convert.job_option import CompOption, CredOption, InputOption, OutputOption
+from sticker_convert.utils.callback import CallbackGui
 from sticker_convert.utils.files.json_manager import JsonManager
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.url_detect import UrlDetect
@@ -38,6 +38,7 @@ from sticker_convert.version import __version__
 class GUI(Window):
     def __init__(self) -> None:
         super().__init__(themename="darkly", alpha=0)  # type: ignore
+        self.cb = CallbackGui(self)
         self.init_done = False
         self.load_jsons()
 
@@ -79,11 +80,13 @@ class GUI(Window):
 
     def quit(self) -> None:
         if self.job:
-            response = self.cb_ask_bool("Job is running, really quit?")
+            response = self.cb.put(
+                ("ask_bool", ("Job is running, really quit?",), None)
+            )
             if response is False:
                 return
 
-        self.cb_msg(msg="Quitting, please wait...")
+        self.cb.put("Quitting, please wait...")
 
         self.save_config()
         if self.settings_save_cred_var.get() is True:
@@ -241,7 +244,7 @@ class GUI(Window):
             msg += "Please use the stickers with your friends only.\n"
             msg += "It is illegal and immoral to sell stickers downloaded from this program.\n"
 
-        self.cb_msg(msg)
+        self.cb.put(msg)
 
     def warn_tkinter_bug(self) -> None:
         if (
@@ -255,13 +258,13 @@ class GUI(Window):
             msg += "on title bar or move mouse cursor away from window for a while.\n"
             msg += "(This is a bug in tkinter specific to macOS 14 python <=3.11.6)\n"
             msg += "(https://github.com/python/cpython/issues/110218)\n"
-            self.cb_msg(msg)
+            self.cb.put(msg)
 
     def load_jsons(self) -> None:
         try:
             from sticker_convert.utils.files.json_resources_loader import COMPRESSION_JSON, EMOJI_JSON, HELP_JSON, INPUT_JSON, OUTPUT_JSON
         except RuntimeError as e:
-            self.cb_msg(str(e))
+            self.cb.put(str(e))
             return
 
         self.help = HELP_JSON
@@ -286,7 +289,7 @@ class GUI(Window):
                     self.settings_path
                 )
             except JSONDecodeError:
-                self.cb_msg("Warning: config.json content is corrupted")
+                self.cb.put("Warning: config.json content is corrupted")
                 self.settings = {}
         else:
             self.settings = {}
@@ -296,7 +299,7 @@ class GUI(Window):
             try:
                 self.creds = JsonManager.load_json(self.creds_path)
             except JSONDecodeError:
-                self.cb_msg("Warning: creds.json content is corrupted")
+                self.cb.put("Warning: creds.json content is corrupted")
                 self.creds = {}
         else:
             self.creds = {}
@@ -494,17 +497,7 @@ class GUI(Window):
         opt_comp = self.get_opt_comp()
         opt_cred = self.get_opt_cred()
 
-        self.job = Job(
-            opt_input,
-            opt_comp,
-            opt_output,
-            opt_cred,
-            self.cb_msg,
-            self.cb_msg_block,
-            self.cb_bar,
-            self.cb_ask_bool,
-            self.cb_ask_str,
-        )
+        self.job = Job(opt_input, opt_comp, opt_output, opt_cred, self.cb)
 
         signal.signal(signal.SIGINT, self.job.cancel)
 
@@ -643,84 +636,6 @@ class GUI(Window):
             self.response = self.action()
         self.response_event.set()
 
-    def cb_ask_str(
-        self,
-        question: str,
-        initialvalue: Optional[str] = None,
-        cli_show_initialvalue: bool = True,
-        parent: Optional[object] = None,
-    ) -> str:
-        self.action = partial(
-            Querybox.get_string,  # type: ignore
-            question,
-            title="sticker-convert",
-            initialvalue=initialvalue,
-            parent=parent,
-        )
-        self.event_generate("<<exec_in_main>>")
-        self.response_event.wait()
-        self.response_event.clear()
-
-        if self.response is None:
-            return ""
-        elif isinstance(self.response, str):
-            return self.response
-        else:
-            raise RuntimeError(f"Invalid response in cb_ask_str: {self.response}")
-
-    def cb_ask_bool(
-        self, question: str, parent: Union[Window, Toplevel, None] = None
-    ) -> bool:
-        self.action = partial(
-            Messagebox.yesno,  # type: ignore
-            question,
-            title="sticker-convert",
-            parent=parent,
-        )
-        self.event_generate("<<exec_in_main>>")
-        self.response_event.wait()
-        self.response_event.clear()
-
-        if self.response == "Yes":
-            return True
-        return False
-
-    def cb_msg(self, *args: Any, **kwargs: Any) -> None:
-        self.progress_frame.update_message_box(*args, **kwargs)
-
-    def cb_msg_block(
-        self,
-        *args: Any,
-        message: Optional[str] = None,
-        parent: Optional[object] = None,
-        **_kwargs: Any,
-    ) -> Any:
-        if message is None and len(args) > 0:
-            message = " ".join(str(i) for i in args)
-        self.action = partial(
-            Messagebox.show_info,  # type: ignore
-            message,
-            title="sticker-convert",
-            parent=parent,
-        )
-        self.event_generate("<<exec_in_main>>")
-        self.response_event.wait()
-        self.response_event.clear()
-
-        return self.response
-
-    def cb_bar(
-        self,
-        set_progress_mode: Optional[str] = None,
-        steps: int = 0,
-        update_bar: int = 0,
-        *args: Any,
-        **kwargs: Any,
-    ) -> None:
-        self.progress_frame.update_progress_bar(
-            set_progress_mode, steps, update_bar, *args, **kwargs
-        )
-
     def highlight_fields(self) -> bool:
         if not self.init_done:
             return True

sticker_convert/gui_components/frames/comp_frame.py

@@ -21,7 +21,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["no_compress"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["no_compress"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.no_compress_lbl = Label(self, text="No compression")
@@ -38,7 +40,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["preset"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["preset"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.comp_preset_lbl = Label(self, text="Preset")
@@ -56,7 +60,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["steps"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["steps"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.steps_lbl = Label(self, text="Number of steps")
@@ -67,7 +73,9 @@ class CompFrame(LabelFrame):
             self,
             text="?",
             width=1,
-            command=lambda: self.gui.cb_msg_block(self.gui.help["comp"]["processes"]),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", (self.gui.help["comp"]["processes"],), None)
+            ),
             bootstyle="secondary",  # type: ignore
         )
         self.processes_lbl = Label(self, text="Number of processes")

sticker_convert/gui_components/frames/config_frame.py

@@ -78,27 +78,35 @@ class ConfigFrame(LabelFrame):
         )
 
     def cb_clear_cred(self, *_: Any, **kwargs: Any) -> None:
-        response = self.gui.cb_ask_bool("Are you sure you want to clear credentials?")
+        response = self.gui.cb.put(
+            ("ask_bool", ("Are you sure you want to clear credentials?",), None)
+        )
         if response is True:
             self.gui.delete_creds()
             self.gui.load_jsons()
             self.gui.apply_creds()
             self.gui.highlight_fields()
-            self.gui.cb_msg_block("Credentials cleared.")
+            self.gui.cb.put(("msg_block", ("Credentials cleared.",), None))
 
     def cb_restore_default(self, *_: Any, **kwargs: Any) -> None:
-        response = self.gui.cb_ask_bool(
-            "Are you sure you want to restore default config? (This will not clear credentials.)"
+        response = self.gui.cb.put(
+            (
+                "ask_bool",
+                (
+                    "Are you sure you want to restore default config? (This will not clear credentials.)",
+                ),
+                None,
+            )
         )
         if response is True:
             self.gui.delete_config()
             self.gui.load_jsons()
             self.gui.apply_config()
             self.gui.highlight_fields()
-            self.gui.cb_msg_block("Restored to default config.")
+            self.gui.cb.put(("msg_block", ("Restored to default config.",), None))
 
     def cb_open_config_directory(self, *_: Any, **kwargs: Any) -> None:
-        self.gui.cb_msg(msg=f"Config is located at {CONFIG_DIR}")
+        self.gui.cb.put(f"Config is located at {CONFIG_DIR}")
         if platform.system() == "Windows":
             os.startfile(CONFIG_DIR)  # type: ignore
         elif platform.system() == "Darwin":

sticker_convert/gui_components/frames/control_frame.py

@@ -23,7 +23,7 @@ class ControlFrame(Frame):
 
     def cb_start_btn(self, *args: Any, **kwargs: Any) -> None:
         if self.gui.job:
-            response = self.gui.cb_ask_bool("Cancel job?")
+            response = self.gui.cb.ask_bool("Cancel job?")
             if response is True:
                 self.gui.cancel_job()
         else:

sticker_convert/gui_components/frames/cred_frame.py

@@ -4,13 +4,13 @@ from typing import TYPE_CHECKING, Any
 
 from ttkbootstrap import Button, Entry, Label, LabelFrame  # type: ignore
 
+from sticker_convert.auth.auth_telethon import AuthTelethon
 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
 from sticker_convert.gui_components.windows.viber_get_auth_window import ViberGetAuthWindow
-from sticker_convert.utils.auth.telethon_setup import TelethonSetup
 
 if TYPE_CHECKING:
     from sticker_convert.gui import GUI  # type: ignore
@@ -188,19 +188,17 @@ class CredFrame(LabelFrame):
         faq_site = "https://github.com/laggykiller/sticker-convert#faq"
         success = webbrowser.open(faq_site)
         if not success:
-            self.gui.cb_ask_str("You can get help from:", initialvalue=faq_site)
+            self.gui.cb.ask_str("You can get help from:", initialvalue=faq_site)
 
     def cb_telethon_get_auth(self, *_: Any) -> None:
-        success, _client, api_id, api_hash = TelethonSetup(
-            self.gui.get_opt_cred(), self.gui.cb_ask_str
-        ).start()
+        success, _client, api_id, api_hash, msg = AuthTelethon(
+            self.gui.get_opt_cred(), self.gui.cb
+        ).start(check_auth_only=True)
         if success:
             self.gui.telethon_api_id_var.set(api_id)
             self.gui.telethon_api_hash_var.set(api_hash)
             self.gui.save_creds()
-            self.gui.cb_msg_block("Telethon setup successful")
-        else:
-            self.gui.cb_msg_block("Telethon setup failed")
+        self.gui.cb.put(("msg_block", (msg,), None))
 
     def cb_kakao_get_auth(self, *_: Any) -> None:
         KakaoGetAuthWindow(self.gui)

sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 import re
-from functools import partial
 from tkinter import colorchooser
 from typing import Any, List, Tuple
 
@@ -650,13 +649,13 @@ class AdvancedCompressionWindow(BaseWindow):
         self.set_emoji_btn()
 
     def add_help_btn(self, msg: str) -> Button:
-        cb_msg_block_adv_comp_win = partial(self.gui.cb_msg_block, parent=self)
-
         return Button(
             self.frame_advcomp,
             text="?",
             width=1,
-            command=lambda: cb_msg_block_adv_comp_win(msg),
+            command=lambda: self.gui.cb.put(
+                ("msg_block", None, {"message": msg, "parent": self})
+            ),
             bootstyle="secondary",  # type: ignore
         )
 

sticker_convert/gui_components/windows/base_window.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 import platform
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING, Optional, Tuple
 
 from ttkbootstrap import Toplevel  # type: ignore
 
@@ -11,10 +11,15 @@ if TYPE_CHECKING:
 
 
 class BaseWindow(Toplevel):
-    def __init__(self, gui: "GUI") -> None:
+    def __init__(self, gui: "GUI", parent: Optional[Toplevel] = None) -> None:
         super().__init__(alpha=0)  # type: ignore
         self.gui = gui
 
+        if parent is None:
+            self.parent = gui
+        else:
+            self.parent = parent
+
         GUIUtils.set_icon(self)
 
         self.mousewheel: Tuple[str, ...]