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

sticker_convert/downloaders/download_base.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 
 from pathlib import Path
 from queue import Queue
-from typing import Any, Optional, Union
+from typing import Any, List, Optional, Tuple, Union
 
 import requests
 
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
 
 
 class DownloadBase:
@@ -18,35 +18,20 @@ class DownloadBase:
         out_dir: Path,
         opt_cred: Optional[CredOption],
         cb: Union[
-            Queue[
-                Union[
-                    tuple[str, Optional[tuple[str]], Optional[dict[str, Any]]],
-                    str,
-                    None,
-                ]
-            ],
+            Queue[CbQueueItemType],
             Callback,
         ],
         cb_return: CallbackReturn,
-    ):
-        self.url: str = url
-        self.out_dir: Path = out_dir
-        self.opt_cred: Optional[CredOption] = opt_cred
-        self.cb: Union[
-            Queue[
-                Union[
-                    tuple[str, Optional[tuple[str]], Optional[dict[str, Any]]],
-                    str,
-                    None,
-                ]
-            ],
-            Callback,
-        ] = cb
-        self.cb_return: CallbackReturn = cb_return
+    ) -> None:
+        self.url = url
+        self.out_dir = out_dir
+        self.opt_cred = opt_cred
+        self.cb = cb
+        self.cb_return = cb_return
 
     def download_multiple_files(
-        self, targets: list[tuple[str, Path]], retries: int = 3, **kwargs: Any
-    ):
+        self, targets: List[Tuple[str, Path]], retries: int = 3, **kwargs: Any
+    ) -> None:
         # targets format: [(url1, dest2), (url2, dest2), ...]
         self.cb.put(
             ("bar", None, {"set_progress_mode": "determinate", "steps": len(targets)})
@@ -75,8 +60,7 @@ class DownloadBase:
 
                 if response.status_code != 200:
                     return b""
-                else:
-                    self.cb.put(f"Downloading {url}")
+                self.cb.put(f"Downloading {url}")
 
                 if show_progress:
                     steps = (total_length / chunk_size) + 1
@@ -101,11 +85,10 @@ class DownloadBase:
 
         if not result:
             return b""
-        elif dest:
+        if dest:
             with open(dest, "wb+") as f:
                 f.write(result)
             msg = f"Downloaded {url}"
             self.cb.put(msg)
             return b""
-        else:
-            return result
+        return result

sticker_convert/downloaders/download_kakao.py

@@ -6,7 +6,7 @@ import zipfile
 from io import BytesIO
 from pathlib import Path
 from queue import Queue
-from typing import Any, Optional, Union
+from typing import Any, List, Optional, Tuple, Union
 from urllib.parse import urlparse
 
 import requests
@@ -15,14 +15,14 @@ from bs4.element import Tag
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.decrypt_kakao import DecryptKakao
 
 
 class MetadataKakao:
     @staticmethod
-    def get_info_from_share_link(url: str) -> tuple[Optional[str], Optional[str]]:
+    def get_info_from_share_link(url: str) -> Tuple[Optional[str], Optional[str]]:
         headers = {"User-Agent": "Android"}
 
         response = requests.get(url, headers=headers)
@@ -40,7 +40,7 @@ class MetadataKakao:
         data_urls = app_scheme_link_tag.get("data-url")
         if not data_urls:
             return None, None
-        elif isinstance(data_urls, list):
+        if isinstance(data_urls, list):
             data_url = data_urls[0]
         else:
             data_url = data_urls
@@ -52,7 +52,7 @@ class MetadataKakao:
     @staticmethod
     def get_info_from_pack_title(
         pack_title: str,
-    ) -> tuple[Optional[str], Optional[str], Optional[str]]:
+    ) -> Tuple[Optional[str], Optional[str], Optional[str]]:
         pack_meta_r = requests.get(f"https://e.kakao.com/api/v1/items/t/{pack_title}")
 
         if pack_meta_r.status_code == 200:
@@ -111,8 +111,8 @@ class MetadataKakao:
 
 
 class DownloadKakao(DownloadBase):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(DownloadKakao, self).__init__(*args, **kwargs)
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
         self.pack_title: Optional[str] = None
         self.author: Optional[str] = None
 
