sticker-convert 2.7.5__tar.gz → 2.7.6__tar.gz

{sticker-convert-2.7.5/src/sticker_convert.egg-info → sticker-convert-2.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.5
+Version: 2.7.6
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/cli.py

@@ -135,7 +135,7 @@ class CLI:
                 continue
             parser_comp.add_argument(
                 f'--{k.replace("_", "-")}',
-                **keyword_args,  # type: ignore
+                **keyword_args,
                 dest=k,
                 help=v,
             )
@@ -154,7 +154,7 @@ class CLI:
                 keyword_args = {"action": "store_true"}
             parser_cred.add_argument(
                 f'--{k.replace("_", "-")}',
-                **keyword_args,  # type: ignore
+                **keyword_args,
                 dest=k,
                 help=v,
             )

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/gui.py

@@ -550,9 +550,8 @@ class GUI(Window):
 
     def cancel_job(self) -> None:
         if self.job:
-            self.cb_msg(msg="Cancelling job...")
-            self.job.cancel()
-            self.cb_bar(set_progress_mode="clear")
+            # Need to start new thread or else GUI may freeze
+            Thread(target=self.job.cancel, daemon=True).start()
 
     def set_inputs(self, state: str) -> None:
         # state: 'normal', 'disabled'
@@ -639,7 +638,7 @@ class GUI(Window):
         *args: Any,
         set_progress_mode: Optional[str] = None,
         steps: int = 0,
-        update_bar: bool = False,
+        update_bar: int = 0,
         **kwargs: Any,
     ) -> None:
         with self.bar_lock:

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/gui_components/frames/config_frame.py

