sticker-convert 2.7.6__py3-none-any.whl → 2.7.7__py3-none-any.whl

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/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/version.py

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

{sticker_convert-2.7.6.dist-info → sticker_convert-2.7.7.dist-info}/METADATA

@@ -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.dist-info → sticker_convert-2.7.7.dist-info}/RECORD

@@ -3,10 +3,10 @@ sticker_convert/__main__.py,sha256=6RJauR-SCSSTT3TU7FFB6B6PVwsCxO2xZXtmZ3jc2Is,4
 sticker_convert/cli.py,sha256=LXX-LPlFeFKZLc7LKjdtDDLtOqmognEze0kMSr8Vj50,17543
 sticker_convert/converter.py,sha256=ZAuRO6Ic6e1nhJc_pBsBlPMVyHZzy87q5Gk_naCRShI,31241
 sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjtE,2073
-sticker_convert/gui.py,sha256=zgPC529s7RhOjYWq6Kb_Cv99uSP0mRZBgxxldEM9-2U,30244
+sticker_convert/gui.py,sha256=N3JTsxYtzcHIjrY1FrMczCe3U_bt8E_-3BAdHH0t8L8,30104
 sticker_convert/job.py,sha256=tvK2JrL33DX4swErEihw1sLFv-IP_JQPoPpIpg6JSQ0,25833
 sticker_convert/job_option.py,sha256=niPTGZ4X1iUdkxyVc29oM67bpsUNBX9Um7OOJNa3piE,7521
-sticker_convert/version.py,sha256=-zbIidy2QKEDH28iY847Dg_g4IPBz1y6r2Uh4GASjDM,46
+sticker_convert/version.py,sha256=jSfFumyqVCtgQ0gUWQGbYTxqs9lhLwaV1Vi6ncCy0cY,46
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_base.py,sha256=5R7c8kwahAflOOYrtSQPnBVQ4T-DsprPUMP7G9wcJX4,2824
 sticker_convert/downloaders/download_kakao.py,sha256=RYrebTxEjKjXAr9xw18r0dMW0dFjSqZxzi8dpaq56TY,8581
@@ -22,7 +22,7 @@ sticker_convert/gui_components/frames/control_frame.py,sha256=_XiOJ9JPUfiysDghGG
 sticker_convert/gui_components/frames/cred_frame.py,sha256=I3XrOv7kUOsvFWquuzWWpZWbLclqKQXgD7dx5pcTuY4,6499
 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=Gk-RISB_LkzD-LkfVPyN8DNnPqo9C5IG3yZJoFP6V2o,4327
+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=1UulI_3ZtXdc34aq-hzFyV2WBZOC5OWGFUAMdf7ipU0,32105
@@ -92,9 +92,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=slKvwLxgJz1txJIN4gJ5dAFDLvZLhnTP29Pm8GYveSM,12984
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=Xf94jyqk_6M9IlFGMy0wYIgQKn_yg00nD4XW0CgAbew,5732
-sticker_convert-2.7.6.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.7.6.dist-info/METADATA,sha256=Ec9XjzEg9Dc6wTRhYtDPCvg0WiBNmoSbyY-zm0DfAxs,48379
-sticker_convert-2.7.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sticker_convert-2.7.6.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.7.6.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.7.6.dist-info/RECORD,,
+sticker_convert-2.7.7.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.7.7.dist-info/METADATA,sha256=oLKVy7XCVQ5m6S2WDRiynT_ATYnahnL5PmG4t7tU7Ak,48379
+sticker_convert-2.7.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sticker_convert-2.7.7.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.7.7.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.7.7.dist-info/RECORD,,