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

sticker_convert/utils/callback.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+from functools import partial
+from getpass import getpass
 from multiprocessing import Event, Manager
 from multiprocessing.managers import ListProxy, SyncManager
 from queue import Queue
@@ -19,6 +21,9 @@ if TYPE_CHECKING:
     ResponseListType = ListProxy[ResponseItemType]  # type: ignore
     CbQueueType = Queue[CbQueueItemType]  # type: ignore
     WorkQueueType = Queue[WorkQueueItemType]  # type: ignore
+    from ttkbootstrap import Toplevel  # type: ignore
+
+    from sticker_convert.gui import GUI  # type: ignore
 else:
     ResultsListType = List[Any]
     ResponseListType = List[ResponseItemType]
@@ -51,12 +56,13 @@ class CallbackProtocol(Protocol):
     def put(self, i: Union[CbQueueItemType, str]) -> Any: ...
 
 
-class Callback(CallbackProtocol):
+class CallbackCli(CallbackProtocol):
     def __init__(
         self,
         msg: Optional[Callable[..., None]] = None,
         bar: Optional[Callable[..., None]] = None,
         msg_block: Optional[Callable[..., None]] = None,
+        msg_dynamic: Optional[Callable[..., bool]] = None,
         ask_bool: Optional[Callable[..., bool]] = None,
         ask_str: Optional[Callable[..., str]] = None,
         silent: bool = False,
@@ -80,6 +86,11 @@ class Callback(CallbackProtocol):
         else:
             self.msg_block = self.cb_msg_block
 
+        if msg_dynamic:
+            self.msg_dynamic = msg_dynamic
+        else:
+            self.msg_dynamic = self.cb_msg_dynamic
+
         if ask_bool:
             self.ask_bool = ask_bool
         else:
@@ -136,6 +147,16 @@ class Callback(CallbackProtocol):
         if not self.no_confirm:
             input("Press Enter to continue...")
 
+    def cb_msg_dynamic(self, *args: Any) -> bool:
+        message = args[0]
+
+        if message is None:
+            print()
+        else:
+            print(message, end="\r", flush=True)
+
+        return True
+
     def cb_ask_bool(self, *args: Any, **kwargs: Any) -> bool:
         question = args[0]
 
@@ -158,17 +179,23 @@ class Callback(CallbackProtocol):
 
     def cb_ask_str(
         self,
-        msg: Optional[str] = None,
+        question: Optional[str] = None,
         initialvalue: Optional[str] = None,
         cli_show_initialvalue: bool = True,
+        password: bool = False,
     ) -> str:
-        self.msg(msg)
+        self.msg(question)
 
         hint = ""
         if cli_show_initialvalue and initialvalue:
             hint = f" [Default: {initialvalue}]"
 
-        response = input(f"Enter your response and press enter{hint} > ")
+        if password is True:
+            if question is None:
+                question = "Password: "
+            response = getpass(question)
+        else:
+            response = input(f"Enter your response and press enter{hint} > ")
 
         if initialvalue and not response:
             response = initialvalue
@@ -179,7 +206,210 @@ class Callback(CallbackProtocol):
         if isinstance(i, tuple):
             action = i[0]
             if len(i) >= 2:
-                args: Tuple[str, ...] = i[1] if i[1] else tuple()
+                args: Tuple[Any, ...] = i[1] if i[1] else tuple()
+            else:
+                args = tuple()
+            if len(i) >= 3:
+                kwargs: Dict[str, Any] = i[2] if i[2] else {}
+            else:
+                kwargs = {}
+        else:
+            action = i
+            args = tuple()
+            kwargs = {}
+
+        # Fake implementation for Queue.put()
+        if action is None:
+            return None
+        if action == "msg":
+            self.msg(*args, **kwargs)
+        elif action == "bar":
+            self.bar(**kwargs)
+        elif action == "update_bar":
+            self.bar(update_bar=1)
+        elif action == "msg_block":
+            return self.msg_block(*args, **kwargs)
+        elif action == "msg_dynamic":
+            return self.msg_dynamic(*args, **kwargs)
+        elif action == "ask_bool":
+            return self.ask_bool(*args, **kwargs)
+        elif action == "ask_str":
+            return self.ask_str(*args, **kwargs)
+        else:
+            self.msg(action)
+        return None
+
+
+class CallbackGui(CallbackProtocol):
+    def __init__(self, gui: "GUI"):
+        from ttkbootstrap import Label, Progressbar, StringVar  # type: ignore
+
+        from sticker_convert.gui_components.windows.base_window import BaseWindow
+        from sticker_convert.job import Job
+
+        self.gui = gui
+        self.job: Optional[Job] = None
+        self.msg_dynamic_window: Optional[BaseWindow] = None
+        self.message_var = StringVar(self.gui)
+        self.msg_dynamic_label: Optional[Label] = None
+        self.msg_dynamic_bar: Optional[Progressbar] = None
+
+        self.ask_str = self.cb_ask_str
+        self.ask_bool = self.cb_ask_bool
+        self.msg = self.cb_msg
+        self.msg_block = self.cb_msg_block
+        self.msg_dynamic = self.cb_msg_dynamic
+        self.bar = self.cb_bar
+
+    def cb_ask_str(
+        self,
+        question: str,
+        initialvalue: Optional[str] = None,
+        cli_show_initialvalue: bool = True,
+        password: bool = False,
+        parent: Optional[object] = None,
+    ) -> str:
+        from ttkbootstrap import Querybox  # type: ignore
+
+        self.gui.action = partial(
+            Querybox.get_string,  # type: ignore
+            question,
+            title="sticker-convert",
+            initialvalue=initialvalue,
+            parent=parent,
+        )
+        self.gui.event_generate("<<exec_in_main>>")
+        self.gui.response_event.wait()
+        self.gui.response_event.clear()
+
+        if self.gui.response is None:
+            return ""
+        elif isinstance(self.gui.response, str):
+            return self.gui.response
+        else:
+            raise RuntimeError(f"Invalid response in cb_ask_str: {self.gui.response}")
+
+    def cb_ask_bool(self, question: str, parent: Optional["Toplevel"] = None) -> bool:
+        from ttkbootstrap.dialogs import Messagebox  # type: ignore
+
+        self.gui.action = partial(
+            Messagebox.yesno,  # type: ignore
+            question,
+            title="sticker-convert",
+            parent=parent,
+        )
+        self.gui.event_generate("<<exec_in_main>>")
+        self.gui.response_event.wait()
+        self.gui.response_event.clear()
+
+        if self.gui.response == "Yes":
+            return True
+        return False
+
+    def cb_msg(self, *args: Any, **kwargs: Any) -> None:
+        self.gui.progress_frame.update_message_box(*args, **kwargs)
+
+    def cb_msg_block(
+        self,
+        message: Optional[str] = None,
+        parent: Optional[object] = None,
+        **_kwargs: Any,
+    ) -> Any:
+        from ttkbootstrap.dialogs import Messagebox  # type: ignore
+
+        self.gui.action = partial(
+            Messagebox.show_info,  # type: ignore
+            message,
+            title="sticker-convert",
+            parent=parent,
+        )
+        self.gui.event_generate("<<exec_in_main>>")
+        self.gui.response_event.wait()
+        self.gui.response_event.clear()
+
+        return self.gui.response
+
+    def cb_msg_dynamic(
+        self,
+        message: Optional[str] = None,
+        parent: Optional["Toplevel"] = None,
+        **_kwargs: Any,
+    ) -> bool:
+        from ttkbootstrap import Label, Progressbar  # type: ignore
+
+        from sticker_convert.gui_components.gui_utils import GUIUtils
+        from sticker_convert.gui_components.windows.base_window import BaseWindow
+
+        self.gui.action = None
+        if self.msg_dynamic_window is None:
+            if message is not None:
+                self.msg_dynamic_window = BaseWindow(self.gui, parent)
+                self.msg_dynamic_window.wm_title("sticker-convert")
+                self.message_var.set(message)
+                self.msg_dynamic_label = Label(
+                    self.msg_dynamic_window.scrollable_frame,
+                    textvariable=self.message_var,
+                )
+                self.msg_dynamic_bar = Progressbar(
+                    self.msg_dynamic_window.scrollable_frame,
+                    orient="horizontal",
+                    mode="indeterminate",
+                )
+                self.msg_dynamic_bar.start(50)
+                self.msg_dynamic_label.pack()
+                self.msg_dynamic_bar.pack(fill="x")
+                self.gui.action = partial(
+                    GUIUtils.finalize_window, self.msg_dynamic_window
+                )
+                print(message, end="\r", flush=True)
+                ret = True
+            else:
+                print()
+                ret = False
+        elif self.msg_dynamic_window.winfo_exists() == 0:
+            self.msg_dynamic_window = None
+            print()
+            ret = False
+        else:
+            if message is None:
+
+                def _action():
+                    assert self.msg_dynamic_window is not None
+                    self.msg_dynamic_window.destroy()
+                    self.msg_dynamic_window = None
+
+                self.gui.action = _action
+                print()
+                ret = False
+            else:
+                self.gui.action = partial(self.message_var.set, message)
+                print(message, end="\r", flush=True)
+                ret = True
+
+        if self.gui.action is not None:
+            self.gui.event_generate("<<exec_in_main>>")
+            self.gui.response_event.wait()
+            self.gui.response_event.clear()
+
+        return ret
+
+    def cb_bar(
+        self,
+        set_progress_mode: Optional[str] = None,
+        steps: int = 0,
+        update_bar: int = 0,
+        *args: Any,
+        **kwargs: Any,
+    ) -> None:
+        self.gui.progress_frame.update_progress_bar(
+            set_progress_mode, steps, update_bar, *args, **kwargs
+        )
+
+    def put(self, i: Union[CbQueueItemType, str]) -> Union[str, bool, None]:
+        if isinstance(i, tuple):
+            action = i[0]
+            if len(i) >= 2:
+                args: Tuple[Any, ...] = i[1] if i[1] else tuple()
             else:
                 args = tuple()
             if len(i) >= 3:
@@ -202,10 +432,12 @@ class Callback(CallbackProtocol):
             self.bar(update_bar=1)
         elif action == "msg_block":
             return self.msg_block(*args, **kwargs)
+        elif action == "msg_dynamic":
+            return self.msg_dynamic(*args, **kwargs)
         elif action == "ask_bool":
             return self.ask_bool(*args, **kwargs)
         elif action == "ask_str":
-            return self.ask_str(**kwargs)
+            return self.ask_str(*args, **kwargs)
         else:
             self.msg(action)
         return None

sticker_convert/version.py

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

{sticker_convert-2.14.0.0.dist-info → sticker_convert-2.15.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.14.0.0
+Version: 2.15.0.0
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -364,10 +364,10 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.2.1
-Requires-Dist: anyio~=4.10.0
+Requires-Dist: anyio~=4.11.0
 Requires-Dist: apngasm_python~=1.3.2
 Requires-Dist: av<15,>=13.1.0
-Requires-Dist: beautifulsoup4~=4.13.5
+Requires-Dist: beautifulsoup4~=4.14.2
 Requires-Dist: cryptg~=0.5.1
 Requires-Dist: cryptography~=46.0.1
 Requires-Dist: rookiepy~=0.5.6
@@ -378,8 +378,8 @@ Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.3.0
 Requires-Dist: pyoxipng~=9.1.1
-Requires-Dist: python-telegram-bot~=22.4
-Requires-Dist: psutil~=7.0.0
+Requires-Dist: python-telegram-bot~=22.5
+Requires-Dist: psutil~=7.1.0
 Requires-Dist: PyMemoryEditor~=1.5.24
 Requires-Dist: requests~=2.32.4
 Requires-Dist: rlottie_python~=1.3.8

{sticker_convert-2.14.0.0.dist-info → sticker_convert-2.15.0.0.dist-info}/RECORD

@@ -1,41 +1,52 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
-sticker_convert/cli.py,sha256=AWdcGeMJudYb39Pxi28svPQrNs6pPpa-d-RhQN-Ryz8,23674
+sticker_convert/cli.py,sha256=pSgVK4IFWIYaHeZIQ1P2ojvNynNH_AMPvrqWU7_CGw0,22646
 sticker_convert/converter.py,sha256=7-XQbBUAqfc9mLuLTIkjjMeO-UTInldeRD32suFgNJo,41141
 sticker_convert/definitions.py,sha256=BqROmOvqIqw8ANaqZXIxJAXGD0HgjAvCfFouQ4SaWHc,2254
-sticker_convert/gui.py,sha256=kUEIfd7fYtvlGwc29VQV1dpQLn07Gv2WEeXuJDuAlsE,34571
-sticker_convert/job.py,sha256=AJoxWg61ZxQRHzKyGIrQaaCGs-S6NDO6lvWjddYemH8,28543
+sticker_convert/gui.py,sha256=6TCe2rHdE4mBUjFzv-uuvFJ6izuNB0U4a0s1rHMgT3A,32171
+sticker_convert/job.py,sha256=LXUlUs3ok7YaIal3bE1_nzjVq75WkpmJ3AuJEZ3EUzg,28153
 sticker_convert/job_option.py,sha256=unG8kt2cCK-Rmg45xkhD4JFt5ubx6P6JEvLvDeOeX_I,8222
-sticker_convert/version.py,sha256=u8HiSgljvPyJwWtEWrwe5go7kX6hzYxjhPg2UDJ2ssg,49
+sticker_convert/version.py,sha256=dgMTvKQecYT-RaM2bavGbGWnHYbjUimyFXvIIvJ0lXc,49
+sticker_convert/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sticker_convert/auth/auth_base.py,sha256=WujBjMjHBC_6nfO4p4gZz8mEKs-ODt72KHkwvc0t3n4,482
+sticker_convert/auth/auth_discord.py,sha256=024YBlea91I16vQqcq0WYudLBh7YnVbdMXiQxdEirrE,5385
+sticker_convert/auth/auth_kakao_android_login.py,sha256=-7ysyXoglJKotQKrUsvZurGdPs2Si7pdNEZg59P6E70,11364
+sticker_convert/auth/auth_kakao_desktop_login.py,sha256=LzHV3TvyHE0bBNG5nr9nkn6eH6uXoCISqOEKLb6USX0,12442
+sticker_convert/auth/auth_kakao_desktop_memdump.py,sha256=nL2q7Cr_YuOU4xqJcwgVdq4UV5ElTlxxFr4qiQuJS00,9137
+sticker_convert/auth/auth_line.py,sha256=I9zFqgYm5sh8WGI-ZBymZtVJB5hBTOw-2f99l4JmGaM,2758
+sticker_convert/auth/auth_signal.py,sha256=SQagPgD5T8MKplHuSvxaTPAc9rhbRG40t1w0V7PpULY,4741
+sticker_convert/auth/auth_telethon.py,sha256=Yq8HpSHB4npTE77eBF-Hbk6n5IGpUtWx9mfwnwhKnLc,5237
+sticker_convert/auth/auth_viber.py,sha256=XipGCvyjpvKBHTDlO8VdemMm377D6cSG0MRt0G-Kbho,8396
+sticker_convert/auth/telegram_api.py,sha256=RstISgrYwAU_s6QQSTLthInfRm4Q1qZSAb-7vtmAvbk,24071
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_band.py,sha256=JPjwwdxbMXPBM9TXF76wT9mtoDCLssYnrm1iS2C6uVM,3629
 sticker_convert/downloaders/download_base.py,sha256=MI5pCT_tkfoaFlrD1oNynDj1Rv1CK0APuNVElTEAEis,5110
 sticker_convert/downloaders/download_discord.py,sha256=6AFpLAYL2hRvVcsqUtzDUC31U66U02ZcnKXDnZRi2jk,3496
 sticker_convert/downloaders/download_kakao.py,sha256=lRmpEcYjHizIRM0uFBDvjMqNEpur0VmOTKAmiir9eB0,15181
-sticker_convert/downloaders/download_line.py,sha256=yISEgSpFtQtLUdWH5b8Qby9l3qY5U6o34DgTt9aqmIw,18126
+sticker_convert/downloaders/download_line.py,sha256=XVhW65I_59EtoeXhsLPMvuq-ZTPjezngcKo11eJr-6E,18110
 sticker_convert/downloaders/download_ogq.py,sha256=-iSTQaCUlROfY7a9EFhJGq6fenY48AZEevfQLT9-pAk,2951
 sticker_convert/downloaders/download_signal.py,sha256=3wv-BLd4qggly4AdtwV8f3vUpCVZ-8GnoPLoWngY3Pk,3728
-sticker_convert/downloaders/download_telegram.py,sha256=iGmOcVjU2Ai19t1lyDY2JhQIc--O5XMyNCGXZAA4DVY,2028
+sticker_convert/downloaders/download_telegram.py,sha256=WU9C53ePH_-Pp36AQ3suMoBjInydkP3v5-uuwltusWk,2022
 sticker_convert/downloaders/download_viber.py,sha256=SFnyaVEd_33J1KvRhcHDJqnLKGsbLMeA2NomVHm2ulM,4226
 sticker_convert/gui_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/gui_components/gui_utils.py,sha256=okho2cA1Scem_m6rPiYifreFzpFrM21-yUkiAv64EUI,3431
 sticker_convert/gui_components/frames/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sticker_convert/gui_components/frames/comp_frame.py,sha256=jutMKt1cvKPRabVsrutfIjKFgPlU8DYl75ne346ubxs,7336
-sticker_convert/gui_components/frames/config_frame.py,sha256=b3X4QAnGpde0OhthXHmjSyU_Yb5tYRUFXmy04Yi8Zmo,4316
-sticker_convert/gui_components/frames/control_frame.py,sha256=_XiOJ9JPUfiysDghGG04sEVLrXG9TMVlDZ60W0LhYVI,835
-sticker_convert/gui_components/frames/cred_frame.py,sha256=pQldn05cIgxK_pE899DgxMOe56KN9MTteDF-L6-DquI,9646
+sticker_convert/gui_components/frames/comp_frame.py,sha256=OTMp5vf2IELFe9947aYNfJtGjzn8xv4oHPNqOIk2n5U,7528
+sticker_convert/gui_components/frames/config_frame.py,sha256=rq1HgOJMj31iRVrAakcSaDH6hRJFjzmm0WPebBDDuGQ,4507
+sticker_convert/gui_components/frames/control_frame.py,sha256=vaJK3X1maKkSC-oFupvKzPiW8hkQpsxOifpC47ZidR4,835
+sticker_convert/gui_components/frames/cred_frame.py,sha256=M26e57CwetvdUEpI7DrBCgLXS1s7dX4c5NE0AeHWrzA,9571
 sticker_convert/gui_components/frames/input_frame.py,sha256=5Vz1d6J1jkofvvzm43DxeIW_CjWfxa2QPYFnkAAiAfM,5040
 sticker_convert/gui_components/frames/output_frame.py,sha256=n2WLk22h61DoZli8WbFhd-h2CqWAebDXnBa051JBuOc,4260
 sticker_convert/gui_components/frames/progress_frame.py,sha256=LWUZg_iL7iiNTfu7N5Ct_pklZdghxihENi7DP9YozOE,4915
 sticker_convert/gui_components/frames/right_clicker.py,sha256=dGIvSzEChrkguR80pzUemBNJ39uzJjVJQKeDNUoW3Gk,721
 sticker_convert/gui_components/windows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sticker_convert/gui_components/windows/advanced_compression_window.py,sha256=mIkapYo93Kw7oa10in1yH-DwR3hX0D2JYJ7cTAs48bk,33748
-sticker_convert/gui_components/windows/base_window.py,sha256=xBE1peGMPvWsdrFej0CJUVhmQ57GJGvz-cX03nIIhkE,1108
-sticker_convert/gui_components/windows/discord_get_auth_window.py,sha256=a9ptBqtpZslQJ87-ZPotcT6gigouIHWAFijfkWv2rZQ,2786
-sticker_convert/gui_components/windows/kakao_get_auth_window.py,sha256=TH4yLi4YmydukTm4K99DficaxBne0tAAvbDzU3EYR0A,17624
-sticker_convert/gui_components/windows/line_get_auth_window.py,sha256=S4ES_lk2-GDvPokZtYALnUc5zW1VbS4WulNqO9K1aSs,3375
-sticker_convert/gui_components/windows/signal_get_auth_window.py,sha256=d9vWMfrD0s-qI-TmB0796LRvDW64Jh2wmA1mZcRubUw,3126
-sticker_convert/gui_components/windows/viber_get_auth_window.py,sha256=DI-RayYAfk6ig7NlGy97ulYgZZs77S8CEDIUJdtGDwI,5787
+sticker_convert/gui_components/windows/advanced_compression_window.py,sha256=0y-3CfMQhUJ8I3ybV3PK9RKGgUXOjIgO-m2OOVeKtkI,33707
+sticker_convert/gui_components/windows/base_window.py,sha256=nCbIGRdhoXVrTXh9dBAEmemB-C03_VwS9hvpDXiaWgY,1258
+sticker_convert/gui_components/windows/discord_get_auth_window.py,sha256=1-XdEUJjjbD6sMfVobuAa2viuZQMlWrtvibMU_5tkGE,2637
+sticker_convert/gui_components/windows/kakao_get_auth_window.py,sha256=1ezF9YVamtKsLxt4nEAjCfTW_weCWGgRC-QjlzyrJMU,18364
+sticker_convert/gui_components/windows/line_get_auth_window.py,sha256=1QO8W6nJtMXnk1qDCLF71X-IOZz_hR0914gMvV0j8vc,3180
+sticker_convert/gui_components/windows/signal_get_auth_window.py,sha256=Ko8iML7MCWvdneUTYWhVevrdGGJbfUYyer3cVOEoZ0g,2778
+sticker_convert/gui_components/windows/viber_get_auth_window.py,sha256=JFWk18WtPthVWMIFOwNqIC36OpMfOqiZwRCAEXcmZs0,5729
 sticker_convert/ios-message-stickers-template/.gitignore,sha256=4uuTph_9eHfqXHUavLOmGOji6aIHOif2bUEU_hCBn4Y,9
 sticker_convert/ios-message-stickers-template/README.md,sha256=oN0FvJkCWWjSZ3PMrCvY3T1zCsdkZYFgGHAoFh0Kmt8,467
 sticker_convert/ios-message-stickers-template/.github/FUNDING.yml,sha256=3LlmdSAGDsBA2o_C1iBYTNLwkABnyZuN0zxgPPyd-f8,70
@@ -83,24 +94,15 @@ sticker_convert/uploaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 sticker_convert/uploaders/compress_wastickers.py,sha256=Rgl3WzIDJn7oa00nNqeBFDqIHP-cWvgQqET2-kDbf9c,7417
 sticker_convert/uploaders/upload_base.py,sha256=uQupPn6r4zrlAzpKzzX7CgvZb69ATyrwPKahWOQj0ds,1203
 sticker_convert/uploaders/upload_signal.py,sha256=k9XS6oU0gYCXEph-LzWvUP3IDINAVaQzzzNgDRp_YNM,7443
-sticker_convert/uploaders/upload_telegram.py,sha256=CAZI0cOXImFjKL6MIeIfY2Xfhil8sqntQBxOrnROooo,12862
+sticker_convert/uploaders/upload_telegram.py,sha256=QeD_bYmE8E_oHNiepsr6jn03sPc4KPvkfCQBZfTr_b0,12856
 sticker_convert/uploaders/upload_viber.py,sha256=_vOK0UgP7V7ZeFG6pR3sVf3A744Q6J19qzO-2hDvt5w,6583
 sticker_convert/uploaders/xcode_imessage.py,sha256=iTTT8gDYOTNkKqXeSWUBuWfxu7xeE418t2Z1YQFR5L0,11365
-sticker_convert/utils/callback.py,sha256=spYUGlklOs1yPZAxoqwOWgR1sdimpfM8a27if3TaVYk,6155
+sticker_convert/utils/callback.py,sha256=rj-ygdHbf9cpsDiIMXykfI55bxYOWpF2T5_dy1ebR3k,13855
 sticker_convert/utils/chrome_remotedebug.py,sha256=moFj-Uz_bBy4-wXFET80sdwkzNC4PW8LMwwrU8yKOg8,6642
 sticker_convert/utils/emoji.py,sha256=AqB26JY-PkYzNwPLReSnqLiQKe-bR9UXnLclAbgubJ8,367
 sticker_convert/utils/process.py,sha256=y_W-D9zkxAEfPvYJZTKxNtNHxmuK0NldpDXu-OdGR1M,5704
 sticker_convert/utils/singletons.py,sha256=SiV374FxU68DpysGoj_ytU1ErINkeOBbP4s9QTcexeY,357
 sticker_convert/utils/url_detect.py,sha256=_wmI28hUyngq8TVz1bw7YM90qPLd3bIynawVlbr_lcI,939
-sticker_convert/utils/auth/get_discord_auth.py,sha256=8H9Z0c7pl6JjzkP8lo0-lCFnBAT5Eql-LYc6M92FY_k,4283
-sticker_convert/utils/auth/get_kakao_auth_android_login.py,sha256=YOyzNvPBUseoZBD8o3IoJsDA207G_sJGfZU3x1aUwTA,10772
-sticker_convert/utils/auth/get_kakao_auth_desktop_login.py,sha256=Lf_AzTzRW-NwYrayL7hwXIfQUYZxc03cnFB8WcyBwuE,10680
-sticker_convert/utils/auth/get_kakao_auth_desktop_memdump.py,sha256=GE4rjVx32zHmQbX8tuO8V_ZhBCcXv-sHdeqHEG5H6HI,8911
-sticker_convert/utils/auth/get_line_auth.py,sha256=8l8ha2vQmk3rHGvDE7PkcxQXbH3oe62LKbI3qVUtvqc,2196
-sticker_convert/utils/auth/get_signal_auth.py,sha256=I6od2aj8yl1eLV8S2TtNQEPM77DC7FpkRKex0pXY2II,4580
-sticker_convert/utils/auth/get_viber_auth.py,sha256=aQiv1JI2RKiPVoo_JjbjcWwsUr2OK2FXMsFLPb3TtGU,8123
-sticker_convert/utils/auth/telegram_api.py,sha256=_DAtxE1vP5eChKyQ53WIdDzojH6YY4hza_LJPF5NZZQ,24368
-sticker_convert/utils/auth/telethon_setup.py,sha256=7VtsSM3n8qrN_VXV8hBaNSmApxgIPCa84Z08fRr43eQ,3309
 sticker_convert/utils/chromiums/linux.py,sha256=voWOxQVNy2icGDQfnZEa-2Nwrv-Qmuvt0v1L65hKnY8,1719
 sticker_convert/utils/chromiums/osx.py,sha256=ET6_uWZDbPCIN-GihMmjNcva0-WAyn0fA2-SzNn5wcU,3255
 sticker_convert/utils/chromiums/windows.py,sha256=wOyEQIQNV3_Nb2m44aFJh6QJj16cDpNmD1NxnVNlkrk,2188
@@ -114,9 +116,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=HwA6eVh7cLhOlUoR_K9d_wyBRJ_ocGtB3GAyne_iZAU,16483
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=oM32P186tWe9YxvBQRPr8D3FEmBN3b2rEe_2S_MwxyQ,6236
-sticker_convert-2.14.0.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.14.0.0.dist-info/METADATA,sha256=lef3juGzbeG_KZ71ntLIhD68ztCclv1_WlsYC5ZHmbU,56527
-sticker_convert-2.14.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sticker_convert-2.14.0.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.14.0.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.14.0.0.dist-info/RECORD,,
+sticker_convert-2.15.0.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.15.0.0.dist-info/METADATA,sha256=wFGcTf7ZX5KLVE-Xi85Et9PfNIIy4JLSK7q5j94PbhA,56527
+sticker_convert-2.15.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sticker_convert-2.15.0.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.15.0.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.15.0.0.dist-info/RECORD,,

sticker_convert/utils/auth/telethon_setup.py

@@ -1,97 +0,0 @@
-#!/usr/bin/env python3
-from typing import Callable, Optional, Tuple
-
-import anyio
-from telethon import TelegramClient  # type: ignore
-from telethon.errors import SessionPasswordNeededError  # type: ignore
-
-from sticker_convert.definitions import CONFIG_DIR
-from sticker_convert.job_option import CredOption
-
-GUIDE_MSG = """1. Visit https://my.telegram.org
-2. Login using your phone number
-3. Go to "API development tools"
-4. Fill form
-- App title: sticker-convert
-- Short name: sticker-convert
-- URL: www.telegram.org
-- Platform: Desktop
-- Description: sticker-convert
-5. Note down api_id and api_hash
-Continue when done"""
-
-
-class TelethonSetup:
-    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
-
-    async def signin_async(self) -> Tuple[bool, TelegramClient, int, str]:
-        client = TelegramClient(
-            CONFIG_DIR / f"telethon-{self.opt_cred.telethon_api_id}.session",
-            self.opt_cred.telethon_api_id,
-            self.opt_cred.telethon_api_hash,
-        )
-
-        await client.connect()
-        authed = await client.is_user_authorized()
-        if authed is False:
-            phone_number = self.cb_ask_str("Enter phone number: ")
-            await client.send_code_request(phone_number)
-            code = self.cb_ask_str("Enter code: ")
-            try:
-                await client.sign_in(phone_number, code)
-            except SessionPasswordNeededError:
-                password = self.cb_ask_str("Enter password: ")
-                await client.sign_in(password=password)
-            authed = await client.is_user_authorized()
-
-        return (
-            authed,
-            client,
-            self.opt_cred.telethon_api_id,
-            self.opt_cred.telethon_api_hash,
-        )
-
-    def guide(self) -> None:
-        self.cb_ask_str(GUIDE_MSG)
-
-    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 == "":
-                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, Optional[TelegramClient], int, str]:
-        cred_valid = False
-        if self.opt_cred.telethon_api_id == 0 or self.opt_cred.telethon_api_hash == "":
-            self.guide()
-            cred_valid = self.get_api_info()
-        if cred_valid:
-            return self.signin()
-        else:
-            return False, None, 0, ""
-
-    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()
-        return await self.signin_async()