@@ -128,13 +128,10 @@ class DownloadKakao(DownloadBase):
 
             if item_code:
                 return self.download_animated(item_code)
-            else:
-                self.cb.put(
-                    "Download failed: Cannot download metadata for sticker pack"
-                )
-                return False
+            self.cb.put("Download failed: Cannot download metadata for sticker pack")
+            return False
 
-        elif self.url.isnumeric() or self.url.startswith("kakaotalk://store/emoticon/"):
+        if self.url.isnumeric() or self.url.startswith("kakaotalk://store/emoticon/"):
             item_code = self.url.replace("kakaotalk://store/emoticon/", "")
 
             self.pack_title = None
@@ -149,7 +146,7 @@ class DownloadKakao(DownloadBase):
 
             return self.download_animated(item_code)
 
-        elif urlparse(self.url).netloc == "e.kakao.com":
+        if urlparse(self.url).netloc == "e.kakao.com":
             self.pack_title = self.url.replace("https://e.kakao.com/t/", "")
             (
                 self.author,
@@ -171,31 +168,29 @@ class DownloadKakao(DownloadBase):
                 item_code = MetadataKakao.get_item_code(title_ko, auth_token)
                 if item_code:
                     return self.download_animated(item_code)
+                msg = "Warning: Cannot get item code.\n"
+                msg += "Is auth_token invalid / expired? Try to regenerate it.\n"
+                msg += "Continue to download static stickers instead?"
+                self.cb.put(("ask_bool", (msg,), None))
+                if self.cb_return:
+                    response = self.cb_return.get_response()
                 else:
-                    msg = "Warning: Cannot get item code.\n"
-                    msg += "Is auth_token invalid / expired? Try to regenerate it.\n"
-                    msg += "Continue to download static stickers instead?"
-                    self.cb.put(("ask_bool", (msg,), None))
-                    if self.cb_return:
-                        response = self.cb_return.get_response()
-                    else:
-                        response = False
-
-                    if response is False:
-                        return False
+                    response = False
+
+                if response is False:
+                    return False
 
             return self.download_static(thumbnail_urls)
 
-        else:
-            self.cb.put("Download failed: Unrecognized URL")
-            return False
+        self.cb.put("Download failed: Unrecognized URL")
+        return False
 
     def download_static(self, thumbnail_urls: str) -> bool:
         MetadataHandler.set_metadata(
             self.out_dir, title=self.pack_title, author=self.author
         )
 
-        targets: list[tuple[str, Path]] = []
+        targets: List[Tuple[str, Path]] = []
 
         for num, url in enumerate(thumbnail_urls):
             dest = Path(self.out_dir, str(num).zfill(3) + ".png")
@@ -254,16 +249,7 @@ class DownloadKakao(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: Union[
-            Queue[
-                Union[
-                    tuple[str, Optional[tuple[str]], Optional[dict[str, str]]],
-                    str,
-                    None,
-                ]
-            ],
-            Callback,
-        ],
+        cb: "Union[Queue[CbQueueItemType], Callback]",
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadKakao(url, out_dir, opt_cred, cb, cb_return)

sticker_convert/downloaders/download_line.py

@@ -8,7 +8,7 @@ import zipfile
 from io import BytesIO
 from pathlib import Path
 from queue import Queue
-from typing import Any, Optional, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 from urllib import parse
 
 import requests
@@ -18,16 +18,16 @@ from PIL import Image
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
 from sticker_convert.utils.auth.get_line_auth import GetLineAuth
-from sticker_convert.utils.callback import Callback, CallbackReturn
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.apple_png_normalize import ApplePngNormalize
 
-"""Reference: https://github.com/doubleplusc/Line-sticker-downloader/blob/master/sticker_dl.py"""
+# Reference: https://github.com/doubleplusc/Line-sticker-downloader/blob/master/sticker_dl.py
 
 
 class MetadataLine:
     @staticmethod
-    def analyze_url(url: str) -> Optional[tuple[str, str, bool]]:
+    def analyze_url(url: str) -> Optional[Tuple[str, str, bool]]:
         region = ""
         is_emoji = False
         if url.startswith("line://shop/detail/"):
@@ -78,7 +78,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]]:
         pack_meta_r = requests.get(
             f"https://stickershop.line-scdn.net/sticonshop/v1/{pack_id}/sticon/iphone/meta.json"
         )
