sticker-convert 2.10.8__py3-none-any.whl → 2.11.0__py3-none-any.whl

sticker_convert/downloaders/download_viber.py

@@ -44,7 +44,7 @@ class DownloadViber(DownloadBase):
 
         return title, zip_url
 
-    def decompress(self, zip_file: bytes) -> None:
+    def decompress(self, zip_file: bytes) -> int:
         with zipfile.ZipFile(BytesIO(zip_file)) as zf:
             self.cb.put("Unzipping...")
 
@@ -69,19 +69,21 @@ class DownloadViber(DownloadBase):
 
                 self.cb.put("update_bar")
 
-    def download_stickers_viber(self) -> bool:
+            return len(zf_files)
+
+    def download_stickers_viber(self) -> Tuple[int, int]:
         pack_info = self.get_pack_info(self.url)
         if pack_info is None:
             self.cb.put("Download failed: Cannot get pack info")
-            return False
+            return 0, 0
         title, zip_url = pack_info
 
         zip_file = self.download_file(zip_url)
-        self.decompress(zip_file)
+        count = self.decompress(zip_file)
 
         MetadataHandler.set_metadata(self.out_dir, title=title)
 
-        return True
+        return count, count
 
     @staticmethod
     def start(
@@ -89,6 +91,6 @@ class DownloadViber(DownloadBase):
         opt_cred: Optional[CredOption],
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
-    ) -> bool:
+    ) -> Tuple[int, int]:
         downloader = DownloadViber(opt_input, opt_cred, cb, cb_return)
         return downloader.download_stickers_viber()

sticker_convert/gui.py

@@ -154,6 +154,8 @@ class GUI(Window):
         self.signal_password_var = StringVar(self)
         self.telegram_token_var = StringVar(self)
         self.telegram_userid_var = StringVar(self)
+        self.telethon_api_id_var = IntVar(self)
+        self.telethon_api_hash_var = StringVar(self)
         self.kakao_auth_token_var = StringVar(self)
         self.kakao_username_var = StringVar(self)
         self.kakao_password_var = StringVar(self)
@@ -406,6 +408,10 @@ class GUI(Window):
         self.signal_password_var.set(self.creds.get("signal", {}).get("password", ""))
         self.telegram_token_var.set(self.creds.get("telegram", {}).get("token", ""))
         self.telegram_userid_var.set(self.creds.get("telegram", {}).get("userid", ""))
+        self.telethon_api_id_var.set(self.creds.get("telethon", {}).get("api_id", 0))
+        self.telethon_api_hash_var.set(
+            self.creds.get("telethon", {}).get("api_hash", "")
+        )
         self.kakao_auth_token_var.set(self.creds.get("kakao", {}).get("auth_token", ""))
         self.kakao_username_var.set(self.creds.get("kakao", {}).get("username", ""))
         self.kakao_password_var.set(self.creds.get("kakao", {}).get("password", ""))
@@ -451,6 +457,10 @@ class GUI(Window):
         selection = self.comp_preset_var.get()
         if selection == "auto":
             output_option = self.get_output_name()
+            if "telegram_emoji" in output_option:
+                return "telegram_emoji"
+            if "telegram" in output_option:
+                return "telegram"
             if output_option == "imessage":
                 return "imessage_small"
             if output_option == "local":
@@ -572,6 +582,8 @@ class GUI(Window):
             signal_password=self.signal_password_var.get(),
             telegram_token=self.telegram_token_var.get(),
             telegram_userid=self.telegram_userid_var.get(),
+            telethon_api_id=self.telethon_api_id_var.get(),
+            telethon_api_hash=self.telethon_api_hash_var.get(),
             kakao_auth_token=self.kakao_auth_token_var.get(),
             kakao_username=self.kakao_username_var.get(),
             kakao_password=self.kakao_password_var.get(),

sticker_convert/gui_components/frames/cred_frame.py

@@ -10,6 +10,7 @@ from sticker_convert.gui_components.windows.kakao_get_auth_window import KakaoGe
 from sticker_convert.gui_components.windows.line_get_auth_window import LineGetAuthWindow
 from sticker_convert.gui_components.windows.signal_get_auth_window import SignalGetAuthWindow
 from sticker_convert.gui_components.windows.viber_get_auth_window import ViberGetAuthWindow
+from sticker_convert.utils.auth.telethon_setup import TelethonSetup
 
 if TYPE_CHECKING:
     from sticker_convert.gui import GUI  # type: ignore
