sticker-convert 2.7.2__py3-none-any.whl → 2.7.4__py3-none-any.whl

sticker_convert/gui_components/frames/right_clicker.py

@@ -6,7 +6,7 @@ from ttkbootstrap import Menu  # type: ignore
 
 # Reference: https://stackoverflow.com/a/57704013
 class RightClicker:
-    def __init__(self, event: Any):
+    def __init__(self, event: Any) -> None:
         right_click_menu = Menu(None, tearoff=0, takefocus=0)
 
         for txt in ["Cut", "Copy", "Paste"]:
@@ -19,5 +19,5 @@ class RightClicker:
 
         right_click_menu.tk_popup(event.x_root, event.y_root, entry="0")
 
-    def right_click_command(self, event: Any, cmd: str):
+    def right_click_command(self, event: Any, cmd: str) -> None:
         event.widget.event_generate(f"<<{cmd}>>")

sticker_convert/gui_components/gui_utils.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 import platform
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, Tuple, Union
 
 from ttkbootstrap import Canvas, Frame, PhotoImage, Scrollbar  # type: ignore
 
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 
 class GUIUtils:
     @staticmethod
-    def set_icon(window: Union["BaseWindow", "GUI"]):
+    def set_icon(window: Union["BaseWindow", "GUI"]) -> None:
         window.icon = PhotoImage(file=ROOT_DIR / "resources/appicon.png")  # type: ignore
         window.iconphoto(1, window.icon)  # type: ignore
         if platform.system() == "Darwin":
@@ -27,7 +27,7 @@ class GUIUtils:
     @staticmethod
     def create_scrollable_frame(
         window: Union["BaseWindow", "GUI"],
-    ) -> tuple[Frame, Frame, Canvas, Scrollbar, Scrollbar, Frame]:
+    ) -> Tuple[Frame, Frame, Canvas, Scrollbar, Scrollbar, Frame]:
         main_frame = Frame(window)
         main_frame.pack(fill="both", expand=1)
 
@@ -66,7 +66,7 @@ class GUIUtils:
         )
 
     @staticmethod
-    def finalize_window(window: Union["GUI", "BaseWindow"]):
+    def finalize_window(window: Union["GUI", "BaseWindow"]) -> None:
         window.attributes("-alpha", 0)  # type: ignore
 
         screen_width = window.winfo_screenwidth()
@@ -80,10 +80,8 @@ class GUIUtils:
         window_width = frame_width + window.y_scrollbar.winfo_width()
         window_height = frame_height + window.x_scrollbar.winfo_height()
 
-        if window_width > screen_width:
-            window_width = screen_width
-        if window_height > screen_height:
-            window_height = screen_height
+        window_width = min(window_width, screen_width)
+        window_height = min(window_height, screen_height)
 
         frame_width = window_width - window.y_scrollbar.winfo_width()
         frame_height = window_height - window.x_scrollbar.winfo_height()

sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -2,21 +2,10 @@
 from __future__ import annotations
 
 from functools import partial
-from typing import Any
+from typing import Any, List, Tuple
 
 from PIL import Image, ImageDraw, ImageTk
-from ttkbootstrap import (  # type: ignore
-    Button,
-    Canvas,
-    Checkbutton,
-    Entry,
-    Frame,
-    Label,
-    LabelFrame,
-    OptionMenu,
-    Scrollbar,
-    StringVar,
-)
+from ttkbootstrap import Button, Canvas, Checkbutton, Entry, Frame, Label, LabelFrame, OptionMenu, Scrollbar, StringVar  # type: ignore
 
 from sticker_convert.gui_components.frames.right_clicker import RightClicker
 from sticker_convert.gui_components.gui_utils import GUIUtils
@@ -26,10 +15,10 @@ from sticker_convert.gui_components.windows.base_window import BaseWindow
 class AdvancedCompressionWindow(BaseWindow):
     emoji_column_per_row = 10
     emoji_visible_rows = 5
-    emoji_btns: list[tuple[Button, ImageTk.PhotoImage]] = []
+    emoji_btns: List[Tuple[Button, ImageTk.PhotoImage]] = []
 
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(AdvancedCompressionWindow, self).__init__(*args, **kwargs)
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
         self.categories = list({entry["category"] for entry in self.gui.emoji_list})
 
         self.title("Advanced compression options")
@@ -340,7 +329,9 @@ class AdvancedCompressionWindow(BaseWindow):
             self.gui.scale_filter_var,
             self.gui.scale_filter_var.get(),
             "nearest",
+            "box",
             "bilinear",
+            "hamming",
             "bicubic",
             "lanczos",
             bootstyle="secondary",  # type: ignore
@@ -391,7 +382,7 @@ class AdvancedCompressionWindow(BaseWindow):
             bootstyle="secondary",  # type: ignore
         )
         self.default_emoji_lbl = Label(self.frame_advcomp, text="Default emoji")
