sticker-convert 2.13.0__tar.gz → 2.13.1.0__tar.gz

{sticker_convert-2.13.0/src/sticker_convert.egg-info → sticker_convert-2.13.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.0
+Version: 2.13.1.0
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -367,7 +367,7 @@ Requires-Dist: aiolimiter~=1.2.1
 Requires-Dist: anyio~=4.9.0
 Requires-Dist: apngasm_python~=1.3.2
 Requires-Dist: av>=13.1.0
-Requires-Dist: beautifulsoup4~=4.13.3
+Requires-Dist: beautifulsoup4~=4.13.4
 Requires-Dist: cryptg~=0.5.0.post0
 Requires-Dist: rookiepy~=0.5.6
 Requires-Dist: httpx~=0.28.1
@@ -376,16 +376,15 @@ Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.2.1
-Requires-Dist: pybrowsers~=0.8.0
 Requires-Dist: pyoxipng~=9.1.0
-Requires-Dist: python-telegram-bot~=22.0
+Requires-Dist: python-telegram-bot~=22.1
 Requires-Dist: psutil~=7.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3
 Requires-Dist: rlottie_python~=1.3.7
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
 Requires-Dist: socksio~=1.0.0
-Requires-Dist: telethon~=1.39.0
+Requires-Dist: telethon~=1.40.0
 Requires-Dist: tqdm~=4.67.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 Requires-Dist: websocket_client~=1.8.0
@@ -402,7 +401,7 @@ Dynamic: license-file
 
 ## Downloads
 - [Pre-compiled releases](https://github.com/laggykiller/sticker-convert/releases) for Windows, MacOS and Linux (As AppImage).
-    - Windows: Unzip the downloaded file and run `sticker-convert.exe`
+    - Windows: Unzip the downloaded file and run `sticker-convert.exe`, or download msi file for installation
     - MacOS: Unzip the downloaded file, hold control and open `hold_control_and_click_open_me.command` for the first time, then `sticker-convert.app` in the future
     - Linux:
         - AppImage: `chmod +x` the downloaded AppImage and run it
@@ -686,7 +685,6 @@ Credentials options:
   --kakao-get-auth      Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.
   --kakao-get-auth-desktop
                         Get Kakao auth_token from Kakao Desktop application.
-                        (Only working on Windows.)
   --kakao-bin-path KAKAO_BIN_PATH
                         Set Kakao Desktop application path for launching and getting auth_token.
                         Useful for portable installation.
@@ -889,8 +887,10 @@ See [docs/TODO.md](docs/TODO.md)
 - Information about Line stickers: https://github.com/doubleplusc/Line-sticker-downloader
 - Information about Kakao animated stickers: https://gist.github.com/chitacan/9802668
 - Downloading and decrypting Kakao animated stickers: https://github.com/blluv/KakaoTalkEmoticonDownloader
+- Finding browser executable paths: https://github.com/roniemartinez/browsers
 - Application icon taken from [Icons8](https://icons8.com/)
 - Banner generated from [GitHub Socialify](https://socialify.git.ci/)
+- Free code signing on Windows provided by [SignPath.io](https://about.signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
 
 ## DISCLAIMER
 - The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Naver Band, Viber, Discord, iMessage or Sticker Maker.

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/README.md

@@ -9,7 +9,7 @@
 
 ## Downloads
 - [Pre-compiled releases](https://github.com/laggykiller/sticker-convert/releases) for Windows, MacOS and Linux (As AppImage).
-    - Windows: Unzip the downloaded file and run `sticker-convert.exe`
+    - Windows: Unzip the downloaded file and run `sticker-convert.exe`, or download msi file for installation
     - MacOS: Unzip the downloaded file, hold control and open `hold_control_and_click_open_me.command` for the first time, then `sticker-convert.app` in the future
     - Linux:
         - AppImage: `chmod +x` the downloaded AppImage and run it
@@ -293,7 +293,6 @@ Credentials options:
   --kakao-get-auth      Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.
   --kakao-get-auth-desktop
                         Get Kakao auth_token from Kakao Desktop application.
-                        (Only working on Windows.)
   --kakao-bin-path KAKAO_BIN_PATH
                         Set Kakao Desktop application path for launching and getting auth_token.
                         Useful for portable installation.
@@ -496,8 +495,10 @@ See [docs/TODO.md](docs/TODO.md)
 - Information about Line stickers: https://github.com/doubleplusc/Line-sticker-downloader
 - Information about Kakao animated stickers: https://gist.github.com/chitacan/9802668
 - Downloading and decrypting Kakao animated stickers: https://github.com/blluv/KakaoTalkEmoticonDownloader
+- Finding browser executable paths: https://github.com/roniemartinez/browsers
 - Application icon taken from [Icons8](https://icons8.com/)
 - Banner generated from [GitHub Socialify](https://socialify.git.ci/)
+- Free code signing on Windows provided by [SignPath.io](https://about.signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
 
 ## DISCLAIMER
 - The author of this repo is NOT affiliated with Signal, Telegram, WhatsApp, Line, Kakao, Naver Band, Viber, Discord, iMessage or Sticker Maker.

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/requirements.txt

@@ -2,7 +2,7 @@ aiolimiter~=1.2.1
 anyio~=4.9.0
 apngasm_python~=1.3.2
 av>=13.1.0
-beautifulsoup4~=4.13.3
+beautifulsoup4~=4.13.4
 cryptg~=0.5.0.post0
 rookiepy~=0.5.6
 httpx~=0.28.1
@@ -11,16 +11,15 @@ memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=11.2.1
-pybrowsers~=0.8.0
 pyoxipng~=9.1.0
-python-telegram-bot~=22.0
+python-telegram-bot~=22.1
 psutil~=7.0.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
 rlottie_python~=1.3.7
 signalstickers-client-fork-laggykiller~=3.3.0.post2
 socksio~=1.0.0
-telethon~=1.39.0
+telethon~=1.40.0
 tqdm~=4.67.1
 ttkbootstrap-fork-laggykiller~=1.5.1
 websocket_client~=1.8.0

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/cli.py

@@ -551,6 +551,8 @@ class CLI:
                 opt_cred.telethon_api_hash = telethon_api_hash
 
                 self.cb.msg("Telethon setup successful")
+            else:
+                self.cb.msg("Telethon setup failed")
 
         if args.line_get_auth:
             get_line_auth = GetLineAuth()

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/converter.py

@@ -441,7 +441,7 @@ class StickerConvert:
             if self.opt_comp.chromium_path:
                 chrome_path = self.opt_comp.chromium_path
             else:
-                chrome_path = CRD.get_chrome_path()
+                chrome_path = CRD.get_chromium_path()
             args = [
                 "--headless",
                 "--kiosk",

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/downloaders/download_line.py

@@ -77,7 +77,7 @@ class MetadataLine:
     @staticmethod
     def get_metadata_sticon(
         pack_id: str, region: str
-    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool]]:
+    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool, bool]]:
         pack_meta_r = requests.get(
             f"https://stickershop.line-scdn.net/sticonshop/v1/{pack_id}/sticon/iphone/meta.json"
         )
@@ -114,14 +114,15 @@ class MetadataLine:
         files = pack_meta["orders"]
 
         resource_type = pack_meta.get("sticonResourceType")
+        has_animation = True if resource_type == "ANIMATION" else False
         has_sound = False
 
-        return title, author, files, resource_type, has_sound
+        return title, author, files, resource_type, has_animation, has_sound
 
     @staticmethod
     def get_metadata_stickers(
         pack_id: str, region: str
-    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool]]:
+    ) -> Optional[Tuple[str, str, List[Dict[str, Any]], str, bool, bool]]:
         pack_meta_r = requests.get(
             f"https://stickershop.line-scdn.net/stickershop/v1/product/{pack_id}/android/productInfo.meta"
         )
@@ -153,9 +154,10 @@ class MetadataLine:
         files = pack_meta["stickers"]
 
         resource_type = pack_meta.get("stickerResourceType")
+        has_animation = pack_meta.get("hasAnimation")
         has_sound = pack_meta.get("hasSound")
 
-        return title, author, files, resource_type, has_sound
+        return title, author, files, resource_type, has_animation, has_sound
 
 
 class DownloadLine(DownloadBase):
@@ -207,6 +209,7 @@ class DownloadLine(DownloadBase):
             if (
                 self.resource_type in ("ANIMATION", "ANIMATION_SOUND", "POPUP")
                 or self.has_sound is True
+                or self.has_animation is True
             ):
                 pack_url = f"https://stickershop.line-scdn.net/stickershop/v1/product/{self.pack_id}/iphone/stickerpack@2x.zip"
             elif self.resource_type == "PER_STICKER_TEXT":
@@ -419,6 +422,7 @@ class DownloadLine(DownloadBase):
                 self.author,
                 self.pack_files,
                 self.resource_type,
+                self.has_animation,
                 self.has_sound,
             ) = metadata
         else:

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -609,7 +609,7 @@ class AdvancedCompressionWindow(BaseWindow):
         )[1]
         if color:
             self.gui.bg_color_var.set(color.replace("#", "") + "00")
-        self.lift()
+        self.lift()  # type: ignore
         self.attributes("-topmost", True)  # type: ignore
         self.attributes("-topmost", False)  # type: ignore
 

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/gui_components/windows/kakao_get_auth_window.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import platform
 from functools import partial
 from threading import Thread
 from typing import Any, Optional
@@ -51,6 +52,20 @@ class KakaoGetAuthWindow(BaseWindow):
             justify="left",
             anchor="w",
         )
+        if platform.system() != "Darwin":
+            self.explanation1_4_lbl = Label(
+                self.frame_from_desktop,
+                text="Note: This will download ProcDump and read memory of KakaoTalk Desktop",
+                justify="left",
+                anchor="w",
+            )
+        else:
+            self.explanation1_4_lbl = Label(
+                self.frame_from_desktop,
+                text="Note: This will read memory of KakaoTalk Desktop",
+                justify="left",
+                anchor="w",
+            )
         self.kakao_bin_path_lbl = Label(
             self.frame_from_desktop,
             text="Kakao app path (Optional):",
@@ -85,10 +100,13 @@ class KakaoGetAuthWindow(BaseWindow):
         self.explanation1_3_lbl.grid(
             column=0, row=2, columnspan=2, sticky="w", padx=3, pady=3
         )
-        self.kakao_bin_path_lbl.grid(column=0, row=3, sticky="w", padx=3, pady=3)
-        self.kakao_bin_path_entry.grid(column=1, row=3, sticky="w", padx=3, pady=3)
-        self.launch_desktop_btn.grid(column=0, row=4, columnspan=2, padx=3, pady=3)
-        self.get_auth_desktop_btn.grid(column=0, row=5, columnspan=2, padx=3, pady=3)
+        self.explanation1_4_lbl.grid(
+            column=0, row=3, columnspan=2, sticky="w", padx=3, pady=3
+        )
+        self.kakao_bin_path_lbl.grid(column=0, row=4, sticky="w", padx=3, pady=3)
+        self.kakao_bin_path_entry.grid(column=1, row=4, sticky="w", padx=3, pady=3)
+        self.launch_desktop_btn.grid(column=0, row=5, columnspan=2, padx=3, pady=3)
+        self.get_auth_desktop_btn.grid(column=0, row=6, columnspan=2, padx=3, pady=3)
 
         # Method 2 frame
         self.explanation2_1_lbl = Label(
@@ -277,6 +295,8 @@ class KakaoGetAuthWindow(BaseWindow):
 
     def cb_from_desktop_thread(self, *_: Any) -> None:
         self.gui.save_creds()
+        self.gui.cb_msg("Getting auth_token, this may take a minute...")
+        self.gui.cb_bar("indeterminate")
         m = GetKakaoDesktopAuth(
             cb_ask_str=self.cb_ask_str_kakao,
         )
@@ -298,3 +318,4 @@ class KakaoGetAuthWindow(BaseWindow):
             self.gui.highlight_fields()
 
         self.cb_msg_block_kakao(msg)
+        self.gui.cb_bar("clear")

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/gui_components/windows/viber_get_auth_window.py

@@ -59,10 +59,25 @@ class ViberGetAuthWindow(BaseWindow):
                 justify="left",
                 anchor="w",
             )
+        if platform.system() != "Darwin":
+            self.explanation_lbl3 = Label(
+                self.frame_info,
+                text="Note: This will download ProcDump and read memory of Viber Desktop",
+                justify="left",
+                anchor="w",
+            )
+        else:
+            self.explanation_lbl3 = Label(
+                self.frame_info,
+                text="Note: This will read memory of Viber Desktop",
+                justify="left",
+                anchor="w",
+            )
 
         self.explanation_lbl0.grid(column=0, row=0, sticky="w", padx=3, pady=3)
         self.explanation_lbl1.grid(column=0, row=1, sticky="w", padx=3, pady=3)
         self.explanation_lbl2.grid(column=0, row=2, sticky="w", padx=3, pady=3)
+        self.explanation_lbl3.grid(column=0, row=3, sticky="w", padx=3, pady=3)
 
         # Start button frame
         self.launch_btn = Button(

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/resources/help.json

@@ -64,7 +64,7 @@
         "telethon_setup": "Setup Telethon",
         "kakao_auth_token": "Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx",
         "kakao_get_auth": "Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.",
-        "kakao_get_auth_desktop": "Get Kakao auth_token from Kakao Desktop application.\n(Only working on Windows.)",
+        "kakao_get_auth_desktop": "Get Kakao auth_token from Kakao Desktop application.",
         "kakao_bin_path": "Set Kakao Desktop application path for launching and getting auth_token.\nUseful for portable installation.",
         "kakao_username": "Set Kakao username, which is email or phone number used for signing up Kakao account\nExample: +447700900142\nRequired for generating Kakao auth_token.",
         "kakao_password": "Set Kakao password (Password of Kakao account).\nRequired for generating Kakao auth_token.",

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/utils/auth/get_discord_auth.py

@@ -72,7 +72,7 @@ class GetDiscordAuth:
         if chrome_path is not None:
             using_discord_app = True
         else:
-            chrome_path = CRD.get_chrome_path()
+            chrome_path = CRD.get_chromium_path()
         if chrome_path is None:
             return (
                 None,

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/utils/auth/get_kakao_desktop_auth.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-import importlib.util
 import os
 import platform
 import re
@@ -8,9 +7,9 @@ import time
 from functools import partial
 from getpass import getpass
 from pathlib import Path
-from typing import Callable, List, Optional, Tuple, cast
+from typing import Callable, Optional, Tuple, Union, cast
 
-from sticker_convert.utils.process import check_admin, find_pid_by_name, get_mem, killall
+from sticker_convert.utils.process import find_pid_by_name, get_mem, killall
 
 MSG_NO_BIN = """Kakao Desktop not detected.
 Download and install Kakao Desktop,
@@ -97,13 +96,20 @@ class GetKakaoDesktopAuth:
         self, kakao_bin_path: str, relaunch: bool = True
     ) -> Tuple[Optional[str], str]:
         auth_token = None
-
-        if relaunch:
-            kakao_pid = self.relaunch_kakao(kakao_bin_path)
+        kakao_pid: Union[str, int, None]
+        if platform.system() == "Windows":
+            is_wine = False
+            if relaunch:
+                kakao_pid = self.relaunch_kakao(kakao_bin_path)
+            else:
+                kakao_pid = find_pid_by_name("kakaotalk")
+            if kakao_pid is None:
+                return None, MSG_LAUNCH_FAIL
         else:
-            kakao_pid = find_pid_by_name("kakaotalk")
-        if kakao_pid is None:
-            return None, MSG_LAUNCH_FAIL
+            is_wine = True
+            kakao_pid = "KakaoTalk.exe"
+            if relaunch and self.relaunch_kakao(kakao_bin_path) is None:
+                return None, MSG_LAUNCH_FAIL
 
         if self.cb_ask_str == input:
             pw_func = getpass
@@ -111,10 +117,10 @@ class GetKakaoDesktopAuth:
             pw_func = partial(
                 self.cb_ask_str, initialvalue="", cli_show_initialvalue=False
             )
-        s, msg = get_mem(kakao_pid, pw_func)
+        s = get_mem(kakao_pid, pw_func, is_wine)
 
         if s is None:
-            return None, msg
+            return None, "Failed to dump memory"
 
         auth_token = None
         for i in re.finditer(b"authorization: ", s):
@@ -140,6 +146,13 @@ class GetKakaoDesktopAuth:
             return auth_token, msg
 
     def get_auth_darwin(self, kakao_bin_path: str) -> Tuple[Optional[str], str]:
+        csrutil_status = subprocess.run(
+            ["csrutil", "status"], capture_output=True, text=True
+        ).stdout
+
+        if "enabled" in csrutil_status:
+            return None, MSG_SIP_ENABLED
+
         killall("kakaotalk")
 
         subprocess.run(
@@ -205,9 +218,10 @@ class GetKakaoDesktopAuth:
         elif platform.system() == "Darwin":
             kakao_bin_path = "/Applications/KakaoTalk.app"
         else:
-            kakao_bin_path = os.path.expanduser(
-                "~/.wine/drive_c/Program Files (x86)/Kakao/KakaoTalk/KakaoTalk.exe"
-            )
+            wineprefix = os.environ.get("WINEPREFIX")
+            if not (wineprefix and Path(wineprefix).exists()):
+                wineprefix = os.path.expanduser("~/.wine")
+            kakao_bin_path = f"{wineprefix}/drive_c/Program Files (x86)/Kakao/KakaoTalk/KakaoTalk.exe"
 
         if Path(kakao_bin_path).exists():
             return kakao_bin_path
@@ -220,7 +234,7 @@ class GetKakaoDesktopAuth:
     ) -> Tuple[Optional[str], str]:
         # get_auth_by_dump()
         # + Fast
-        # - Requires admin
+        # - Requires downloading procdump, or builtin method that needs admin
 
         # get_auth_by_pme()
         # + No admin (If have permission to read process)
@@ -233,32 +247,13 @@ class GetKakaoDesktopAuth:
         if not kakao_bin_path:
             return None, MSG_NO_BIN
 
-        if platform.system() != "Darwin":
-            # If admin, prefer get_auth_by_dump() over get_auth_by_pme(), vice versa
-            methods: List[Callable[[str, bool], Tuple[Optional[str], str]]] = []
-            relaunch = True
-            kakao_auth = None
-            msg = ""
-
-            pme_present = importlib.util.find_spec("PyMemoryEditor") is not None
-            methods.append(self.get_auth_by_dump)
-            if pme_present:
-                methods.append(self.get_auth_by_pme)
-            if check_admin() is False:
-                methods.reverse()
-
-            for method in methods:
-                kakao_auth, msg = method(kakao_bin_path, relaunch)
-                relaunch = False
-                if kakao_auth is not None:
-                    break
-        else:
-            csrutil_status = subprocess.run(
-                ["csrutil", "status"], capture_output=True, text=True
-            ).stdout
-
-            if "enabled" in csrutil_status:
-                return None, MSG_SIP_ENABLED
+        if platform.system() == "Windows":
+            kakao_auth, msg = self.get_auth_by_dump(kakao_bin_path)
+            if kakao_auth is None:
+                kakao_auth, msg = self.get_auth_by_pme(kakao_bin_path, False)
+        elif platform.system() == "Darwin":
             kakao_auth, msg = self.get_auth_darwin(kakao_bin_path)
+        else:
+            kakao_auth, msg = self.get_auth_by_dump(kakao_bin_path)
 
         return kakao_auth, msg

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/utils/auth/get_viber_auth.py

@@ -130,10 +130,10 @@ class GetViberAuth:
             pw_func = partial(
                 self.cb_ask_str, initialvalue="", cli_show_initialvalue=False
             )
-        s, msg = get_mem(viber_pid, pw_func)
+        s = get_mem(viber_pid, pw_func)
 
         if s is None:
-            return None, msg
+            return None, "Failed to dump memory"
 
         member_id_addr = s.find(b"X-Viber-Auth-Mid: ")
         m_token_addr = s.find(b"X-Viber-Auth-Token: ")
@@ -217,8 +217,6 @@ class GetViberAuth:
             methods.append(self.get_auth_by_dump)
             if pme_present:
                 methods.append(self.get_auth_by_pme)
-            if check_admin() is False:
-                methods.reverse()
         else:
             if not os.path.isfile("/.dockerenv"):
                 methods.append(self.get_auth_by_dump)

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/utils/auth/telegram_api.py

@@ -342,10 +342,12 @@ class TelethonAPI(TelegramAPI):
         self.cb = cb
         self.cb_return = cb_return
 
-        success, self.client, _, _ = await TelethonSetup(
+        success, client, _, _ = await TelethonSetup(
             self.opt_cred, self.cb_ask_str
         ).start_async()
 
+        if success is True and client is not None:
+            self.client = client
         return success
 
     async def exit(self) -> None:

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/utils/auth/telethon_setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from typing import Callable, Tuple
+from typing import Callable, Optional, Tuple
 
 import anyio
 from telethon import TelegramClient  # type: ignore
@@ -58,28 +58,39 @@ class TelethonSetup:
     def guide(self) -> None:
         self.cb_ask_str(GUIDE_MSG)
 
-    def get_api_info(self) -> None:
+    def get_api_info(self) -> bool:
         api_id_ask = "Enter api_id: "
         wrong_hint = ""
+
         while True:
             telethon_api_id = self.cb_ask_str(wrong_hint + api_id_ask)
-            if telethon_api_id.isnumeric():
+            if telethon_api_id == "":
+                return False
+            elif telethon_api_id.isnumeric():
                 self.opt_cred.telethon_api_id = int(telethon_api_id)
                 break
             else:
                 wrong_hint = "Error: api_id should be numeric\n"
+
         self.opt_cred.telethon_api_hash = self.cb_ask_str("Enter api_hash: ")
+        if self.opt_cred.telethon_api_hash == "":
+            return False
+        return True
 
     def signin(self) -> Tuple[bool, TelegramClient, int, str]:
         return anyio.run(self.signin_async)
 
-    def start(self) -> Tuple[bool, TelegramClient, int, str]:
+    def start(self) -> Tuple[bool, Optional[TelegramClient], int, str]:
+        cred_valid = False
         if self.opt_cred.telethon_api_id == 0 or self.opt_cred.telethon_api_hash == "":
             self.guide()
-            self.get_api_info()
-        return self.signin()
+            cred_valid = self.get_api_info()
+        if cred_valid:
+            return self.signin()
+        else:
+            return False, None, 0, ""
 
-    async def start_async(self) -> Tuple[bool, TelegramClient, int, str]:
+    async def start_async(self) -> Tuple[bool, Optional[TelegramClient], int, str]:
         if self.opt_cred.telethon_api_id == 0 or self.opt_cred.telethon_api_hash == "":
             self.guide()
             self.get_api_info()

{sticker_convert-2.13.0 → sticker_convert-2.13.1.0}/src/sticker_convert/utils/chrome_remotedebug.py

@@ -9,7 +9,7 @@ import signal
 import socket
 import subprocess
 import time
-from typing import Any, Dict, List, Optional, Tuple, Union, cast
+from typing import Any, Dict, List, Optional, Union, cast
 
 import requests
 import websocket
@@ -83,28 +83,14 @@ class CRD:
         self.chrome_proc = subprocess.Popen(launch_cmd)
 
     @staticmethod
-    def get_chrome_path() -> Optional[str]:
-        import logging
-
-        import browsers  # type: ignore
-
-        # browsers module would turn on info logging
-        logger = logging.getLogger()
-        logger.setLevel(logging.CRITICAL)
-
-        bs: List[Tuple[int, str]] = []
-        for b in browsers.browsers():
-            browser_type = b["browser_type"]
-            path = b["path"]
-            try:
-                rank = BROWSER_PREF.index(browser_type)
-            except ValueError:
-                continue
-            bs.append((rank, path))
-        if len(bs) == 0:
-            return None
-        bs = sorted(bs, key=lambda x: x[0])
-        return bs[0][1]
+    def get_chromium_path() -> Optional[str]:
+        if platform.system() == "Windows":
+            from sticker_convert.utils.chromiums.windows import get_chromium_path
+        elif platform.system() == "Darwin":
+            from sticker_convert.utils.chromiums.osx import get_chromium_path
+        else:
+            from sticker_convert.utils.chromiums.linux import get_chromium_path
+        return get_chromium_path()
 
     def connect(self, target_id: int = 0) -> None:
         self.cmd_id = 1

sticker_convert-2.13.1.0/src/sticker_convert/utils/chromiums/linux.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+import configparser
+import os
+import re
+from typing import Optional
+
+# Adopted from https://github.com/roniemartinez/browsers/blob/master/browsers/linux.py
+
+LINUX_DESKTOP_ENTRY_LIST = (
+    ("chrome", ("google-chrome",)),
+    ("chromium", ("chromium", "chromium_chromium")),
+    ("brave", ("brave-browser", "brave_brave")),
+    ("brave-beta", ("brave-browser-beta",)),
+    ("brave-nightly", ("brave-browser-nightly",)),
+    ("msedge", ("microsoft-edge",)),
+    ("opera", ("opera_opera",)),
+    ("opera-beta", ("opera-beta_opera-beta",)),
+    ("opera-developer", ("opera-developer_opera-developer",)),
+    ("vivaldi", ("vivaldi_vivaldi-stable",)),
+)
+
+# $XDG_DATA_HOME and $XDG_DATA_DIRS are not always set
+XDG_DATA_LOCATIONS = (
+    "~/.local/share/applications",
+    "/usr/share/applications",
+    "/var/lib/snapd/desktop/applications",
+)
+
+VERSION_PATTERN = re.compile(
+    r"\b(\S+\.\S+)\b"
+)  # simple pattern assuming all version strings have a dot on them
+
+
+def get_chromium_path() -> Optional[str]:
+    for _, desktop_entries in LINUX_DESKTOP_ENTRY_LIST:
+        for application_dir in XDG_DATA_LOCATIONS:
+            for desktop_entry in desktop_entries:
+                path = os.path.join(application_dir, f"{desktop_entry}.desktop")
+
+                if not os.path.isfile(path):
+                    continue
+
+                config = configparser.ConfigParser(interpolation=None)
+                config.read(path, encoding="utf-8")
+                executable_path = config.get("Desktop Entry", "Exec")
+
+                if executable_path.lower().endswith(" %u"):
+                    executable_path = executable_path[:-3].strip()
+
+                return executable_path
+
+    return None