@@ -42,7 +42,7 @@ class ConfigFrame(LabelFrame):
         )
 
         self.settings_restore_default_lbl = Label(
-            self, text="Restore default config", width=18, justify="left", anchor="w"
+            self, text="Default config", width=18, justify="left", anchor="w"
         )
         self.settings_restore_default_btn = Button(
             self,

sticker-convert-2.7.6/src/sticker_convert/gui_components/frames/progress_frame.py

@@ -0,0 +1,129 @@
+#!/usr/bin/env python3
+from typing import TYPE_CHECKING, Any, Optional
+
+from tqdm import tqdm
+from ttkbootstrap import LabelFrame, Progressbar  # type: ignore
+from ttkbootstrap.scrolled import ScrolledText  # type: ignore
+
+from sticker_convert.gui_components.frames.right_clicker import RightClicker
+
+if TYPE_CHECKING:
+    from sticker_convert.gui import GUI  # type: ignore
+
+
+class ProgressFrame(LabelFrame):
+    progress_bar_cli = None
+    progress_bar_steps = 0
+    auto_scroll = True
+    msg_cls = False
+    msg_buffer = ""
+    bar_mode_changed = False
+    bar_mode = "clear"
+    bar_updates = 0
+    bar_steps = 0
+
+    def __init__(self, gui: "GUI", *args: Any, **kwargs: Any) -> None:
+        self.gui = gui
+        super().__init__(*args, **kwargs)  # type: ignore
+
+        self.message_box = ScrolledText(self, height=15, wrap="word")
+        self.message_box._text.bind("<Button-3><ButtonRelease-3>", RightClicker)  # type: ignore
+        self.message_box._text.config(state="disabled")  # type: ignore
+        self.progress_bar = Progressbar(self, orient="horizontal", mode="determinate")
+
+        self.message_box.bind("<Enter>", self.cb_disable_autoscroll)
+        self.message_box.bind("<Leave>", self.cb_enable_autoscroll)
+
+        self.message_box.pack(expand=True, fill="x")
+        self.progress_bar.pack(expand=True, fill="x")
+
+        self.after(40, self.update_ui)
+
+    def update_progress_bar(
+        self,
+        set_progress_mode: Optional[str] = None,
+        steps: int = 0,
+        update_bar: int = 0,
+    ) -> None:
+        if update_bar:
+            self.bar_updates += update_bar
+        elif set_progress_mode:
+            self.bar_mode = set_progress_mode
+            self.bar_steps = steps
+            self.bar_updates = 0
+            self.bar_mode_changed = True
+
+    def update_message_box(self, *args: Any, **kwargs: Any) -> None:
+        msg = kwargs.get("msg")
+        cls = kwargs.get("cls")
+
+        if not msg and len(args) == 1:
+            msg = str(args[0])
+
+        if cls:
+            self.msg_cls = True
+            self.msg_buffer = ""
+
+        if msg:
+            self.msg_buffer += msg + "\n"
+
+    def update_ui(self) -> None:
+        if self.msg_cls or self.msg_buffer:
+            self.message_box._text.config(state="normal")  # type: ignore
+
+            if self.msg_cls:
+                self.message_box.delete(1.0, "end")  # type: ignore
+
+            if self.msg_buffer:
+                msg = self.msg_buffer.strip()
+                if self.progress_bar_cli:
+                    self.progress_bar_cli.write(msg)
+                else:
+                    print(msg)
+
+                self.message_box.insert("end", msg + "\n")  # type: ignore
+
+                if self.auto_scroll:
+                    self.message_box._text.yview_moveto(1.0)  # type: ignore
+
+            self.msg_cls = False
+            self.msg_buffer = ""
+
+            self.message_box._text.config(state="disabled")  # type: ignore
+
+        if self.bar_mode_changed:
+            if self.bar_mode == "determinate":
+                self.progress_bar_cli = tqdm(total=self.bar_steps)
+                self.progress_bar.config(mode="determinate")
+                self.progress_bar_steps = self.bar_steps
+                self.progress_bar.stop()
+            elif self.progress_bar_cli:
+                self.progress_bar_cli.close()
+                self.progress_bar_cli = None
+
+            if self.bar_mode == "indeterminate":
+                self.progress_bar.config(mode="indeterminate")
+                self.progress_bar.start(50)
+            elif self.bar_mode == "clear":
+                self.progress_bar.config(mode="determinate")
+                self.progress_bar.stop()
+
+            self.progress_bar["value"] = 0
+
+        if self.bar_updates and self.progress_bar_cli:
+            self.progress_bar_cli.update(self.bar_updates)
+            self.progress_bar["value"] += (
+                100 / self.progress_bar_steps * self.bar_updates
+            )
+            self.update_progress_bar(update_bar=self.bar_updates)
+
+        self.bar_mode_changed = False
+        self.bar_updates = 0
+
+        self.after(40, self.update_ui)
+
+    def cb_disable_autoscroll(self, *_: Any) -> None:
+        self.auto_scroll = False
+
+    def cb_enable_autoscroll(self, *_: Any) -> None:
+        self.auto_scroll = True

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/gui_components/windows/signal_get_auth_window.py

@@ -41,15 +41,21 @@ class SignalGetAuthWindow(BaseWindow):
 
         # Start button frame
         self.launch_btn = Button(
-            self.frame_btns, text="Launch Signal Desktop", command=self.cb_launch_signal
+            self.frame_btns,
+            text="Launch Signal Desktop",
+            command=self.cb_launch_signal,
+            bootstyle="secondary",  # type: ignore
         )
 
-        self.login_btn = Button(
-            self.frame_btns, text="Get uuid and password", command=self.cb_login
+        self.get_cred_btn = Button(
+            self.frame_btns,
+            text="Get uuid and password",
+            command=self.cb_get_cred,
+            bootstyle="default",  # type: ignore
         )
 
         self.launch_btn.pack()
-        self.login_btn.pack()
+        self.get_cred_btn.pack()
 
         # Config frame
         self.setdir_lbl = Label(
@@ -78,7 +84,7 @@ class SignalGetAuthWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_login(self) -> None:
+    def cb_get_cred(self) -> None:
         m = GetSignalAuth()
 
         signal_bin_path = None

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/job.py

@@ -11,7 +11,7 @@ from multiprocessing.managers import ListProxy, SyncManager
 from pathlib import Path
 from queue import Queue
 from threading import Thread
-from typing import TYPE_CHECKING, Any, Callable, Dict, Generator, Iterator, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Callable, Dict, Generator, List, Optional, Tuple
 from urllib.parse import urlparse
 
 from sticker_convert.converter import StickerConvert
@@ -99,7 +99,7 @@ class Executor:
             elif action == "bar":
                 self.cb_bar(*args, **kwargs)
             elif action == "update_bar":
-                self.cb_bar(update_bar=True)
+                self.cb_bar(update_bar=1)
             elif action == "msg_block":
                 cb_return.set_response(self.cb_msg_block(*args, **kwargs))
             elif action == "ask_bool":
@@ -143,6 +143,7 @@ class Executor:
                 e += traceback.format_exc()
                 e += "#####################"
                 cb_queue.put(e)
+
         work_list.append(None)
 
     def start_workers(self, processes: int = 1) -> None:
@@ -175,12 +176,11 @@ class Executor:
             pass
 
         self.results_queue.put(None)
-        self.work_list = self.manager.list()
+        self.work_list[:] = []
         self.processes.clear()
 
     def kill_workers(self, *_: Any, **__: Any) -> None:
         self.is_cancel_job.value = 1  # type: ignore
-        self.work_list = self.manager.list()
 
         for process in self.processes:
             if platform.system() == "Windows":
@@ -189,16 +189,17 @@ class Executor:
                 process.close()
             process.join()
 
-        self.cleanup()
+        self.cleanup(killed=True)
 
-    def cleanup(self) -> None:
+    def cleanup(self, killed: bool = False) -> None:
+        if killed:
+            self.cb_queue.put("Job cancelled.")
+        self.cb_queue.put(("bar", None, {"set_progress_mode": "clear"}))
         self.cb_queue.put(None)
         self.cb_thread_instance.join()
-        self.work_list = self.manager.list()
 
     def get_result(self) -> Generator[Any, None, None]:
-        gen: Iterator[Any] = iter(self.results_queue.get, None)
-        yield from gen
+        yield from iter(self.results_queue.get, None)
 
     def cb(
         self,
@@ -268,14 +269,12 @@ class Job:
 
             if self.executor.is_cancel_job.value == 1:  # type: ignore
                 code = 2
-                self.executor.cb("Job cancelled.")
                 break
             if not success:
                 code = 1
                 self.executor.cb("An error occured during this run.")
                 break
 
-        self.executor.cb("bar", kwargs={"set_progress_mode": "clear"})
         self.executor.cleanup()
 
         return code

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/uploaders/upload_telegram.py

@@ -3,11 +3,11 @@ import copy
 import re
 from pathlib import Path
 from queue import Queue
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Optional, Tuple, Union, cast
 
 import anyio
-from telegram import InputFile, InputSticker, Sticker
-from telegram.error import TelegramError
+from telegram import InputSticker, Sticker
+from telegram.error import BadRequest, TelegramError
 from telegram.ext import AIORateLimiter, ApplicationBuilder
 
 from sticker_convert.converter import StickerConvert
@@ -128,7 +128,22 @@ class UploadTelegram(UploadBase):
 
                 if response is True:
                     self.cb.put(f"Deleting all stickers from pack {pack_short_name}")
-                    await bot.delete_sticker_set(pack_short_name)
+                    try:
+                        await bot.delete_sticker_set(pack_short_name)
+                    except BadRequest as e:
+                        self.cb.put(
+                            f"Cannot delete sticker set {pack_short_name} due to {e}"
+                        )
+                        if str(e) == "Stickerpack_not_found":
+                            self.cb.put(
+                                "Hint: You might had deleted and recreated pack too quickly. Wait about 3 minutes and try again."
+                            )
+                        return None
+                    except TelegramError as e:
+                        self.cb.put(
+                            f"Cannot delete sticker set {pack_short_name} due to {e}"
+                        )
+                        return None
                     sticker_set = None
                 else:
                     self.cb.put(f"Not deleting existing pack {pack_short_name}")
@@ -138,7 +153,7 @@ class UploadTelegram(UploadBase):
             else:
                 sticker_type = Sticker.REGULAR
 
-            input_stickers: List[InputSticker] = []
+            input_stickers: List[Tuple[Path, InputSticker]] = []
             sticker_format = None
             cover_spec_choice = None
             ext = None
@@ -190,7 +205,7 @@ class UploadTelegram(UploadBase):
                     sticker_bytes = cast(bytes, convert_result)
 
                 input_stickers.append(
-                    InputSticker(sticker=sticker_bytes, emoji_list=emoji_list)
+                    (src, InputSticker(sticker=sticker_bytes, emoji_list=emoji_list))
                 )
 
             cover_path = MetadataHandler.get_cover(self.opt_output.dir)
@@ -208,9 +223,7 @@ class UploadTelegram(UploadBase):
                         self.cb_return,
                     )
 
-            base_num = 1
             if sticker_set is None and sticker_format is not None:
-                init_stickers = input_stickers[:50]
                 if len(input_stickers) > 50:
                     amount_str = "first 50"
                 else:
@@ -224,35 +237,38 @@ class UploadTelegram(UploadBase):
                         user_id=self.opt_cred.telegram_userid,
                         name=pack_short_name,
                         title=pack_title,
-                        stickers=init_stickers,
+                        stickers=[a for _, a in input_stickers[:50]],
                         sticker_format=sticker_format,
                         sticker_type=sticker_type,
                     )
                     self.cb.put(finish_msg)
                     input_stickers = input_stickers[50:]
-                    base_num = 51
                 except TelegramError as e:
                     self.cb.put(f"{error_msg} {e}")
                     return None
 
-            if len(input_stickers) > 0:
-                self.cb.put(f"Uploading stickers of {pack_short_name} one-by-one")
-                for i, sticker in enumerate(input_stickers):
-                    assert isinstance(sticker.sticker, InputFile)
-                    num = base_num + i
-                    try:
-                        # We could use tg.start_soon() here
-                        # But this would disrupt the order of stickers
-                        await bot.add_sticker_to_set(
-                            user_id=self.opt_cred.telegram_userid,
-                            name=pack_short_name,
-                            sticker=sticker,
-                        )
-                        self.cb.put(f"Uploaded sticker #{num} of {pack_short_name}")
-                    except TelegramError as e:
+            for src, sticker in input_stickers:
+                try:
+                    # We could use tg.start_soon() here
+                    # But this would disrupt the order of stickers
+                    await bot.add_sticker_to_set(
+                        user_id=self.opt_cred.telegram_userid,
+                        name=pack_short_name,
+                        sticker=sticker,
+                    )
+                    self.cb.put(f"Uploaded sticker {src} of {pack_short_name}")
+                except BadRequest as e:
+                    self.cb.put(
+                        f"Cannot upload sticker {src} of {pack_short_name} due to {e}"
+                    )
+                    if str(e) == "Stickerpack_not_found":
                         self.cb.put(
-                            f"Cannot upload sticker #{num} of {pack_short_name} due to {e}"
+                            "Hint: You might had deleted and recreated pack too quickly. Wait about 3 minutes and try again."
                         )
+                except TelegramError as e:
+                    self.cb.put(
+                        f"Cannot upload sticker {src} of {pack_short_name} due to {e}"
+                    )
 
             if thumbnail_bytes is not None:
                 try:

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/utils/auth/get_signal_auth.py

@@ -36,10 +36,16 @@ class GetSignalAuth:
                 "~/Library/Application Support/Signal Beta"
             )
         else:
-            if not (signal_bin_path_prod := shutil.which("signal-desktop")):  # type: ignore
+            prod_which = shutil.which("signal-desktop")
+            if prod_which is None:
                 signal_bin_path_prod = "signal-desktop"
-            if not (signal_bin_path_beta := shutil.which("signal-desktop-beta")):  # type: ignore
+            else:
+                signal_bin_path_prod = prod_which
+            beta_which = shutil.which("signal-desktop-beta")
+            if beta_which is None:
                 signal_bin_path_beta = "signal-desktop-beta"
+            else:
+                signal_bin_path_beta = beta_which
             signal_user_data_dir_prod = os.path.expanduser("~/.config/Signal")
             signal_user_data_dir_beta = os.path.expanduser("~/.config/Signal Beta")
 

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/utils/callback.py

@@ -79,7 +79,6 @@ class Callback:
             return
 
         msg = kwargs.get("msg")
-        file = kwargs.get("file")
 
         if not msg and len(args) == 1:
             msg = str(args[0])
@@ -87,8 +86,6 @@ class Callback:
         if msg:
             if self.progress_bar:
                 self.progress_bar.write(msg)
-            elif file:
-                print(msg, file=file)
             else:
                 print(msg)
 
@@ -96,19 +93,17 @@ class Callback:
         self,
         set_progress_mode: Optional[str] = None,
         steps: int = 0,
-        update_bar: bool = False,
+        update_bar: int = 0,
     ) -> None:
         if self.silent:
             return
 
         if self.progress_bar:
             if update_bar:
