sticker-convert 2.8.3__py3-none-any.whl → 2.8.5__py3-none-any.whl

sticker_convert/cli.py

@@ -211,6 +211,7 @@ class CLI:
             "line": args.download_line,
             "telegram": args.download_telegram,
             "kakao": args.download_kakao,
+            "viber": args.download_viber,
         }
 
         download_option = "local"

sticker_convert/converter.py

@@ -704,7 +704,7 @@ class StickerConvert:
             self._frames_export_pyav()
         else:
             self._frames_export_pil()
-    
+
     def _check_dup(self) -> bool:
         if len(self.frames_processed) == 1:
             return False

sticker_convert/downloaders/download_base.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Any, List, Optional, Tuple
 
+import anyio
 import requests
 
 from sticker_convert.job_option import CredOption
@@ -27,16 +28,50 @@ class DownloadBase:
 
     def download_multiple_files(
         self, targets: List[Tuple[str, Path]], retries: int = 3, **kwargs: Any
+    ) -> None:
+        anyio.run(self.download_multiple_files_async, targets, retries, **kwargs)
+
+    async def download_multiple_files_async(
+        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)})
         )
 
-        for url, dest in targets:
-            self.download_file(url, dest, retries, show_progress=False, **kwargs)
+        async with anyio.create_task_group() as tg:
+            for url, dest in targets:
+                tg.start_soon(self.download_file_async, url, dest, retries, **kwargs)
+
+    async def download_file_async(
+        self,
+        url: str,
+        dest: Path,
+        retries: int = 3,
+        **kwargs: Any,
+    ) -> None:
+        for retry in range(retries):
+            try:
+                response = requests.get(url, allow_redirects=True, **kwargs)
+
+                if not response.ok:
+                    self.cb.put("update_bar")
+                    raise requests.exceptions.RequestException(
+                        f"Error {response.status_code}"
+                    )
+
+                self.cb.put(f"Downloading {url}")
+                with open(dest, "wb+") as f:
+                    f.write(response.content)
+                self.cb.put(f"Downloaded {url}")
+                break
+
+            except requests.exceptions.RequestException as e:
+                self.cb.put(
+                    f"Cannot download {url} (tried {retry+1}/{retries} times): {e}"
+                )
 
-            self.cb.put("update_bar")
+        self.cb.put("update_bar")
 
     def download_file(
         self,
@@ -51,10 +86,12 @@ class DownloadBase:
 
         for retry in range(retries):
             try:
-                response = requests.get(url, stream=True, **kwargs)
+                response = requests.get(
+                    url, stream=True, allow_redirects=True, **kwargs
+                )
                 total_length = int(response.headers.get("content-length"))  # type: ignore
 
-                if response.status_code != 200:
+                if not response.ok:
                     return b""
                 self.cb.put(f"Downloading {url}")
 
@@ -75,16 +112,16 @@ class DownloadBase:
                             self.cb.put("update_bar")
 
                 break
-            except requests.exceptions.RequestException:
-                msg = f"Cannot download {url} (tried {retry+1}/{retries} times)"
-                self.cb.put(msg)
+            except requests.exceptions.RequestException as e:
+                self.cb.put(
+                    f"Cannot download {url} (tried {retry+1}/{retries} times): {e}"
+                )
 
         if not result:
             return b""
         if dest:
             with open(dest, "wb+") as f:
                 f.write(result)
-            msg = f"Downloaded {url}"
-            self.cb.put(msg)
+            self.cb.put(f"Downloaded {url}")
             return b""
         return result

sticker_convert/downloaders/download_signal.py

@@ -3,9 +3,9 @@ from pathlib import Path
 from typing import Dict, Optional
 
 import anyio
-from signalstickers_client import StickersClient  # type: ignore
-from signalstickers_client.errors import SignalException  # type: ignore
-from signalstickers_client.models import StickerPack  # type: ignore
+from signalstickers_client.errors import SignalException
+from signalstickers_client.models import StickerPack
+from signalstickers_client.stickersclient import StickersClient
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
@@ -21,7 +21,7 @@ class DownloadSignal(DownloadBase):
     @staticmethod
     async def get_pack(pack_id: str, pack_key: str) -> StickerPack:
         async with StickersClient() as client:
-            pack = await client.get_pack(pack_id, pack_key)  # type: ignore
+            pack = await client.get_pack(pack_id, pack_key)
 
         return pack
 
@@ -32,14 +32,14 @@ class DownloadSignal(DownloadBase):
                 None,
                 {
                     "set_progress_mode": "determinate",
-                    "steps": len(pack.stickers),  # type: ignore
+                    "steps": len(pack.stickers),
                 },
             )
         )
 
         emoji_dict: Dict[str, str] = {}