@@ -122,7 +122,7 @@ class MetadataLine:
     @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]]:
         pack_meta_r = requests.get(
             f"https://stickershop.line-scdn.net/stickershop/v1/product/{pack_id}/android/productInfo.meta"
         )
@@ -160,18 +160,18 @@ class MetadataLine:
 
 
 class DownloadLine(DownloadBase):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(DownloadLine, self).__init__(*args, **kwargs)
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
         self.headers = {
             "referer": "https://store.line.me",
             "user-agent": "Android",
             "x-requested-with": "XMLHttpRequest",
         }
         self.cookies = self.load_cookies()
-        self.sticker_text_dict: dict[int, Any] = {}
+        self.sticker_text_dict: Dict[int, Any] = {}
 
-    def load_cookies(self) -> dict[str, str]:
-        cookies: dict[str, str] = {}
+    def load_cookies(self) -> Dict[str, str]:
+        cookies: Dict[str, str] = {}
         if self.opt_cred and self.opt_cred.line_cookies:
             line_cookies = self.opt_cred.line_cookies
 
@@ -226,7 +226,7 @@ class DownloadLine(DownloadBase):
         num: int,
         prefix: str = "",
         suffix: str = "",
-    ):
+    ) -> None:
         data = zf.read(f_path)
         ext = Path(f_path).suffix
         if ext == ".png" and not self.is_emoji and int() < 775:
@@ -237,7 +237,7 @@ class DownloadLine(DownloadBase):
         with open(out_path, "wb") as f:
             f.write(data)
 
-    def decompress_emoticon(self, zip_file: bytes):
+    def decompress_emoticon(self, zip_file: bytes) -> None:
         with zipfile.ZipFile(BytesIO(zip_file)) as zf:
             self.cb.put("Unzipping...")
 
@@ -258,7 +258,7 @@ class DownloadLine(DownloadBase):
 
                 self.cb.put("update_bar")
 
-    def decompress_stickers(self, zip_file: bytes):
+    def decompress_stickers(self, zip_file: bytes) -> None:
         with zipfile.ZipFile(BytesIO(zip_file)) as zf:
             self.cb.put("Unzipping...")
 
@@ -300,7 +300,7 @@ class DownloadLine(DownloadBase):
 
                 self.cb.put("update_bar")
 
-    def edit_custom_sticker_text(self):
+    def edit_custom_sticker_text(self) -> None:
         line_sticker_text_path = Path(self.out_dir, "line-sticker-text.txt")
 
         if not line_sticker_text_path.is_file():
@@ -319,9 +319,9 @@ class DownloadLine(DownloadBase):
         with open(line_sticker_text_path, "r", encoding="utf-8") as f:
             self.sticker_text_dict = json.load(f)
 
-    def get_custom_sticker_text_urls(self) -> list[tuple[str, Path]]:
-        custom_sticker_text_urls: list[tuple[str, Path]] = []
-        name_text_key_cache: dict[str, str] = {}
+    def get_custom_sticker_text_urls(self) -> List[Tuple[str, Path]]:
+        custom_sticker_text_urls: List[Tuple[str, Path]] = []
+        name_text_key_cache: Dict[str, str] = {}
 
         for num, data in self.sticker_text_dict.items():
             out_path = Path(self.out_dir, str(num).zfill(3))
@@ -382,7 +382,7 @@ class DownloadLine(DownloadBase):
 
         return name_text_key
 
-    def combine_custom_text(self):
+    def combine_custom_text(self) -> None:
         for i in sorted(self.out_dir.iterdir()):
             if i.name.endswith("-text.png"):
                 base_path = Path(self.out_dir, i.name.replace("-text.png", ".png"))
@@ -442,14 +442,14 @@ class DownloadLine(DownloadBase):
         else:
             self.decompress_stickers(zip_file)
 