@@ -77,6 +78,16 @@ class CredFrame(LabelFrame):
         )
         self.telegram_userid_entry.bind("<Button-3><ButtonRelease-3>", RightClicker)
 
+        self.telethon_auth_lbl = Label(
+            self, text="Telethon authorization", justify="left", anchor="w"
+        )
+        self.telethon_auth_btn = Button(
+            self,
+            text="Generate",
+            command=self.cb_telethon_get_auth,
+            bootstyle="secondary",  # type: ignore
+        )
+
         self.kakao_auth_token_lbl = Label(
             self, text="Kakao auth_token", justify="left", anchor="w"
         )
@@ -157,19 +168,21 @@ class CredFrame(LabelFrame):
         self.telegram_userid_entry.grid(
             column=1, row=4, columnspan=2, sticky="w", padx=3, pady=3
         )
-        self.kakao_auth_token_lbl.grid(column=0, row=5, sticky="w", padx=3, pady=3)
-        self.kakao_auth_token_entry.grid(column=1, row=5, sticky="w", padx=3, pady=3)
-        self.kakao_get_auth_btn.grid(column=2, row=5, sticky="e", padx=3, pady=3)
-        self.line_cookies_lbl.grid(column=0, row=6, sticky="w", padx=3, pady=3)
-        self.line_cookies_entry.grid(column=1, row=6, sticky="w", padx=3, pady=3)
-        self.line_get_auth_btn.grid(column=2, row=6, sticky="e", padx=3, pady=3)
-        self.viber_auth_lbl.grid(column=0, row=7, sticky="w", padx=3, pady=3)
-        self.viber_auth_entry.grid(column=1, row=7, sticky="w", padx=3, pady=3)
-        self.viber_get_auth_btn.grid(column=2, row=7, sticky="e", padx=3, pady=3)
-        self.discord_token_lbl.grid(column=0, row=8, sticky="w", padx=3, pady=3)
-        self.discord_token_entry.grid(column=1, row=8, sticky="w", padx=3, pady=3)
-        self.discord_get_auth_btn.grid(column=2, row=8, sticky="e", padx=3, pady=3)
-        self.help_btn.grid(column=2, row=9, sticky="e", padx=3, pady=3)
+        self.telethon_auth_lbl.grid(column=0, row=5, sticky="w", padx=3, pady=3)
+        self.telethon_auth_btn.grid(column=2, row=5, sticky="e", padx=3, pady=3)
+        self.kakao_auth_token_lbl.grid(column=0, row=6, sticky="w", padx=3, pady=3)
+        self.kakao_auth_token_entry.grid(column=1, row=6, sticky="w", padx=3, pady=3)
+        self.kakao_get_auth_btn.grid(column=2, row=6, sticky="e", padx=3, pady=3)
+        self.line_cookies_lbl.grid(column=0, row=7, sticky="w", padx=3, pady=3)
+        self.line_cookies_entry.grid(column=1, row=7, sticky="w", padx=3, pady=3)
+        self.line_get_auth_btn.grid(column=2, row=7, sticky="e", padx=3, pady=3)
+        self.viber_auth_lbl.grid(column=0, row=8, sticky="w", padx=3, pady=3)
+        self.viber_auth_entry.grid(column=1, row=8, sticky="w", padx=3, pady=3)
+        self.viber_get_auth_btn.grid(column=2, row=8, sticky="e", padx=3, pady=3)
+        self.discord_token_lbl.grid(column=0, row=9, sticky="w", padx=3, pady=3)
+        self.discord_token_entry.grid(column=1, row=9, sticky="w", padx=3, pady=3)
+        self.discord_get_auth_btn.grid(column=2, row=9, sticky="e", padx=3, pady=3)
+        self.help_btn.grid(column=2, row=10, sticky="e", padx=3, pady=3)
 
     def cb_cred_help(self, *_: Any) -> None:
         faq_site = "https://github.com/laggykiller/sticker-convert#faq"
@@ -177,6 +190,18 @@ class CredFrame(LabelFrame):
         if not success:
             self.gui.cb_ask_str("You can get help from:", initialvalue=faq_site)
 
+    def cb_telethon_get_auth(self, *_: Any) -> None:
+        success, _client, api_id, api_hash = TelethonSetup(
+            self.gui.get_opt_cred(), self.gui.cb_ask_str
+        ).start()
+        if success:
+            self.gui.telethon_api_id_var.set(api_id)
+            self.gui.telethon_api_hash_var.set(api_hash)
+            self.gui.save_creds()
+            self.gui.cb_msg_block("Telethon setup successful")
+        else:
+            self.gui.cb_msg_block("Telethon setup failed")
+
     def cb_kakao_get_auth(self, *_: Any) -> None:
         KakaoGetAuthWindow(self.gui)
 