-        for sticker in pack.stickers:  # type: ignore
-            f_id = str(sticker.id).zfill(3)  # type: ignore
+        for sticker in pack.stickers:
+            f_id = str(sticker.id).zfill(3)
             f_path = Path(self.out_dir, f_id)
             with open(f_path, "wb") as f:
                 f.write(sticker.image_data)  # type: ignore

sticker_convert/downloaders/download_viber.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+import json
+import zipfile
+from io import BytesIO
+from pathlib import Path
+from typing import Optional, Tuple, cast
+from urllib.parse import urlparse
+
+import requests
+from bs4 import BeautifulSoup
+
+from sticker_convert.downloaders.download_base import DownloadBase
+from sticker_convert.job_option import CredOption
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.files.metadata_handler import MetadataHandler
+
+
+class DownloadViber(DownloadBase):
+    # def __init__(self, *args: Any, **kwargs: Any) -> None:
+    #     super().__init__(*args, **kwargs)
+
+    def get_pack_info(self, url: str) -> Optional[Tuple[str, str]]:
+        r = requests.get(url, allow_redirects=True)
+        soup = BeautifulSoup(r.text, "html.parser")
+
+        is_custom = urlparse(url).path.startswith("/pages/custom-sticker-packs/")
+        if is_custom:
+            tag_text_search = "window.CUSTOM_STICKER_PACK"
+        else:
+            tag_text_search = "window.PRODUCT"
+
+        script_tag = soup.find(
+            lambda tag: tag.name == "script" and tag.text.startswith(tag_text_search)
+        )
+        if script_tag is None:
+            return None
+
+        pack_json = script_tag.text.replace(f"{tag_text_search} = ", "", 1)[:-1]
+        pack_dict = json.loads(pack_json)
+
+        title = pack_dict["title"]
+        first_sticker_url = cast(str, pack_dict["stickerFirstItemUrl"])
+        zip_url = "/".join(first_sticker_url.split("/")[:-1]) + ".zip"
+
+        return title, zip_url
+
+    def decompress(self, zip_file: bytes) -> None:
+        with zipfile.ZipFile(BytesIO(zip_file)) as zf:
+            self.cb.put("Unzipping...")
+
+            zf_files = zf.namelist()
+            self.cb.put(
+                (
+                    "bar",
+                    None,
+                    {"set_progress_mode": "determinate", "steps": len(zf_files)},
+                )
+            )
+
+            for sticker in zf_files:
+                num = sticker.split(".")[0][-2:].zfill(3)
+                data = zf.read(sticker)
+                ext = Path(sticker).suffix
+                self.cb.put(f"Read {sticker}")
+
+                out_path = Path(self.out_dir, num + ext)
+                with open(out_path, "wb") as f:
+                    f.write(data)
+
+                self.cb.put("update_bar")
+
+    def download_stickers_viber(self) -> bool:
+        pack_info = self.get_pack_info(self.url)
+        if pack_info is None:
+            self.cb.put("Download failed: Cannot get pack info")
+            return False
+        title, zip_url = pack_info
+
+        zip_file = self.download_file(zip_url)
+        self.decompress(zip_file)
+
+        MetadataHandler.set_metadata(self.out_dir, title=title)
+
+        return True
+
+    @staticmethod
+    def start(
+        url: str,
+        out_dir: Path,
+        opt_cred: Optional[CredOption],
+        cb: CallbackProtocol,
+        cb_return: CallbackReturn,
+    ) -> bool:
+        downloader = DownloadViber(url, out_dir, opt_cred, cb, cb_return)
+        return downloader.download_stickers_viber()

sticker_convert/job.py

@@ -16,6 +16,7 @@ from sticker_convert.downloaders.download_kakao import DownloadKakao
 from sticker_convert.downloaders.download_line import DownloadLine
 from sticker_convert.downloaders.download_signal import DownloadSignal
 from sticker_convert.downloaders.download_telegram import DownloadTelegram
+from sticker_convert.downloaders.download_viber import DownloadViber
 from sticker_convert.job_option import CompOption, CredOption, InputOption, OutputOption
 from sticker_convert.uploaders.compress_wastickers import CompressWastickers
 from sticker_convert.uploaders.upload_signal import UploadSignal
@@ -527,6 +528,9 @@ class Job:
         if self.opt_input.option == "kakao":
             downloaders.append(DownloadKakao.start)
 
+        if self.opt_input.option == "viber":
+            downloaders.append(DownloadViber.start)
+
         if len(downloaders) > 0:
             self.executor.cb("Downloading...")
         else:

sticker_convert/resources/compression.json

@@ -328,6 +328,53 @@
         "quantize_method": "imagequant",
         "default_emoji": "😀"
     },