-                self.progress_bar.update()
-            elif set_progress_mode == "indeterminate":
+                self.progress_bar.update(update_bar)
+            elif set_progress_mode in ("indeterminate", "clear"):
                 self.progress_bar.close()
                 self.progress_bar = None
-            elif set_progress_mode == "clear":
-                self.progress_bar.reset()
         elif set_progress_mode == "determinate":
             self.progress_bar = tqdm(total=steps)
 
@@ -190,7 +185,7 @@ class Callback:
         elif action == "bar":
             self.bar(**kwargs)
         elif action == "update_bar":
-            self.bar(update_bar=True)
+            self.bar(update_bar=1)
         elif action == "msg_block":
             return self.msg_block(*args, **kwargs)
         elif action == "ask_bool":

{sticker-convert-2.7.5 → sticker-convert-2.7.6}/src/sticker_convert/version.py

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

{sticker-convert-2.7.5 → sticker-convert-2.7.6/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.5
+Version: 2.7.6
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>

sticker-convert-2.7.5/src/sticker_convert/gui_components/frames/progress_frame.py

@@ -1,97 +0,0 @@
-#!/usr/bin/env python3
-from typing import TYPE_CHECKING, Any, Optional
-
-from tqdm import tqdm
-from ttkbootstrap import LabelFrame, Progressbar  # type: ignore
-from ttkbootstrap.scrolled import ScrolledText  # type: ignore
-
-from sticker_convert.gui_components.frames.right_clicker import RightClicker
-
-if TYPE_CHECKING:
-    from sticker_convert.gui import GUI  # type: ignore
-
-
-class ProgressFrame(LabelFrame):
-    progress_bar_cli = None
-    progress_bar_steps = 0
-    auto_scroll = True
-
-    def __init__(self, gui: "GUI", *args: Any, **kwargs: Any) -> None:
-        self.gui = gui
-        super().__init__(*args, **kwargs)  # type: ignore
-
-        self.message_box = ScrolledText(self, height=15, wrap="word")
-        self.message_box._text.bind("<Button-3><ButtonRelease-3>", RightClicker)  # type: ignore
-        self.message_box._text.config(state="disabled")  # type: ignore
-        self.progress_bar = Progressbar(self, orient="horizontal", mode="determinate")
-
-        self.message_box.bind("<Enter>", self.cb_disable_autoscroll)
-        self.message_box.bind("<Leave>", self.cb_enable_autoscroll)
-
-        self.message_box.pack(expand=True, fill="x")
-        self.progress_bar.pack(expand=True, fill="x")
-
-    def update_progress_bar(
-        self,
-        set_progress_mode: Optional[str] = None,
-        steps: int = 0,
-        update_bar: bool = False,
-    ) -> None:
-        if update_bar and self.progress_bar_cli:
-            self.progress_bar_cli.update()
-            self.progress_bar["value"] += 100 / self.progress_bar_steps
-        elif set_progress_mode == "determinate":
-            self.progress_bar_cli = tqdm(total=steps)
-            self.progress_bar.config(mode="determinate")
-            self.progress_bar_steps = steps
-            self.progress_bar.stop()
-            self.progress_bar["value"] = 0
-        elif set_progress_mode == "indeterminate":
-            if self.progress_bar_cli:
-                self.progress_bar_cli.close()
-                self.progress_bar_cli = None
-            self.progress_bar["value"] = 0
-            self.progress_bar.config(mode="indeterminate")
-            self.progress_bar.start(50)
-        elif set_progress_mode == "clear":
-            if self.progress_bar_cli:
-                self.progress_bar_cli.reset()
-            self.progress_bar.config(mode="determinate")
-            self.progress_bar.stop()
-            self.progress_bar["value"] = 0
-
-    def update_message_box(self, *args: Any, **kwargs: Any) -> None:
-        msg = kwargs.get("msg")
-        cls = kwargs.get("cls")
-        file = kwargs.get("file")
-
-        if not msg and len(args) == 1:
-            msg = str(args[0])
-
-        if msg:
-            if self.progress_bar_cli:
-                self.progress_bar_cli.write(msg)
-            elif file:
-                print(msg, file=file)
-            else:
-                print(msg)
-            msg += "\n"
-
-        self.message_box._text.config(state="normal")  # type: ignore
-
-        if cls:
-            self.message_box.delete(1.0, "end")  # type: ignore
-
-        if msg:
-            self.message_box.insert("end", msg)  # type: ignore
-
-            if self.auto_scroll:
-                self.message_box._text.yview_moveto(1.0)  # type: ignore
-
-        self.message_box._text.config(state="disabled")  # type: ignore
-
-    def cb_disable_autoscroll(self, *_: Any) -> None:
-        self.auto_scroll = False
-
-    def cb_enable_autoscroll(self, *_: Any) -> None:
-        self.auto_scroll = True