sticker-convert 2.13.3.0__py3-none-any.whl → 2.17.0.0__py3-none-any.whl

sticker_convert/gui_components/windows/line_get_auth_window.py

@@ -1,102 +1,94 @@
-#!/usr/bin/env python3
-import webbrowser
-from functools import partial
-from threading import Thread
-from typing import Any
-
-from ttkbootstrap import Button, Frame, Label  # type: ignore
-
-from sticker_convert.gui_components.gui_utils import GUIUtils
-from sticker_convert.gui_components.windows.base_window import BaseWindow
-from sticker_convert.utils.auth.get_line_auth import GetLineAuth
-
-
-class LineGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-
-        self.title("Get Line cookie")
-
-        self.cb_msg_block_line = partial(self.gui.cb_msg_block, parent=self)
-
-        self.frame_info = Frame(self.scrollable_frame)
-        self.frame_btn = Frame(self.scrollable_frame)
-
-        self.frame_info.grid(column=0, row=0, sticky="news", padx=3, pady=3)
-        self.frame_btn.grid(column=0, row=1, sticky="news", padx=3, pady=3)
-
-        # Info frame
-        self.explanation1_lbl = Label(
-            self.frame_info,
-            text="Line cookies are required to create custom message stickers",
-            justify="left",
-            anchor="w",
-        )
-        self.explanation2_lbl = Label(
-            self.frame_info,
-            text="Please open web browser and login to Line",
-            justify="left",
-            anchor="w",
-        )
-        self.explanation3_lbl = Label(
-            self.frame_info,
-            text='After that, press "Get cookies"',
-            justify="left",
-            anchor="w",
-        )
-
-        self.explanation1_lbl.grid(
-            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
-        )
-        self.explanation2_lbl.grid(
-            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
-        )
-        self.explanation3_lbl.grid(
-            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
-        )
-
-        # Buttons frame
-        self.open_browser_btn = Button(
-            self.frame_btn, text="Open browser", command=self.cb_open_browser
-        )
-        self.get_cookies_btn = Button(
-            self.frame_btn, text="Get cookies", command=self.cb_get_cookies
-        )
-
-        self.open_browser_btn.pack()
-        self.get_cookies_btn.pack()
-
-        GUIUtils.finalize_window(self)
-
-    def cb_open_browser(self) -> None:
-        line_login_site = "https://store.line.me/login"
-        success = webbrowser.open(line_login_site)
-        if not success:
-            self.gui.cb_ask_str(
-                "Cannot open web browser for you. Install web browser and open:",
-                initialvalue=line_login_site,
-            )
-
-    def cb_get_cookies(self) -> None:
-        Thread(target=self.cb_get_cookies_thread, daemon=True).start()
-
-    def cb_get_cookies_thread(self, *_: Any) -> None:
-        m = GetLineAuth()
-
-        line_cookies = None
-        line_cookies = m.get_cred()
-
-        if line_cookies:
-            if not self.gui.creds.get("line"):
-                self.gui.creds["line"] = {}
-            self.gui.creds["line"]["cookies"] = line_cookies
-            self.gui.line_cookies_var.set(line_cookies)
-
-            self.cb_msg_block_line("Got Line cookies successfully")
-            self.gui.save_creds()
-            self.gui.highlight_fields()
-            return
-
-        self.cb_msg_block_line(
-            "Failed to get Line cookies. Have you logged in the web browser?"
-        )
+#!/usr/bin/env python3
+import webbrowser
+from threading import Thread
+from typing import Any
+
+from ttkbootstrap import Button, Frame, Label  # type: ignore
+
+from sticker_convert.auth.auth_line import AuthLine
+from sticker_convert.gui_components.gui_utils import GUIUtils
+from sticker_convert.gui_components.windows.base_window import BaseWindow
+from sticker_convert.utils.translate import I
+
+
+class LineGetAuthWindow(BaseWindow):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.title(I("Get Line cookie"))
+
+        self.frame_info = Frame(self.scrollable_frame)
+        self.frame_btn = Frame(self.scrollable_frame)
+
+        self.frame_info.grid(column=0, row=0, sticky="news", padx=3, pady=3)
+        self.frame_btn.grid(column=0, row=1, sticky="news", padx=3, pady=3)
+
+        # Info frame
+        self.explanation1_lbl = Label(
+            self.frame_info,
+            text=I("Line cookies are required to create custom message stickers"),
+            justify="left",
+            anchor="w",
+        )
+        self.explanation2_lbl = Label(
+            self.frame_info,
+            text=I("Please open web browser and login to Line"),
+            justify="left",
+            anchor="w",
+        )
+        self.explanation3_lbl = Label(
+            self.frame_info,
+            text=I('After that, press "Get cookies"'),
+            justify="left",
+            anchor="w",
+        )
+
+        self.explanation1_lbl.grid(
+            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation2_lbl.grid(
+            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation3_lbl.grid(
+            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
+        )
+
+        # Buttons frame
+        self.open_browser_btn = Button(
+            self.frame_btn, text=I("Open browser"), command=self.cb_open_browser
+        )
+        self.get_cookies_btn = Button(
+            self.frame_btn, text=I("Get cookies"), command=self.cb_get_cookies
+        )
+
+        self.open_browser_btn.pack()
+        self.get_cookies_btn.pack()
+
+        GUIUtils.finalize_window(self)
+
+    def cb_open_browser(self) -> None:
+        line_login_site = "https://store.line.me/login"
+        success = webbrowser.open(line_login_site)
+        if not success:
+            self.gui.cb.ask_str(
+                I("Cannot open web browser for you. Install web browser and open:"),
+                initialvalue=line_login_site,
+            )
+
+    def cb_get_cookies(self) -> None:
+        Thread(target=self.cb_get_cookies_thread, daemon=True).start()
+
+    def cb_get_cookies_thread(self, *_: Any) -> None:
+        m = AuthLine(self.gui.get_opt_cred(), self.gui.cb)
+
+        line_cookies = None
+        line_cookies, msg = m.get_cred()
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
+        if line_cookies:
+            if not self.gui.creds.get("line"):
+                self.gui.creds["line"] = {}
+            self.gui.creds["line"]["cookies"] = line_cookies
+            self.gui.line_cookies_var.set(line_cookies)
+            self.gui.save_creds()
+            self.gui.highlight_fields()
+            return

sticker_convert/gui_components/windows/signal_get_auth_window.py

@@ -1,89 +1,84 @@
-#!/usr/bin/env python3
-from functools import partial
-from threading import Thread
-from typing import Any
-
-from ttkbootstrap import Button, Frame, Label  # type: ignore
-
-from sticker_convert.gui_components.gui_utils import GUIUtils
-from sticker_convert.gui_components.windows.base_window import BaseWindow
-from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
-
-
-class SignalGetAuthWindow(BaseWindow):
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super(SignalGetAuthWindow, self).__init__(*args, **kwargs)
-
-        self.title("Get Signal uuid and password")
-
-        self.cb_msg_block_signal = partial(self.gui.cb_msg_block, parent=self)
-        self.cb_ask_str_signal = partial(self.gui.cb_ask_str, parent=self)
-
-        self.frame_info = Frame(self.scrollable_frame)
-        self.frame_start_btn = Frame(self.scrollable_frame)
-
-        self.frame_info.grid(column=0, row=0, sticky="news", padx=3, pady=3)
-        self.frame_start_btn.grid(column=0, row=1, sticky="news", padx=3, pady=3)
-
-        # Info frame
-        self.explanation1_lbl = Label(
-            self.frame_info,
-            text="Please install Signal Desktop",
-            justify="left",
-            anchor="w",
-        )
-        self.explanation2_lbl = Label(
-            self.frame_info,
-            text="After installation, you need to login to Signal Desktop",
-            justify="left",
-            anchor="w",
-        )
-        self.explanation3_lbl = Label(
-            self.frame_info,
-            text="uuid and password will be automatically fetched",
-            justify="left",
-            anchor="w",
-        )
-
-        self.explanation1_lbl.grid(
-            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
-        )
-        self.explanation2_lbl.grid(
-            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
-        )
-        self.explanation3_lbl.grid(
-            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
-        )
-
-        # Start button frame
-        self.login_btn = Button(
-            self.frame_start_btn, text="Get uuid and password", command=self.cb_login
-        )
-
-        self.login_btn.pack()
-
-        GUIUtils.finalize_window(self)
-
-    def cb_login(self) -> None:
-        Thread(target=self.cb_login_thread, daemon=True).start()
-
-    def cb_login_thread(self, *args: Any) -> None:
-        m = GetSignalAuth(cb_msg=self.gui.cb_msg, cb_ask_str=self.cb_ask_str_signal)
-
-        uuid, password = m.get_cred()
-        if uuid and password:
-            if not self.gui.creds.get("signal"):
-                self.gui.creds["signal"] = {}
-            self.gui.creds["signal"]["uuid"] = uuid
-            self.gui.creds["signal"]["password"] = password
-            self.gui.signal_uuid_var.set(uuid)
-            self.gui.signal_password_var.set(password)
-
-            self.cb_msg_block_signal(
-                f"Got uuid and password successfully:\nuuid={uuid}\npassword={password}"
-            )
-            self.gui.save_creds()
-            self.gui.highlight_fields()
-            return
-
-        self.cb_msg_block_signal("Failed to get uuid and password")
+#!/usr/bin/env python3
+from threading import Thread
+from typing import Any
+
+from ttkbootstrap import Button, Frame, Label  # type: ignore
+
+from sticker_convert.auth.auth_signal import AuthSignal
+from sticker_convert.gui_components.gui_utils import GUIUtils
+from sticker_convert.gui_components.windows.base_window import BaseWindow
+from sticker_convert.utils.translate import I
+
+
+class SignalGetAuthWindow(BaseWindow):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super(SignalGetAuthWindow, self).__init__(*args, **kwargs)
+
+        self.title("Get Signal uuid and password")
+
+        self.frame_info = Frame(self.scrollable_frame)
+        self.frame_start_btn = Frame(self.scrollable_frame)
+
+        self.frame_info.grid(column=0, row=0, sticky="news", padx=3, pady=3)
+        self.frame_start_btn.grid(column=0, row=1, sticky="news", padx=3, pady=3)
+
+        # Info frame
+        self.explanation1_lbl = Label(
+            self.frame_info,
+            text=I("Please install Signal Desktop"),
+            justify="left",
+            anchor="w",
+        )
+        self.explanation2_lbl = Label(
+            self.frame_info,
+            text=I("After installation, you need to login to Signal Desktop"),
+            justify="left",
+            anchor="w",
+        )
+        self.explanation3_lbl = Label(
+            self.frame_info,
+            text=I("uuid and password will be automatically fetched"),
+            justify="left",
+            anchor="w",
+        )
+
+        self.explanation1_lbl.grid(
+            column=0, row=0, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation2_lbl.grid(
+            column=0, row=1, columnspan=3, sticky="w", padx=3, pady=3
+        )
+        self.explanation3_lbl.grid(
+            column=0, row=2, columnspan=3, sticky="w", padx=3, pady=3
+        )
+
+        # Start button frame
+        self.login_btn = Button(
+            self.frame_start_btn,
+            text=I("Get uuid and password"),
+            command=self.cb_login,
+        )
+
+        self.login_btn.pack()
+
+        GUIUtils.finalize_window(self)
+
+    def cb_login(self) -> None:
+        Thread(target=self.cb_login_thread, daemon=True).start()
+
+    def cb_login_thread(self, *args: Any) -> None:
+        m = AuthSignal(self.gui.get_opt_cred(), self.gui.cb)
+
+        uuid, password, msg = m.get_cred()
+        self.gui.cb.put(("msg_block", None, {"message": msg, "parent": self}))
+        if uuid and password:
+            if not self.gui.creds.get("signal"):
+                self.gui.creds["signal"] = {}
+            self.gui.creds["signal"]["uuid"] = uuid
+            self.gui.creds["signal"]["password"] = password
+            self.gui.signal_uuid_var.set(uuid)
+            self.gui.signal_password_var.set(password)
+
+            self.gui.save_creds()
+            self.gui.highlight_fields()
+            return