-        self.im = Image.new("RGBA", (32, 32), (255, 255, 255, 0))
+        self.im: Image.Image = Image.new("RGBA", (32, 32), (255, 255, 255, 0))
         self.ph_im = ImageTk.PhotoImage(self.im)
         self.default_emoji_dsp = Label(self.frame_advcomp, image=self.ph_im)
 
@@ -570,7 +561,7 @@ class AdvancedCompressionWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_disable_fps(self, *args: Any):
+    def cb_disable_fps(self, *_: Any) -> None:
         if self.gui.fps_disable_var.get() is True:
             state = "disabled"
         else:
@@ -579,7 +570,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.fps_min_entry.config(state=state)
         self.fps_max_entry.config(state=state)
 
-    def cb_disable_res_w(self, *args: Any):
+    def cb_disable_res_w(self, *_: Any) -> None:
         if self.gui.res_w_disable_var.get() is True:
             state = "disabled"
         else:
@@ -588,7 +579,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.res_w_min_entry.config(state=state)
         self.res_w_max_entry.config(state=state)
 
-    def cb_disable_res_h(self, *args: Any):
+    def cb_disable_res_h(self, *_: Any) -> None:
         if self.gui.res_h_disable_var.get() is True:
             state = "disabled"
         else:
@@ -597,7 +588,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.res_h_min_entry.config(state=state)
         self.res_h_max_entry.config(state=state)
 
-    def cb_disable_quality(self, *args: Any):
+    def cb_disable_quality(self, *_: Any) -> None:
         if self.gui.quality_disable_var.get() is True:
             state = "disabled"
         else:
@@ -606,7 +597,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.quality_min_entry.config(state=state)
         self.quality_max_entry.config(state=state)
 
-    def cb_disable_color(self, *args: Any):
+    def cb_disable_color(self, *_: Any) -> None:
         if self.gui.color_disable_var.get() is True:
             state = "disabled"
         else:
@@ -615,7 +606,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.color_min_entry.config(state=state)
         self.color_max_entry.config(state=state)
 