+    "viber": {
+        "size_max": {
+            "img": 0,
+            "vid": 0
+        },
+        "format": {
+            "img": ".png",
+            "vid": ".png"
+        },
+        "fps": {
+            "min": 1,
+            "max": 1,
+            "power": 1
+        },
+        "res": {
+            "w": {
+                "min": 490,
+                "max": 490
+            },
+            "h": {
+                "min": 490,
+                "max": 490
+            },
+            "power": 1
+        },
+        "quality": {
+            "min": 95,
+            "max": 95,
+            "power": 1
+        },
+        "color": {
+            "min": 257,
+            "max": 257,
+            "power": 1
+        },
+        "duration": {
+            "min": 0,
+            "max": 0
+        },
+        "padding_percent": 0,
+        "bg_color": "",
+        "steps": 1,
+        "fake_vid": false,
+        "scale_filter": "bicubic",
+        "quantize_method": "imagequant",
+        "default_emoji": "😀"
+    },
     "imessage_small": {
         "size_max": {
             "img": 500000,

sticker_convert/resources/input.json

@@ -49,6 +49,16 @@
             "author": true
         }
     },
+    "viber": {
+        "full_name": "Download from Viber",
+        "help": "Download viber stickers from a URL as input",
+        "example": "Example: https://stickers.viber.com/pages/example OR https://stickers.viber.com/pages/custom-sticker-packs/example",
+        "address_lbls": "URL address / ID",
+        "metadata_provides": {
+            "title": true,
+            "author": false
+        }
+    },
     "local": {
         "full_name": "From local directory",
         "help": "Load files from local directory on computer",

sticker_convert/uploaders/upload_signal.py

@@ -4,9 +4,9 @@ from pathlib import Path
 from typing import Any, Dict, List
 
 import anyio
-from signalstickers_client import StickersClient  # type: ignore
-from signalstickers_client.errors import SignalException  # type: ignore
-from signalstickers_client.models import LocalStickerPack, Sticker  # type: ignore
+from signalstickers_client.errors import SignalException
+from signalstickers_client.models import LocalStickerPack, Sticker
+from signalstickers_client.stickersclient import StickersClient
 
 from sticker_convert.converter import StickerConvert
 from sticker_convert.job_option import CompOption, CredOption, OutputOption
@@ -39,7 +39,7 @@ class UploadSignal(UploadBase):
     @staticmethod
     async def upload_pack(pack: LocalStickerPack, uuid: str, password: str) -> str:
         async with StickersClient(uuid, password) as client:
-            pack_id, pack_key = await client.upload_pack(pack)  # type: ignore
+            pack_id, pack_key = await client.upload_pack(pack)
 
         result = (
             f"https://signal.art/addstickers/#pack_id={pack_id}&pack_key={pack_key}"
@@ -53,7 +53,7 @@ class UploadSignal(UploadBase):
             self.cb.put(f"Verifying {src} for uploading to signal")
 
             sticker = Sticker()
-            sticker.id = pack.nb_stickers  # type: ignore
+            sticker.id = pack.nb_stickers
 
             emoji = emoji_dict.get(Path(src).stem, None)
             if not emoji:
@@ -61,7 +61,7 @@ class UploadSignal(UploadBase):
                     f"Warning: Cannot find emoji for file {Path(src).name}, skip uploading this file..."
                 )
                 continue
-            sticker.emoji = emoji[:1]  # type: ignore
+            sticker.emoji = emoji[:1]
 
             if Path(src).suffix == ".webp":
                 spec_choice = self.webp_spec
@@ -84,10 +84,10 @@ class UploadSignal(UploadBase):
 
                 assert isinstance(image_data, bytes)
 
-                sticker.image_data = image_data  # type: ignore
+                sticker.image_data = image_data
             else:
                 with open(src, "rb") as f:
-                    sticker.image_data = f.read()  # type: ignore
+                    sticker.image_data = f.read()
 
             pack._addsticker(sticker)  # type: ignore
 
@@ -140,8 +140,8 @@ class UploadSignal(UploadBase):
         )
         for pack_title, stickers in packs.items():
             pack = LocalStickerPack()
-            pack.title = pack_title  # type: ignore
-            pack.author = author  # type: ignore
+            pack.title = pack_title
+            pack.author = author
 
             self.add_stickers_to_pack(pack, stickers, emoji_dict)
             self.cb.put(f"Uploading pack {pack_title}")

sticker_convert/uploaders/upload_telegram.py

@@ -2,7 +2,7 @@
 import copy
 import re
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple, Union, cast
+from typing import Any, Dict, List, Optional, Union, cast
 
 import anyio
 from telegram import InputSticker, Sticker
@@ -96,7 +96,7 @@ class UploadTelegram(UploadBase):
                 "[^0-9a-zA-Z]+", "_", pack_short_name
             )  # name used in url, only alphanum and underscore only
 