sticker_convert/job.py

@@ -216,7 +216,6 @@ class Job:
         self.cb_ask_bool = cb_ask_bool
         self.cb_ask_str = cb_ask_str
 
-        self.compress_fails: List[str] = []
         self.out_urls: List[str] = []
 
         self.executor = Executor(
@@ -236,19 +235,21 @@ class Job:
 
         self.executor.cb("msg", kwargs={"cls": True})
 
-        tasks = (
+        tasks: Tuple[Callable[..., Tuple[bool, Optional[str]]], ...] = (
             self.verify_input,
             self.cleanup,
             self.download,
             self.compress,
             self.export,
-            self.report,
         )
 
         code = 0
+        summaries: List[str] = []
         for task in tasks:
             self.executor.cb("bar", kwargs={"set_progress_mode": "indeterminate"})
-            success = task()
+            success, summary = task()
+            if summary is not None:
+                summaries.append(summary)
 
             if self.executor.is_cancel_job.value == 1:  # type: ignore
                 code = 2
@@ -258,6 +259,22 @@ class Job:
                 self.executor.cb("An error occured during this run.")
                 break
 
+        msg = "##########\n"
+        msg += "Summary:\n"
+        msg += "##########\n"
+
+        msg += "\n"
+        msg += "\n".join(summaries)
+        msg += "\n"
+
+        if self.out_urls:
+            msg += "Export results:\n"
+            msg += "\n".join(self.out_urls)
+        else:
+            msg += "Export result: None"
+
+        self.executor.cb(msg)
+
         self.executor.cleanup()
 
         return code
@@ -265,7 +282,7 @@ class Job:
     def cancel(self, *_: Any, **_kwargs: Any) -> None:
         self.executor.kill_workers()
 
-    def verify_input(self) -> bool:
+    def verify_input(self) -> Tuple[bool, None]:
         info_msg = ""
         error_msg = ""
 
@@ -352,7 +369,7 @@ class Job:
 
         if error_msg != "":
             self.executor.cb(error_msg)
-            return False
+            return False, None
 
         # Check if preset not equal to export option
         # Only warn if the compression option is available in export preset
@@ -362,7 +379,10 @@ class Job:
             not self.opt_comp.no_compress
             and self.opt_output.option != "local"
             and self.opt_comp.preset != "custom"
-            and self.opt_output.option not in self.opt_comp.preset
+            and (
+                self.opt_output.option not in self.opt_comp.preset
+                and self.opt_comp.preset not in self.opt_output.option
+            )
         ):
             msg = "Compression preset does not match export option\n"
             msg += "You may continue, but the files will need to be compressed again before export\n"
@@ -372,7 +392,7 @@ class Job:
             response = self.executor.cb_return.get_response()
 
             if response is False:
-                return False
+                return False, None
 
         for param, value in (
             ("fps_power", self.opt_comp.fps_power),
@@ -431,7 +451,7 @@ class Job:
             response = self.executor.cb_return.get_response()
 
             if response is False:
-                return False
+                return False, None
 
         # Warn about in/output directories that might contain other files
         # Directory is safe if the name is stickers_input/stickers_output, or
@@ -468,13 +488,13 @@ class Job:
                 response = self.executor.cb_return.get_response()
 
                 if response is False:
-                    return False
+                    return False, None
 
                 break
 
-        return True
+        return True, None
 
-    def cleanup(self) -> bool:
+    def cleanup(self) -> Tuple[bool, None]:
         # If input is 'From local directory', then we should keep files in input/output directory as it maybe edited by user
         # If input is not 'From local directory', then we should move files in input/output directory as new files will be downloaded
         # Output directory should be cleanup unless no_compress is true (meaning files in output directory might be edited by user)
@@ -523,10 +543,10 @@ class Job:
                 new_path = Path(archive_dir, old_path.name)
                 old_path.rename(new_path)
 
-        return True
+        return True, None
 
-    def download(self) -> bool:
-        downloaders: List[Callable[..., bool]] = []
+    def download(self) -> Tuple[bool, str]:
+        downloaders: List[Callable[..., Tuple[int, int]]] = []
 
         if self.opt_input.option == "signal":
             downloaders.append(DownloadSignal.start)
@@ -534,7 +554,7 @@ class Job:
         if self.opt_input.option == "line":
             downloaders.append(DownloadLine.start)
 
-        if self.opt_input.option == "telegram":
+        if self.opt_input.option.startswith("telegram"):
             downloaders.append(DownloadTelegram.start)
 
         if self.opt_input.option == "kakao":
@@ -549,8 +569,8 @@ class Job:
         if len(downloaders) > 0:
             self.executor.cb("Downloading...")
         else:
-            self.executor.cb("Nothing to download")
-            return True
+            self.executor.cb("Skipped download (No files to download)")
+            return True, "Download: Skipped (No files to download)"
 
         self.executor.start_workers(processes=1)
 
@@ -563,15 +583,24 @@ class Job:
         self.executor.join_workers()
 
         # Return False if any of the job returns failure
+        stickers_ok = 0
+        stickers_total = 0
+        success = True
         for result in self.executor.results_list:
-            if result is False:
-                return False
+            stickers_ok += result[0]
+            stickers_total += result[1]
+            success = (
+                success if stickers_ok == stickers_total and stickers_ok > 0 else False
+            )
 
-        return True
+        return (
+            success,
+            f"Download: {stickers_ok}/{stickers_total} stickers success",
+        )
 
-    def compress(self) -> bool:
+    def compress(self) -> Tuple[bool, str]:
         if self.opt_comp.no_compress is True:
-            self.executor.cb("no_compress is set to True, skip compression")
+            self.executor.cb("Skipped compression (no_compress is set to True)")
             in_dir_files = [
                 i
                 for i in sorted(self.opt_input.dir.iterdir())
@@ -598,7 +627,7 @@ class Job:
                     src_f = Path(self.opt_input.dir, i.name)
                     dst_f = Path(self.opt_output.dir, i.name)
                     shutil.copy(src_f, dst_f)
-            return True
+            return True, "Compress: Skipped (no_compress is set to True)"
         msg = "Compressing..."
 
         input_dir = Path(self.opt_input.dir)
@@ -620,8 +649,8 @@ class Job:
 
         in_fs_count = len(in_fs)
         if in_fs_count == 0:
-            self.executor.cb("No files to compress")
-            return True
+            self.executor.cb("Skipped compression (No files to compress)")
+            return True, "Compress: Skipped (No files to compress)"
 
         self.executor.cb(msg)
         self.executor.cb(
@@ -640,21 +669,35 @@ class Job:
 
         self.executor.join_workers()
 
-        # Return False if any of the job returns failure
+        success = True
+        stickers_ok = 0
+        stickers_total = 0
+        fails: List[str] = []
         for result in self.executor.results_list:
+            stickers_total += 1
             if result[0] is False:
-                return False
+                success = False
+                fails.append(str(result[1]))
+            else:
+                stickers_ok += 1
 
-        return True
+        msg_append = ""
+        if success is False:
+            msg_append = " (Failed: " + ", ".join(fails) + ")"
 
-    def export(self) -> bool:
+        return (
+            success,
+            f"Compress: {stickers_ok}/{stickers_total} stickers success" + msg_append,
+        )
+
+    def export(self) -> Tuple[bool, str]:
         if self.opt_output.option == "local":
-            self.executor.cb("Saving to local directory only, nothing to export")
-            return True
+            self.executor.cb("Skipped export (Saving to local directory only)")
+            return True, "Export: Skipped (Saving to local directory only)"
 
         self.executor.cb("Exporting...")
 
-        exporters: List[Callable[..., List[str]]] = []
+        exporters: List[Callable[..., Tuple[int, int, List[str]]]] = []
 
         if self.opt_output.option == "whatsapp":
             exporters.append(CompressWastickers.start)
@@ -662,10 +705,7 @@ class Job:
         if self.opt_output.option == "signal":
             exporters.append(UploadSignal.start)
 
-        if self.opt_output.option == "telegram":
-            exporters.append(UploadTelegram.start)
-
-        if self.opt_output.option == "telegram_emoji":
+        if self.opt_output.option.startswith("telegram"):
             exporters.append(UploadTelegram.start)
 
         if self.opt_output.option == "imessage":
@@ -684,8 +724,12 @@ class Job:
 
         self.executor.join_workers()
 
+        stickers_ok = 0
+        stickers_total = 0
         for result in self.executor.results_list:
-            self.out_urls.extend(result)
+            stickers_ok += result[0]
+            stickers_total += result[1]
+            self.out_urls.extend(result[2])
 
         if self.out_urls:
             with open(
@@ -694,29 +738,6 @@ class Job:
                 f.write("\n".join(self.out_urls))
         else:
             self.executor.cb("An error occured while exporting stickers")
-            return False
-
-        return True
-
-    def report(self) -> bool:
-        msg = "##########\n"
-        msg += "Summary:\n"
-        msg += "##########\n"
-        msg += "\n"
-
-        if self.compress_fails:
-            msg += f'Warning: Could not compress the following {len(self.compress_fails)} file{"s" if len(self.compress_fails) > 1 else ""}:\n'
-            msg += "\n".join(self.compress_fails)
-            msg += "\n"
-            msg += "\nConsider adjusting compression parameters"
-            msg += "\n"
-
-        if self.out_urls:
-            msg += "Export results:\n"
-            msg += "\n".join(self.out_urls)
-        else:
-            msg += "Export result: None"
-
-        self.executor.cb(msg)
+            return False, f"Export: {stickers_ok}/{stickers_total} stickers success"
 
-        return True
+        return True, f"Export: {stickers_ok}/{stickers_total} stickers success"

sticker_convert/job_option.py

@@ -214,6 +214,8 @@ class CredOption(BaseOption):
     signal_password: str = ""
     telegram_token: str = ""
     telegram_userid: str = ""
+    telethon_api_id: int = 0
+    telethon_api_hash: str = ""
     kakao_auth_token: str = ""
     kakao_username: str = ""
     kakao_password: str = ""
@@ -227,6 +229,10 @@ class CredOption(BaseOption):
         return {
             "signal": {"uuid": self.signal_uuid, "password": self.signal_password},
             "telegram": {"token": self.telegram_token, "userid": self.telegram_userid},
+            "telethon": {
+                "api_id": self.telethon_api_id,
+                "api_hash": self.telethon_api_hash,
+            },
             "kakao": {
                 "auth_token": self.kakao_auth_token,
                 "username": self.kakao_username,

sticker_convert/resources/compression.json

@@ -213,8 +213,8 @@
             "power": 3
         },
         "quality": {
-            "min": 10,
-            "max": 95,
+            "min": 0,
+            "max": 100,
             "power": 5
         },
         "color": {

sticker_convert/resources/help.json

@@ -59,7 +59,8 @@
         "signal_password": "Set Signal password. Required for uploading Signal stickers.",
         "signal_get_auth": "Generate Signal uuid and password.",
         "telegram_token": "Set Telegram token. Required for uploading and downloading Telegram stickers.",
-        "telegram_userid": "Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.",
+        "telegram_userid": "Set Telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.",
+        "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.)",
@@ -75,6 +76,6 @@
         "viber_bin_path": "Specify location of Viber Desktop application.\nUseful for portable installation.",
         "discord_get_auth": "Get Discord token.",
         "discord_token": "Set Discord token. Required for downloading Discord stickers and emojis.",
-        "save_cred": "Save Signal and Telegram credentials."
+        "save_cred": "Save credentials."
     }
 }

sticker_convert/resources/input.json

@@ -29,6 +29,16 @@
             "author": false
         }
     },
+    "telegram_telethon": {
+        "full_name": "Download from Telegram with Telethon",
+        "help": "Download telegram stickers from a URL as input with Telethon",
+        "example": "Example: https://telegram.me/addstickers/xxxxx\n OR https://telegram.me/addemoji/xxxxx",
+        "address_lbls": "URL address",
+        "metadata_provides": {
+            "title": true,
+            "author": false
+        }
+    },
     "line": {
         "full_name": "Download from Line",
         "help": "Download line stickers from a URL / ID as input",

sticker_convert/resources/output.json

@@ -23,6 +23,22 @@
             "author": false
         }
     },
+    "telegram_telethon": {
+        "full_name": "Upload to Telegram with Telethon",
+        "help": "Upload to Telegram with Telethon *Not recommended, but allow link not end with _by_xxxbot*",
+        "metadata_requirements": {
+            "title": true,
+            "author": false
+        }
+    },
+    "telegram_emoji_telethon": {
+        "full_name": "Upload to Telegram with Telethon (Custom emoji)",
+        "help": "Upload to Telegram with Telethon (Custom emoji) *Not recommended, but allow link not end with _by_xxxbot*",
+        "metadata_requirements": {
+            "title": true,
+            "author": false
+        }
+    },
     "viber": {
         "full_name": "Upload to Viber",
         "help": "Upload to Viber",

sticker_convert/uploaders/compress_wastickers.py

@@ -3,7 +3,7 @@ import copy
 import shutil
 import zipfile
 from pathlib import Path
-from typing import Any, List
+from typing import Any, List, Tuple
 
 from sticker_convert.converter import StickerConvert
 from sticker_convert.job_option import CompOption, CredOption, OutputOption
@@ -47,7 +47,7 @@ class CompressWastickers(UploadBase):
         self.opt_comp_merged = copy.deepcopy(self.opt_comp)
         self.opt_comp_merged.merge(self.base_spec)
 
-    def compress_wastickers(self) -> List[str]:
+    def compress_wastickers(self) -> Tuple[int, int, List[str]]:
         urls: List[str] = []
         title, author, _ = MetadataHandler.get_metadata(
             self.opt_output.dir,
@@ -56,10 +56,10 @@ class CompressWastickers(UploadBase):
         )
         if not title:
             self.cb.put("Title is required for compressing .wastickers")
-            return urls
+            return 0, 0, urls
         if not author:
             self.cb.put("Author is required for compressing .wastickers")
-            return urls
+            return 0, 0, urls
         packs = MetadataHandler.split_sticker_packs(
             self.opt_output.dir,
             title=title,
@@ -67,7 +67,9 @@ class CompressWastickers(UploadBase):
             separate_image_anim=not self.opt_comp.fake_vid,
         )
 
+        stickers_total = 0
         for pack_title, stickers in packs.items():
+            stickers_total += len(stickers)
             # Originally the Sticker Maker application name the files with int(time.time())
             with CacheStore.get_cache_store(path=self.opt_comp.cache_dir) as tempdir:
                 for num, src in enumerate(stickers):
@@ -106,7 +108,7 @@ class CompressWastickers(UploadBase):
             self.cb.put((out_f))
             urls.append(out_f)
 
-        return urls
+        return stickers_total, stickers_total, urls
 
     def add_metadata(self, pack_dir: Path, title: str, author: str) -> None:
         opt_comp_merged = copy.deepcopy(self.opt_comp)
@@ -150,6 +152,6 @@ class CompressWastickers(UploadBase):
         opt_cred: CredOption,
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
-    ) -> List[str]:
+    ) -> Tuple[int, int, List[str]]:
         exporter = CompressWastickers(opt_output, opt_comp, opt_cred, cb, cb_return)
         return exporter.compress_wastickers()

sticker_convert/uploaders/upload_signal.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import copy
 from pathlib import Path
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Tuple
 
 import anyio
 from signalstickers_client.errors import SignalException
@@ -91,15 +91,15 @@ class UploadSignal(UploadBase):
 
             pack._addsticker(sticker)  # type: ignore
 
-    def upload_stickers_signal(self) -> List[str]:
+    def upload_stickers_signal(self) -> Tuple[int, int, List[str]]:
         urls: List[str] = []
 
         if not self.opt_cred.signal_uuid:
             self.cb.put("uuid required for uploading to Signal")
-            return urls
+            return 0, 0, urls
         if not self.opt_cred.signal_password:
             self.cb.put("password required for uploading to Signal")
-            return urls
+            return 0, 0, urls
 
         title, author, emoji_dict = MetadataHandler.get_metadata(
             self.opt_output.dir,
@@ -138,7 +138,10 @@ class UploadSignal(UploadBase):
             file_per_pack=200,
             separate_image_anim=False,
         )
+        stickers_total = 0
+        stickers_ok = 0
         for pack_title, stickers in packs.items():
+            stickers_total += len(stickers)
             pack = LocalStickerPack()
             pack.title = pack_title
             pack.author = author
@@ -155,11 +158,12 @@ class UploadSignal(UploadBase):
                 )
                 self.cb.put((result))
                 urls.append(result)
+                stickers_ok += len(stickers)
 
             except SignalException as e:
                 self.cb.put(f"Failed to upload pack {pack_title} due to {repr(e)}")
 
-        return urls
+        return stickers_ok, stickers_total, urls
 
     @staticmethod
     def start(
@@ -168,6 +172,6 @@ class UploadSignal(UploadBase):
         opt_cred: CredOption,
         cb: CallbackProtocol,
         cb_return: CallbackReturn,
-    ) -> List[str]:
+    ) -> Tuple[int, int, List[str]]:
         exporter = UploadSignal(opt_output, opt_comp, opt_cred, cb, cb_return)
         return exporter.upload_stickers_signal()