-        custom_sticker_text_urls: list[tuple[str, Path]] = []
-        if self.sticker_text_dict != {} and (
+        custom_sticker_text_urls: List[Tuple[str, Path]] = []
+        if self.sticker_text_dict and (
             self.resource_type == "PER_STICKER_TEXT"
-            or (self.resource_type == "NAME_TEXT" and self.cookies != {})
+            or (self.resource_type == "NAME_TEXT" and self.cookies)
         ):
             self.edit_custom_sticker_text()
             custom_sticker_text_urls = self.get_custom_sticker_text_urls()
-        elif self.resource_type == "NAME_TEXT" and self.cookies == {}:
+        elif self.resource_type == "NAME_TEXT" and not self.cookies:
             self.cb.put('Warning: Line "Custom stickers" is supplied as input')
             self.cb.put(
                 "However, adding custom message requires Line cookies, and it is not supplied"
@@ -466,16 +466,7 @@ class DownloadLine(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: Union[
-            Queue[
-                Union[
-                    tuple[str, Optional[tuple[str]], Optional[dict[str, str]]],
-                    str,
-                    None,
-                ]
-            ],
-            Callback,
-        ],
+        cb: "Union[Queue[CbQueueItemType], Callback]",
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadLine(url, out_dir, opt_cred, cb, cb_return)

sticker_convert/downloaders/download_signal.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 from pathlib import Path
 from queue import Queue
-from typing import Any, Optional, Union
+from typing import Dict, Optional, Union
 
 import anyio
 from signalstickers_client import StickersClient  # type: ignore
@@ -10,14 +10,14 @@ from signalstickers_client.models import StickerPack  # type: ignore
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
 
 
 class DownloadSignal(DownloadBase):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(DownloadSignal, self).__init__(*args, **kwargs)
+    # def __init__(self, *args: Any, **kwargs: Any) -> None:
+    #     super().__init__(*args, **kwargs)
 
     @staticmethod
     async def get_pack(pack_id: str, pack_key: str) -> StickerPack:
@@ -26,7 +26,7 @@ class DownloadSignal(DownloadBase):
 
         return pack
 
-    def save_stickers(self, pack: StickerPack):
+    def save_stickers(self, pack: StickerPack) -> None:
         self.cb.put(
             (
                 "bar",
@@ -38,7 +38,7 @@ class DownloadSignal(DownloadBase):
             )
         )
 
-        emoji_dict: dict[str, str] = {}
+        emoji_dict: Dict[str, str] = {}
         for sticker in pack.stickers:  # type: ignore
             f_id = str(sticker.id).zfill(3)  # type: ignore
             f_path = Path(self.out_dir, f_id)
@@ -86,16 +86,7 @@ class DownloadSignal(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: Union[
-            Queue[
-                Union[
-                    tuple[str, Optional[tuple[str]], Optional[dict[str, str]]],
-                    str,
-                    None,
-                ]
-            ],
-            Callback,
-        ],
+        cb: "Union[Queue[CbQueueItemType], Callback]",
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadSignal(url, out_dir, opt_cred, cb, cb_return)

sticker_convert/downloaders/download_telegram.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 from pathlib import Path
 from queue import Queue
-from typing import Any, Optional, Union
+from typing import Dict, Optional, Union
 from urllib.parse import urlparse
 
 import anyio
@@ -10,13 +10,13 @@ from telegram.error import TelegramError
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 
 
 class DownloadTelegram(DownloadBase):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(DownloadTelegram, self).__init__(*args, **kwargs)
+    # def __init__(self, *args: Any, **kwargs: Any) -> None:
+    #     super().__init__(*args, **kwargs)
 
     def download_stickers_telegram(self) -> bool:
         self.token = ""
@@ -63,7 +63,7 @@ class DownloadTelegram(DownloadBase):
                 )
             )
 
-            emoji_dict: dict[str, str] = {}
+            emoji_dict: Dict[str, str] = {}
             for num, i in enumerate(sticker_set.stickers):
                 sticker = await i.get_file(
                     read_timeout=30,
@@ -115,16 +115,7 @@ class DownloadTelegram(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: Union[
-            Queue[
-                Union[
-                    tuple[str, Optional[tuple[str]], Optional[dict[str, str]]],
-                    str,
-                    None,
-                ]
-            ],
-            Callback,
-        ],
+        cb: "Union[Queue[CbQueueItemType], Callback]",
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadTelegram(url, out_dir, opt_cred, cb, cb_return)