-            sticker_set = None
+            sticker_set: Any = None
             try:
                 sticker_set = await bot.get_sticker_set(
                     pack_short_name,
@@ -152,11 +152,10 @@ class UploadTelegram(UploadBase):
             else:
                 sticker_type = Sticker.REGULAR
 
-            input_stickers: List[Tuple[Path, InputSticker]] = []
+            init_input_stickers: List[InputSticker] = []
             sticker_format = None
-            cover_spec_choice = None
-            ext = None
-            for src in stickers:
+            sticker_format_prev = None
+            for count, src in enumerate(stickers):
                 self.cb.put(f"Verifying {src} for uploading to telegram")
 
                 emoji = emoji_dict.get(Path(src).stem, None)
@@ -175,16 +174,13 @@ class UploadTelegram(UploadBase):
                 ext = Path(src).suffix
                 if ext == ".tgs":
                     spec_choice = self.tgs_spec
-                    cover_spec_choice = self.tgs_cover_spec
                     sticker_format = "animated"
                 elif ext == ".webm":
                     spec_choice = self.webm_spec
-                    cover_spec_choice = self.webm_cover_spec
                     sticker_format = "video"
                 else:
                     ext = ".png"
                     spec_choice = self.png_spec
-                    cover_spec_choice = self.png_cover_spec
                     sticker_format = "static"
 
                 if self.opt_output.option == "telegram_emoji":
@@ -203,81 +199,98 @@ class UploadTelegram(UploadBase):
                     )
                     sticker_bytes = cast(bytes, convert_result)
 
