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

{sticker-convert-2.7.4/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.4
+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>
@@ -364,6 +364,8 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiolimiter~=1.1.0
+Requires-Dist: anyio~=3.7.1
 Requires-Dist: apngasm_python~=1.2.3
 Requires-Dist: av~=11.0.0
 Requires-Dist: beautifulsoup4~=4.12.3

{sticker-convert-2.7.4 → sticker-convert-2.7.6}/requirements.txt

@@ -1,3 +1,5 @@
+aiolimiter~=1.1.0
+anyio~=3.7.1
 apngasm_python~=1.2.3
 av~=11.0.0
 beautifulsoup4~=4.12.3

{sticker-convert-2.7.4 → 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.4 → sticker-convert-2.7.6}/src/sticker_convert/downloaders/download_telegram.py

@@ -5,8 +5,9 @@ from typing import Dict, Optional, Union
 from urllib.parse import urlparse
 
 import anyio
-from telegram import Bot
+from telegram import PhotoSize, Sticker, StickerSet
 from telegram.error import TelegramError
+from telegram.ext import AIORateLimiter, ApplicationBuilder
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
@@ -33,18 +34,33 @@ class DownloadTelegram(DownloadBase):
 
         self.title = Path(urlparse(self.url).path).name
 
+        self.emoji_dict: Dict[str, str] = {}
+
         return anyio.run(self.save_stickers)
 
     async def save_stickers(self) -> bool:
-        bot = Bot(self.token)
-        async with bot:
+        timeout = 30
+        application = (  # type: ignore
+            ApplicationBuilder()
+            .token(self.token)
+            .rate_limiter(AIORateLimiter())
+            .connect_timeout(timeout)
+            .pool_timeout(timeout)
+            .read_timeout(timeout)
+            .write_timeout(timeout)
+            .connection_pool_size(20)
+            .build()
+        )
+
+        async with application:
+            bot = application.bot
             try:
-                sticker_set = await bot.get_sticker_set(
-                    self.title,  # type: ignore
-                    read_timeout=30,
-                    write_timeout=30,
-                    connect_timeout=30,
-                    pool_timeout=30,
+                sticker_set: StickerSet = await bot.get_sticker_set(
+                    self.title,
+                    read_timeout=timeout,
+                    write_timeout=timeout,
+                    connect_timeout=timeout,
+                    pool_timeout=timeout,
                 )
             except TelegramError as e:
                 self.cb.put(
@@ -63,50 +79,43 @@ class DownloadTelegram(DownloadBase):
                 )
             )
 
-            emoji_dict: Dict[str, str] = {}
-            for num, i in enumerate(sticker_set.stickers):
-                sticker = await i.get_file(
-                    read_timeout=30,
-                    write_timeout=30,
-                    connect_timeout=30,
-                    pool_timeout=30,
+            async def download_sticker(
+                sticker: Union[PhotoSize, Sticker], f_id: str
+            ) -> None:
+                sticker_file = await sticker.get_file(
+                    read_timeout=timeout,
+                    write_timeout=timeout,
+                    connect_timeout=timeout,
+                    pool_timeout=timeout,
                 )
-                ext = Path(sticker.file_path).suffix
-                f_id = str(num).zfill(3)
+                fpath = sticker_file.file_path
+                assert fpath is not None
+                ext = Path(fpath).suffix
                 f_name = f_id + ext
                 f_path = Path(self.out_dir, f_name)
-                await sticker.download_to_drive(
+                await sticker_file.download_to_drive(
                     custom_path=f_path,
-                    read_timeout=30,
-                    write_timeout=30,
-                    connect_timeout=30,
-                    pool_timeout=30,
+                    read_timeout=timeout,
+                    write_timeout=timeout,
+                    connect_timeout=timeout,
+                    pool_timeout=timeout,
                 )
-                emoji_dict[f_id] = i.emoji
+                if isinstance(sticker, Sticker) and sticker.emoji is not None:
+                    self.emoji_dict[f_id] = sticker.emoji
                 self.cb.put(f"Downloaded {f_name}")
-                self.cb.put("update_bar")
-
-            if sticker_set.thumbnail:
-                cover = await sticker_set.thumbnail.get_file(
-                    read_timeout=30,
-                    write_timeout=30,
-                    connect_timeout=30,
-                    pool_timeout=30,
-                )
-                cover_ext = Path(cover.file_path).suffix
-                cover_name = "cover" + cover_ext
-                cover_path = Path(self.out_dir, cover_name)
-                await cover.download_to_drive(
-                    custom_path=cover_path,
-                    read_timeout=30,
-                    write_timeout=30,
-                    connect_timeout=30,
-                    pool_timeout=30,
-                )
-                self.cb.put(f"Downloaded {cover_name}")
+                if f_id != "cover":
+                    self.cb.put("update_bar")
+
+            async with anyio.create_task_group() as tg:
+                for num, sticker in enumerate(sticker_set.stickers):
+                    f_id = str(num).zfill(3)
+                    tg.start_soon(download_sticker, sticker, f_id)
+
+                if sticker_set.thumbnail is not None:
+                    tg.start_soon(download_sticker, sticker_set.thumbnail, "cover")
 
         MetadataHandler.set_metadata(
-            self.out_dir, title=self.title, emoji_dict=emoji_dict
+            self.out_dir, title=self.title, emoji_dict=self.emoji_dict
         )
         return True
 

{sticker-convert-2.7.4 → 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.4 → 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.4 → 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.4 → 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