-    def cb_disable_duration(self, *args: Any):
+    def cb_disable_duration(self, *_: Any) -> None:
         if (
             self.gui.duration_disable_var.get() is True
             or self.gui.comp_preset_var.get() == "auto"
@@ -627,7 +618,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.duration_min_entry.config(state=state)
         self.duration_max_entry.config(state=state)
 
-    def cb_disable_size(self, *args: Any):
+    def cb_disable_size(self, *_: Any) -> None:
         if (
             self.gui.size_disable_var.get() is True
             or self.gui.comp_preset_var.get() == "auto"
@@ -639,7 +630,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.img_size_max_entry.config(state=state)
         self.vid_size_max_entry.config(state=state)
 
-    def cb_disable_format(self, *args: Any):
+    def cb_disable_format(self, *_: Any) -> None:
         if self.gui.comp_preset_var.get() == "auto":
             state = "disabled"
         else:
@@ -648,7 +639,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.img_format_entry.config(state=state)
         self.vid_format_entry.config(state=state)
 
-    def cb_disable_fake_vid(self, *args: Any):
+    def cb_disable_fake_vid(self, *_: Any) -> None:
         if self.gui.comp_preset_var.get() == "auto":
             state = "disabled"
         else:
@@ -656,7 +647,7 @@ class AdvancedCompressionWindow(BaseWindow):
 
         self.fake_vid_cbox.config(state=state)
 
-    def set_emoji_btn(self):
+    def set_emoji_btn(self) -> None:
         self.im = Image.new("RGBA", (128, 128), (255, 255, 255, 0))
         ImageDraw.Draw(self.im).text(  # type: ignore
             (0, 0),
@@ -668,7 +659,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.ph_im = ImageTk.PhotoImage(self.im)
         self.default_emoji_dsp.config(image=self.ph_im)
 
-    def render_emoji_list(self, *args: Any):
+    def render_emoji_list(self, *_: Any) -> None:
         category = self.categories_var.get()
 
         for emoji_btn, ph_im in self.emoji_btns:
@@ -746,19 +737,19 @@ class AdvancedCompressionWindow(BaseWindow):
         self.emoji_canvas.bind("<Enter>", self.cb_bound_to_mousewheel)
         self.emoji_canvas.bind("<Leave>", self.cb_unbound_to_mousewheel)
 
-    def cb_bound_to_mousewheel(self, event: Any):
+    def cb_bound_to_mousewheel(self, event: Any) -> None:
         for i in self.mousewheel:
             self.emoji_canvas.bind_all(i, self.cb_on_mousewheel)
 
-    def cb_unbound_to_mousewheel(self, event: Any):
+    def cb_unbound_to_mousewheel(self, event: Any) -> None:
         for i in self.mousewheel:
             self.emoji_canvas.unbind_all(i)
 
-    def cb_on_mousewheel(self, event: Any):
+    def cb_on_mousewheel(self, event: Any) -> None:
         self.emoji_canvas.yview_scroll(
             int(-1 * (event.delta / self.delta_divide)), "units"
         )  # type: ignore
 
-    def cb_set_emoji(self, emoji: str):
+    def cb_set_emoji(self, emoji: str) -> None:
         self.gui.default_emoji_var.set(emoji)
         self.set_emoji_btn()

sticker_convert/gui_components/windows/base_window.py

@@ -1,23 +1,23 @@
 #!/usr/bin/env python3
 import platform
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Tuple
 
 from ttkbootstrap import Toplevel  # type: ignore
 
+from sticker_convert.gui_components.gui_utils import GUIUtils
+
 if TYPE_CHECKING:
     from sticker_convert.gui import GUI  # type: ignore
 
-from sticker_convert.gui_components.gui_utils import GUIUtils
-
 
 class BaseWindow(Toplevel):
-    def __init__(self, gui: "GUI"):
-        super(BaseWindow, self).__init__(alpha=0)  # type: ignore
+    def __init__(self, gui: "GUI") -> None:
+        super().__init__(alpha=0)  # type: ignore
         self.gui = gui
 
         GUIUtils.set_icon(self)
 
-        self.mousewheel: tuple[str, ...]
+        self.mousewheel: Tuple[str, ...]
         if platform.system() == "Windows":
             self.mousewheel = ("<MouseWheel>",)
             self.delta_divide = 120

sticker_convert/gui_components/windows/kakao_get_auth_window.py

@@ -3,13 +3,7 @@ from functools import partial
 from threading import Thread
 from typing import Any
 
-from ttkbootstrap import (  # type: ignore
-    Button,
-    Entry,
-    Frame,
-    Label,
-    LabelFrame,
-)
+from ttkbootstrap import Button, Entry, Frame, Label, LabelFrame  # type: ignore
 
 from sticker_convert.gui_components.frames.right_clicker import RightClicker
 from sticker_convert.gui_components.gui_utils import GUIUtils
@@ -18,8 +12,8 @@ from sticker_convert.utils.auth.get_kakao_auth import GetKakaoAuth
 
 
 class KakaoGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(KakaoGetAuthWindow, self).__init__(*args, **kwargs)
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
 
         self.title("Get Kakao auth_token")
 
@@ -165,10 +159,10 @@ class KakaoGetAuthWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_login(self):
+    def cb_login(self) -> None:
         Thread(target=self.cb_login_thread, daemon=True).start()
 
-    def cb_login_thread(self, *args: Any):
+    def cb_login_thread(self, *_: Any) -> None:
         self.gui.save_creds()
         m = GetKakaoAuth(
             opt_cred=self.gui.get_opt_cred(),

sticker_convert/gui_components/windows/line_get_auth_window.py

@@ -12,8 +12,8 @@ from sticker_convert.utils.auth.get_line_auth import GetLineAuth
 
 
 class LineGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(LineGetAuthWindow, self).__init__(*args, **kwargs)
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
 
         self.title("Get Line cookie")
 
@@ -68,7 +68,7 @@ class LineGetAuthWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_open_browser(self):
+    def cb_open_browser(self) -> None:
         line_login_site = "https://store.line.me/login"
         success = webbrowser.open(line_login_site)
         if not success:
@@ -77,10 +77,10 @@ class LineGetAuthWindow(BaseWindow):
                 initialvalue=line_login_site,
             )
 
-    def cb_get_cookies(self):
+    def cb_get_cookies(self) -> None:
         Thread(target=self.cb_get_cookies_thread, daemon=True).start()
 
-    def cb_get_cookies_thread(self, *args: Any):
+    def cb_get_cookies_thread(self, *_: Any) -> None:
         m = GetLineAuth()
 
         line_cookies = None

sticker_convert/gui_components/windows/signal_get_auth_window.py

@@ -13,8 +13,8 @@ from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
 
 
 class SignalGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(SignalGetAuthWindow, self).__init__(*args, **kwargs)
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
 
         self.title("Get Signal uuid and password")
 
@@ -78,7 +78,7 @@ class SignalGetAuthWindow(BaseWindow):
 
         GUIUtils.finalize_window(self)
 
-    def cb_login(self):
+    def cb_login(self) -> None:
         m = GetSignalAuth()
 
         signal_bin_path = None
@@ -102,13 +102,13 @@ class SignalGetAuthWindow(BaseWindow):
 
         self.cb_msg_block_signal(msg)
 
-    def cb_launch_signal(self):
+    def cb_launch_signal(self) -> None:
         m = GetSignalAuth()
         signal_bin_path, signal_user_data_dir = m.get_signal_desktop()
 
         if self.gui.signal_data_dir_var.get():
             signal_user_data_dir = self.gui.signal_data_dir_var.get()
-            
+
         if signal_bin_path:
             Popen(
                 [
@@ -120,7 +120,7 @@ class SignalGetAuthWindow(BaseWindow):
         else:
             self.cb_msg_block_signal("Error: Signal Desktop not installed.")
 
-    def cb_setdir(self):
+    def cb_setdir(self) -> None:
         orig_input_dir = self.gui.signal_data_dir_var.get()
         if not Path(orig_input_dir).is_dir():
             orig_input_dir = ""