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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.6
+Version: 2.7.7
 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.6 → sticker-convert-2.7.7}/src/sticker_convert/gui.py

@@ -8,7 +8,7 @@ from json.decoder import JSONDecodeError
 from math import ceil
 from multiprocessing import Event, cpu_count
 from pathlib import Path
-from threading import Lock, Thread
+from threading import Thread
 from typing import Any, Callable, Dict, Optional, Union
 from urllib.parse import urlparse
 
@@ -161,8 +161,6 @@ class GUI(Window):
         self.settings_save_cred_var = BooleanVar()
 
         # Other
-        self.msg_lock = Lock()
-        self.bar_lock = Lock()
         self.response_event = Event()
         self.response = None
         self.action: Optional[Callable[..., Any]] = None
@@ -609,8 +607,7 @@ class GUI(Window):
         return False
 
     def cb_msg(self, *args: Any, **kwargs: Any) -> None:
-        with self.msg_lock:
-            self.progress_frame.update_message_box(*args, **kwargs)
+        self.progress_frame.update_message_box(*args, **kwargs)
 
     def cb_msg_block(
         self,
@@ -641,10 +638,9 @@ class GUI(Window):
         update_bar: int = 0,
         **kwargs: Any,
     ) -> None:
-        with self.bar_lock:
-            self.progress_frame.update_progress_bar(
-                set_progress_mode, steps, update_bar, *args, **kwargs
-            )
+        self.progress_frame.update_progress_bar(
+            set_progress_mode, steps, update_bar, *args, **kwargs
+        )
 
     def highlight_fields(self) -> bool:
         if not self.init_done:

{sticker-convert-2.7.6 → sticker-convert-2.7.7}/src/sticker_convert/gui_components/frames/progress_frame.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
-from typing import TYPE_CHECKING, Any, Optional
+from threading import Lock
+from typing import TYPE_CHECKING, Any, List, Optional
 
 from tqdm import tqdm
 from ttkbootstrap import LabelFrame, Progressbar  # type: ignore
@@ -15,13 +16,18 @@ class ProgressFrame(LabelFrame):
     progress_bar_cli = None
     progress_bar_steps = 0
     auto_scroll = True
+
     msg_cls = False
-    msg_buffer = ""
+    msg_buffer: List[str] = []
+
     bar_mode_changed = False
     bar_mode = "clear"
     bar_updates = 0
     bar_steps = 0
 
+    msg_lock = Lock()
+    bar_lock = Lock()
+
     def __init__(self, gui: "GUI", *args: Any, **kwargs: Any) -> None:
         self.gui = gui
         super().__init__(*args, **kwargs)  # type: ignore
@@ -46,12 +52,15 @@ class ProgressFrame(LabelFrame):
         update_bar: int = 0,
     ) -> None:
         if update_bar:
-            self.bar_updates += update_bar
+            with self.bar_lock:
+                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
+            with self.bar_lock:
+                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")
@@ -60,22 +69,30 @@ class ProgressFrame(LabelFrame):
         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"
+            with self.msg_lock:
+                self.msg_buffer.append(msg)
+
+        elif cls:
+            with self.msg_lock:
+                self.msg_cls = True
+                self.msg_buffer.clear()
 
     def update_ui(self) -> None:
-        if self.msg_cls or self.msg_buffer:
+        if self.msg_buffer or self.msg_cls:
+            with self.msg_lock:
+                msg_cls = self.msg_cls
+                msg = "\n".join(self.msg_buffer)
+
+                self.msg_cls = False
+                self.msg_buffer.clear()
+
             self.message_box._text.config(state="normal")  # type: ignore
 
-            if self.msg_cls:
+            if msg_cls:
                 self.message_box.delete(1.0, "end")  # type: ignore
 
-            if self.msg_buffer:
-                msg = self.msg_buffer.strip()
+            if msg:
                 if self.progress_bar_cli:
                     self.progress_bar_cli.write(msg)
                 else:
@@ -86,39 +103,42 @@ class ProgressFrame(LabelFrame):
                 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
+        if self.bar_mode_changed or self.bar_updates:
+            with self.bar_lock:
+                bar_mode_changed = self.bar_mode_changed
+                bar_mode = self.bar_mode
+                bar_updates = self.bar_updates
+                bar_steps = self.bar_steps
+
+                self.bar_mode_changed = False
+                self.bar_updates = 0
+
+            if bar_mode_changed:
+                if bar_mode == "determinate":
+                    self.progress_bar_cli = tqdm(total=bar_steps)
+                    self.progress_bar.config(mode="determinate")
+                    self.progress_bar_steps = bar_steps
+                    self.progress_bar.stop()
+                elif self.progress_bar_cli:
+                    self.progress_bar_cli.close()
+                    self.progress_bar_cli = None
+
+                if bar_mode == "indeterminate":
+                    self.progress_bar.config(mode="indeterminate")
+                    self.progress_bar.start(50)
+                elif bar_mode == "clear":
+                    self.progress_bar.config(mode="determinate")
+                    self.progress_bar.stop()
+
+                self.progress_bar["value"] = 0
+
+            if bar_updates and self.progress_bar_cli:
+                self.progress_bar_cli.update(bar_updates)
+                self.progress_bar["value"] += (
+                    100 / self.progress_bar_steps * bar_updates
+                )
 
         self.after(40, self.update_ui)
 

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.6
+Version: 2.7.7
 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>