-                input_stickers.append(
-                    (src, InputSticker(sticker=sticker_bytes, emoji_list=emoji_list))
+                input_sticker = InputSticker(
+                    sticker=sticker_bytes,
+                    emoji_list=emoji_list,
+                    format=sticker_format,
                 )
 
+                if sticker_set is None:
+                    if count < 50 and (
+                        sticker_format_prev is None
+                        or sticker_format_prev == sticker_format
+                    ):
+                        init_input_stickers.append(input_sticker)
+                    else:
+                        start_msg = f"Creating pack and bulk uploading {count} stickers with same format of {pack_short_name}"
+                        finish_msg = f"Created pack and bulk uploaded {count} stickers with same format of {pack_short_name}"
+                        error_msg = f"Cannot create pack and bulk upload {count} stickers with same format of {pack_short_name} due to"
+                        self.cb.put(start_msg)
+                        try:
+                            await bot.create_new_sticker_set(
+                                user_id=self.telegram_userid,
+                                name=pack_short_name,
+                                title=pack_title,
+                                stickers=init_input_stickers,
+                                sticker_type=sticker_type,
+                            )
+                            sticker_set = True
+                            self.cb.put(finish_msg)
+                        except TelegramError as e:
+                            self.cb.put(f"{error_msg} {e}")
+                            return None
+                else:
+                    try:
+                        # We could use tg.start_soon() here
+                        # But this would disrupt the order of stickers
+                        await bot.add_sticker_to_set(
+                            user_id=self.telegram_userid,
+                            name=pack_short_name,
+                            sticker=input_sticker,
+                        )
+                        self.cb.put(f"Uploaded sticker {src} of {pack_short_name}")
+                    except BadRequest as e:
+                        self.cb.put(
+                            f"Cannot upload sticker {src} of {pack_short_name} due to {e}"
+                        )
+                        if str(e) == "Stickerpack_not_found":
+                            self.cb.put(
+                                "Hint: You might had deleted and recreated pack too quickly. Wait about 3 minutes and try again."
+                            )
+                    except TelegramError as e:
+                        self.cb.put(
+                            f"Cannot upload sticker {src} of {pack_short_name} due to {e}"
+                        )
+
+                sticker_format_prev = sticker_format
+
             cover_path = MetadataHandler.get_cover(self.opt_output.dir)
-            thumbnail_bytes: Union[None, bytes, Path] = None
-            if cover_path and cover_spec_choice and ext:
+            if cover_path:
+                thumbnail_bytes: Union[None, bytes, Path] = None
+                cover_ext = Path(cover_path).suffix
+
+                if cover_ext == ".tgs":
+                    thumbnail_format = "animated"
+                    cover_spec_choice = self.tgs_cover_spec
+                elif cover_ext == ".webm":
+                    thumbnail_format = "video"
+                    cover_spec_choice = self.webm_cover_spec
+                else:
+                    cover_ext = ".png"
+                    thumbnail_format = "static"
+                    cover_spec_choice = self.png_cover_spec
+
                 if FormatVerify.check_file(cover_path, spec=cover_spec_choice):
                     with open(cover_path, "rb") as f:
                         thumbnail_bytes = f.read()
                 else:
                     _, _, thumbnail_bytes, _ = StickerConvert.convert(
                         cover_path,
-                        Path(f"bytes{ext}"),
+                        Path(f"bytes{cover_ext}"),
                         self.opt_comp_cover_merged,
                         self.cb,
                         self.cb_return,
                     )
 
-            if sticker_set is None and sticker_format is not None:
-                if len(input_stickers) > 50:
-                    amount_str = "first 50"
-                else:
-                    amount_str = "all"
-                start_msg = f"Creating pack and bulk uploading {amount_str} stickers of {pack_short_name}"
-                finish_msg = f"Created pack and bulk uploaded {amount_str} stickers of {pack_short_name}"
-                error_msg = f"Cannot create pack and bulk upload {amount_str} stickers of {pack_short_name} due to"
-                self.cb.put(start_msg)
-                try:
-                    await bot.create_new_sticker_set(
-                        user_id=self.opt_cred.telegram_userid,
-                        name=pack_short_name,
-                        title=pack_title,
-                        stickers=[a for _, a in input_stickers[:50]],
-                        sticker_format=sticker_format,
-                        sticker_type=sticker_type,
-                    )
-                    self.cb.put(finish_msg)
-                    input_stickers = input_stickers[50:]
-                except TelegramError as e:
-                    self.cb.put(f"{error_msg} {e}")
-                    return None
-
-            for src, sticker in input_stickers:
-                try:
-                    # We could use tg.start_soon() here
-                    # But this would disrupt the order of stickers
-                    await bot.add_sticker_to_set(
-                        user_id=self.opt_cred.telegram_userid,
-                        name=pack_short_name,
-                        sticker=sticker,
-                    )
-                    self.cb.put(f"Uploaded sticker {src} of {pack_short_name}")
-                except BadRequest as e:
-                    self.cb.put(
-                        f"Cannot upload sticker {src} of {pack_short_name} due to {e}"
-                    )
-                    if str(e) == "Stickerpack_not_found":
-                        self.cb.put(
-                            "Hint: You might had deleted and recreated pack too quickly. Wait about 3 minutes and try again."
-                        )
-                except TelegramError as e:
-                    self.cb.put(
-                        f"Cannot upload sticker {src} of {pack_short_name} due to {e}"
-                    )
-
-            if thumbnail_bytes is not None:
                 try:
                     self.cb.put(
                         f"Uploading cover (thumbnail) of pack {pack_short_name}"
                     )
                     await bot.set_sticker_set_thumbnail(
                         name=pack_short_name,
-                        user_id=self.opt_cred.telegram_userid,
+                        user_id=self.telegram_userid,
                         thumbnail=thumbnail_bytes,
+                        format=thumbnail_format,
                     )
                     self.cb.put(f"Uploaded cover (thumbnail) of pack {pack_short_name}")
                 except TelegramError as e:
@@ -300,6 +313,12 @@ class UploadTelegram(UploadBase):
             self.cb.put("Token and userid required for uploading to telegram")
             return urls
 
+        if self.opt_cred.telegram_userid.isnumeric():
+            self.telegram_userid = int(self.opt_cred.telegram_userid)
+        else:
+            self.cb.put("Invalid userid, should contain numbers only")
+            return urls
+
         title, _, emoji_dict = MetadataHandler.get_metadata(
             self.opt_output.dir,
             title=self.opt_output.title,
@@ -327,11 +346,18 @@ class UploadTelegram(UploadBase):
             )
 
         assert title is not None
+        assert emoji_dict is not None
+
+        if self.opt_output.option == "telegram_emoji":
+            file_per_pack = 200
+        else:
+            file_per_pack = 120
+
         packs = MetadataHandler.split_sticker_packs(
             self.opt_output.dir,
             title=title,
-            file_per_anim_pack=50,
-            file_per_image_pack=120,
+            file_per_anim_pack=file_per_pack,
+            file_per_image_pack=file_per_pack,
             separate_image_anim=not self.opt_comp.fake_vid,
         )
 

sticker_convert/utils/auth/get_line_auth.py

@@ -5,41 +5,35 @@ from http.cookiejar import CookieJar
 from typing import Any, Callable, Dict, List, Optional, Union
 
 import requests
-import rookiepy  # type: ignore
+import rookiepy
 
 
 class GetLineAuth:
     def get_cred(self) -> Optional[str]:
         browsers: List[Callable[..., Any]] = [
-            rookiepy.load,  # type: ignore # Supposed to load from any browser, but may fail
-            rookiepy.firefox,  # type: ignore
-            rookiepy.libre_wolf,  # type: ignore
-            rookiepy.chrome,  # type: ignore
-            rookiepy.chromium,  # type: ignore
-            rookiepy.brave,  # type: ignore
-            rookiepy.edge,  # type: ignore
-            rookiepy.opera,  # type: ignore
-            rookiepy.vivaldi,  # type: ignore
+            rookiepy.load,  # Supposed to load from any browser, but may fail
+            rookiepy.firefox,
+            rookiepy.librewolf,
+            rookiepy.chrome,
+            rookiepy.chromium,
+            rookiepy.brave,
+            rookiepy.edge,
+            rookiepy.opera,
+            rookiepy.vivaldi,
         ]
 
-        # https://github.com/thewh1teagle/rookie/pull/24
-        if "libre_wolf" in rookiepy.__all__:
-            browsers.extend(rookiepy.libre_wolf)  # type: ignore
-        else:
-            browsers.extend(rookiepy.librewolf)  # type: ignore
-
         if platform.system() == "Windows":
             browsers.extend(
                 [
-                    rookiepy.opera_gx,  # type: ignore
-                    rookiepy.internet_explorer,  # type: ignore
+                    rookiepy.opera_gx,
+                    rookiepy.internet_explorer,
                 ]
             )
         elif platform.system() == "Darwin":
             browsers.extend(
                 [
-                    rookiepy.opera_gx,  # type: ignore
-                    rookiepy.safari,  # type: ignore
+                    rookiepy.opera_gx,
+                    rookiepy.safari,
                 ]
             )
 
@@ -48,7 +42,7 @@ class GetLineAuth:
         for browser in browsers:
             try:
                 cookies_dict = browser(["store.line.me"])
-                cookies_jar = rookiepy.to_cookiejar(cookies_dict)  # type: ignore
+                cookies_jar = rookiepy.to_cookiejar(cookies_dict)
 
                 if GetLineAuth.validate_cookies(cookies_jar):
                     break

sticker_convert/version.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = "2.8.3"
+__version__ = "2.8.5"

{sticker_convert-2.8.3.dist-info → sticker_convert-2.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.3
+Version: 2.8.5
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -349,7 +349,7 @@ Project-URL: Source, https://github.com/laggykiller/sticker-convert
 Project-URL: Documentation, https://github.com/laggykiller/sticker-convert
 Project-URL: Tracker, https://github.com/laggykiller/sticker-convert/issues
 Project-URL: Repository, https://github.com/laggykiller/sticker-convert
-Keywords: telegram,line,tgs,whatsapp,kakao,signal,imessage,wastickers
+Keywords: telegram,line,tgs,whatsapp,kakao,signal,imessage,wastickers,viber
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: Topic :: Multimedia :: Graphics :: Graphics Conversion
@@ -365,21 +365,21 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter ~=1.1.0
-Requires-Dist: anyio ~=3.7.1
+Requires-Dist: anyio ~=4.3.0
 Requires-Dist: apngasm-python ~=1.2.3
 Requires-Dist: av ~=12.0.0
 Requires-Dist: beautifulsoup4 ~=4.12.3
-Requires-Dist: rookiepy ~=0.3.6
+Requires-Dist: rookiepy ~=0.4.0
 Requires-Dist: imagequant ~=1.1.1
 Requires-Dist: memory-tempfile ~=2.2.3
 Requires-Dist: mergedeep ~=1.3.4
 Requires-Dist: numpy >=1.22.4
-Requires-Dist: Pillow ==10.1.0
+Requires-Dist: Pillow ~=10.3.0
 Requires-Dist: pyoxipng ~=9.0.0
-Requires-Dist: python-telegram-bot ~=20.5
+Requires-Dist: python-telegram-bot ~=21.1
 Requires-Dist: requests ~=2.31.0
 Requires-Dist: rlottie-python ~=1.3.4
-Requires-Dist: signalstickers-client ~=3.3.0
+Requires-Dist: signalstickers-client-fork-laggykiller ~=3.3.0.post1
 Requires-Dist: sqlcipher3-wheels ~=0.5.2.post1
 Requires-Dist: tqdm ~=4.66.2
 Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
@@ -391,7 +391,7 @@ Requires-Dist: webp ~=0.3.0
 
 - A python script for creating, downloading, converting+compressing and uploading stickers from multiple instant messaging applications.
 - With GUI and CLI that runs on Windows, MacOS and Linux
-- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), iMessage (Create Xcode sticker pack project)
+- Currently supports Signal, Telegram, WhatsApp (Create .wastickers), Line (Download only), Kakao (Download only), Viber (Download only), iMessage (Create Xcode sticker pack project)
 - Supports static and animated stickers, with transparency support
 
 ## Downloads
@@ -429,6 +429,7 @@ Requires-Dist: webp ~=0.3.0
 | [WhatsApp](docs/guide_whatsapp.md)    | ⭕ (By Android or WhatsApp Web)     | ⭕ (Create `.wastickers`, import by Sticker Maker) |
 | [Line](docs/guide_line.md)            | ✅                                  | 🚫 (Need to submit for manual approval)            |
 | [Kakao](docs/guide_kakao.md)          | ✅ (Need 'share link' for animated) | 🚫 (Need to submit for manual approval)            |
+| [Viber](docs/guide_viber.md)          | ✅                                  | 🚫 (Manually upload through Viber app)             |
 | [iMessage](docs/guide_imessage.md)    | 🚫                                  | ⭕ (Create Xcode stickerpack project for sideload) |
 
 ✅ = Supported ⭕ = Partially supported 🚫 = Not supported
@@ -455,6 +456,9 @@ Requires-Dist: webp ~=0.3.0
 - Kakao
     - Download: Supported (e.g. `https://e.kakao.com/t/xxxxx` OR `kakaotalk://store/emoticon/4404400` OR `https://emoticon.kakao.com/items/xxxxx` OR `4404400`). It is rather complicated, learn more from [docs/guide_kakao.md](docs/guide_kakao.md)
     - Upload: Not supported. You need to manually submit sticker pack for approval before you can use in app.
+- Viber
+    - Download: Supported (e.g. `https://stickers.viber.com/pages/example` OR `https://stickers.viber.com/pages/custom-sticker-packs/example`)
+    - Upload: The program can convert images to png with 490x490 for uploading to viber manually. It should be noted that Viber is able to resize images for you, so it may not be necessary to use sticker-convert for creating Viber sticker pack.
 - iMessage
     - Download: Not supported.
     - Upload: The program can create Xcode project for iMessage sticker pack, which could then be compiled and sideloaded using Xcode.

{sticker_convert-2.8.3.dist-info → sticker_convert-2.8.5.dist-info}/RECORD

@@ -1,18 +1,19 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=6RJauR-SCSSTT3TU7FFB6B6PVwsCxO2xZXtmZ3jc2Is,463
-sticker_convert/cli.py,sha256=KMl8G25rTpSko46SC-WdI5YDBykyluQL13PYpZW_O8M,18579
-sticker_convert/converter.py,sha256=CwhOuH8Os5zU_cLKmK0IKLAurA_-9-4E0cccQNHLp8Y,37357
+sticker_convert/cli.py,sha256=QGCpCSVt6ChVGXkX7Ngivl-CDUewqklqz2GRJKPFlsg,18621
+sticker_convert/converter.py,sha256=cmUCq_bAsDGYNDBnajxibqcgMrCND1w3icjUTDZSJRA,37353
 sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjtE,2073
 sticker_convert/gui.py,sha256=TRPGwMhSMPHnZppHmw2OWHKTJtGoeLpGWD0eRYi4_yk,30707
-sticker_convert/job.py,sha256=dBo98c5dIbg5ZUY8CEE1XQOSoBuf5VOZc-8pmq0Y1Js,25608
+sticker_convert/job.py,sha256=vKv1--y4MVmZV_IBpUhEfNEiUeEqrTR1umzlALPXKdw,25775
 sticker_convert/job_option.py,sha256=JHAFCxp7-dDwD-1PbpYLAFRF3OoJu8cj_BjOm5r8Gp8,7732
-sticker_convert/version.py,sha256=s6EC7_A6bcTAEEXvg8UKbvmODYWmAfNLeSy3bqzdqAY,46
+sticker_convert/version.py,sha256=e6mePgSboDriG7gF-dXdRqwITrYd0E04plj8K5a_YxM,46
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sticker_convert/downloaders/download_base.py,sha256=CcrgZiBOYJbYcDGCPDHp-ECGXSpfmGtQCzS7KRbBl1E,2726
+sticker_convert/downloaders/download_base.py,sha256=rYoUijl_pKldzD8SJGFetDwgMWPSQSfQwzLDObEMGow,3980
 sticker_convert/downloaders/download_kakao.py,sha256=UFp7EpMea62fIePY5DfhH4jThAwdeazfoC5iW1g4dAo,8516
 sticker_convert/downloaders/download_line.py,sha256=9WzOWujTbZdAqBi52k21OUEfRmcV1loCaJiDmg6dklw,17853
-sticker_convert/downloaders/download_signal.py,sha256=A-paX51kRvXIs6tY9aXv77_DJhBPcTfqZ8ib31yk5ks,3160
+sticker_convert/downloaders/download_signal.py,sha256=PfwscdbcEd_5C3Ecs0F8Qc8si1sLzLodAdnsHVwXgac,3063
 sticker_convert/downloaders/download_telegram.py,sha256=jufMqc78aXOPDr7fQf9ykkNyhQ7KVCp4gRBxs09NgMo,4614
+sticker_convert/downloaders/download_viber.py,sha256=mrM1XIuXuon4hlkYQc8vYqjYr1KAZGdWUI9n85W5vpU,3090
 sticker_convert/gui_components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/gui_components/gui_utils.py,sha256=okho2cA1Scem_m6rPiYifreFzpFrM21-yUkiAv64EUI,3431
 sticker_convert/gui_components/frames/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -66,21 +67,21 @@ sticker_convert/resources/NotoColorEmoji.ttf,sha256=LurIVaCIA8bSCfjrdO1feYr0bhKL
 sticker_convert/resources/appicon.icns,sha256=FB2DVTOQcFfQNZ9RcyG3z9c9k7eOiI1qw0IJhXMRFg4,5404
 sticker_convert/resources/appicon.ico,sha256=-ldugcl2Yq2pBRTktnhGKWInpKyWzRjCiPvMr3XPTlc,38078
 sticker_convert/resources/appicon.png,sha256=6XBEQz7PnerqS43aRkwpWolFG4WvKMuQ-st1ly-_JPg,5265
-sticker_convert/resources/compression.json,sha256=gWD7339773learbiFMGpTzNJVCVj8tS6ELi7yR7yKl8,11163
+sticker_convert/resources/compression.json,sha256=8SAv5m7_R2QFaU656W7gpliCJF9ZmGdE_XfnJU3D0ZE,12156
 sticker_convert/resources/emoji.json,sha256=sXSuKusyG1L2Stuf9BL5ZqfzOIOdeAeE3RXcrXAsLdY,413367
 sticker_convert/resources/help.json,sha256=7VKc4Oxw6e4zv2IIeYRQ5e_aa88UlsgIHSBm9Tf-V70,6541
-sticker_convert/resources/input.json,sha256=sRz8qWaLh2KTjjlPIxz2UfynVn2Bn0olywbb8-qT_Hc,2251
+sticker_convert/resources/input.json,sha256=5nc3US6WXAJzjqWqtDy7R2nBZ5VKVFZlKDAadE-q7SI,2657
 sticker_convert/resources/output.json,sha256=QYP2gqDvEaAm5I9bH4NReaB1XMLboevv69u-V8YdZUs,1373
 sticker_convert/uploaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/uploaders/compress_wastickers.py,sha256=SMPf1_ir30ZKO2ChHspDFuyaufx0XeVBVLOlHmawEdY,6021
 sticker_convert/uploaders/upload_base.py,sha256=uQupPn6r4zrlAzpKzzX7CgvZb69ATyrwPKahWOQj0ds,1203
-sticker_convert/uploaders/upload_signal.py,sha256=vFMvQ4TwDNliPuQ7ecXHzTT-qrTwPAORbSxZ7Nk9VM4,6541
-sticker_convert/uploaders/upload_telegram.py,sha256=KXQskywHjiVWLDz6qjzJhZk14PNRD3vQ-HNORNa1vNI,14634
+sticker_convert/uploaders/upload_signal.py,sha256=eZNfTwnZzPmJcl_UCfJT6rrmLlNpD2EKfxrO2jdi1yg,6396
+sticker_convert/uploaders/upload_telegram.py,sha256=XnspO9VVbKND0gybUwdFTSzDBVDxLw9O_R7chnVQ0t0,15695
 sticker_convert/uploaders/xcode_imessage.py,sha256=1gvOljf6kYsq_11tYhnF19Yf4oGY5y34te2DWBRMwf0,11254
 sticker_convert/utils/callback.py,sha256=_w_dZ3DZTA9m4TjEg6NH_VOa5Dl2YHXdXAlwx_tBdoY,6061
 sticker_convert/utils/url_detect.py,sha256=Cw3SzHj0xQTgCY8KvXbgFGRn_VhDJuZvH0mWsiQOg5s,769
 sticker_convert/utils/auth/get_kakao_auth.py,sha256=ipAZ1DUd5CMTpUoxRXHVOFC3DKIpxwxpTYAfrOJ6UZ8,9829
-sticker_convert/utils/auth/get_line_auth.py,sha256=CAg5oAyqnzyAr1sP0iaecJPpmreeERiZnVxIX9X_Ib0,2682
+sticker_convert/utils/auth/get_line_auth.py,sha256=8l8ha2vQmk3rHGvDE7PkcxQXbH3oe62LKbI3qVUtvqc,2196
 sticker_convert/utils/auth/get_signal_auth.py,sha256=6Sx-lMuyBHeX1RpjAWI8u03qnRu9fmO4p89pd7fowOE,4925
 sticker_convert/utils/files/cache_store.py,sha256=etfe614OAhAyrnM5fGeESKq6R88YLNqkqkxSzEmZ0V0,1047
 sticker_convert/utils/files/json_manager.py,sha256=Vr6pZJdLMkrJJWN99210aduVHb0ILyf0SSTaw4TZqgc,541
@@ -92,9 +93,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=SJSFvQzXHnGkj7MH9xJ5xiC4cqiOjFKckFKE_FICdT4,15562
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=Xf94jyqk_6M9IlFGMy0wYIgQKn_yg00nD4XW0CgAbew,5732
-sticker_convert-2.8.3.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.8.3.dist-info/METADATA,sha256=1Z_8zjVrd5RMAilj-dAEVVGBtbYzkchvTDgzeWsfCTA,49284
-sticker_convert-2.8.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sticker_convert-2.8.3.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.8.3.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.8.3.dist-info/RECORD,,
+sticker_convert-2.8.5.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.8.5.dist-info/METADATA,sha256=CWigvu2m37fdj14o8MqqmahgYDfUrbzG2zPbEO1KdCU,49868
+sticker_convert-2.8.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sticker_convert-2.8.5.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.8.5.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.8.5.dist-info/RECORD,,