sticker-convert 2.7.2__tar.gz → 2.7.4__tar.gz

{sticker-convert-2.7.2/src/sticker_convert.egg-info → sticker-convert-2.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.2
+Version: 2.7.4
 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>
@@ -361,7 +361,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: apngasm_python~=1.2.3
@@ -370,12 +370,12 @@ Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.3.6
 Requires-Dist: imagequant~=1.1.1
 Requires-Dist: memory-tempfile~=2.2.3
-Requires-Dist: numpy~=1.26.4
+Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=10.2.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=20.5
 Requires-Dist: requests~=2.31.0
-Requires-Dist: rlottie_python~=1.3.2
+Requires-Dist: rlottie_python~=1.3.3
 Requires-Dist: signalstickers-client~=3.3.0
 Requires-Dist: sqlcipher3-wheels~=0.5.2.post1
 Requires-Dist: tqdm~=4.66.2
@@ -478,20 +478,20 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage]
                           [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}]
-                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--fps-power FPS_POWER]
-                          [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX]
-                          [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--quality-min QUALITY_MIN]
-                          [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER] [--color-min COLOR_MIN]
-                          [--color-max COLOR_MAX] [--color-power COLOR_POWER] [--duration-min DURATION_MIN]
-                          [--duration-max DURATION_MAX] [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX]
-                          [--vid-format VID_FORMAT] [--img-format IMG_FORMAT] [--fake-vid] [--scale-filter SCALE_FILTER]
-                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI]
-                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
-                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
+                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX]
+                          [--fps-power FPS_POWER] [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN]
+                          [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER]
+                          [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER]
+                          [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER]
+                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--vid-size-max VID_SIZE_MAX]
+                          [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT] [--img-format IMG_FORMAT] [--fake-vid]
+                          [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR]
+                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD]
+                          [--signal-get-auth] [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
                           [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
                           [--kakao-username KAKAO_USERNAME] [--kakao-password KAKAO_PASSWORD]
-                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth]
-                          [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
+                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER]
+                          [--line-get-auth] [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
 
 CLI for stickers-convert
 
@@ -592,7 +592,9 @@ Compression options:
   --scale-filter SCALE_FILTER
                         Set scale filter. Default as lanczos. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
-                        - bilinear = linear interpolation
+                        -box = Similar to nearest, but better downscaling
+                        - bilinear = Linear interpolation
+                        - hamming = Similar to bilinear, but better downscaling
                         - bicubic = Cubic spline interpolation
                         - lanczos = A high-quality downsampling filter
   --quantize-method QUANTIZE_METHOD

{sticker-convert-2.7.2 → sticker-convert-2.7.4}/README.md

@@ -94,20 +94,20 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage]
                           [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}]
-                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--fps-power FPS_POWER]
-                          [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX]
-                          [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--quality-min QUALITY_MIN]
-                          [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER] [--color-min COLOR_MIN]
-                          [--color-max COLOR_MAX] [--color-power COLOR_POWER] [--duration-min DURATION_MIN]
-                          [--duration-max DURATION_MAX] [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX]
-                          [--vid-format VID_FORMAT] [--img-format IMG_FORMAT] [--fake-vid] [--scale-filter SCALE_FILTER]
-                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--default-emoji DEFAULT_EMOJI]
-                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
-                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
+                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX]
+                          [--fps-power FPS_POWER] [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN]
+                          [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER]
+                          [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER]
+                          [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER]
+                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--vid-size-max VID_SIZE_MAX]
+                          [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT] [--img-format IMG_FORMAT] [--fake-vid]
+                          [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR]
+                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD]
+                          [--signal-get-auth] [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
                           [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
                           [--kakao-username KAKAO_USERNAME] [--kakao-password KAKAO_PASSWORD]
-                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth]
-                          [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
+                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER]
+                          [--line-get-auth] [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
 
 CLI for stickers-convert
 
@@ -208,7 +208,9 @@ Compression options:
   --scale-filter SCALE_FILTER
                         Set scale filter. Default as lanczos. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
-                        - bilinear = linear interpolation
+                        -box = Similar to nearest, but better downscaling
+                        - bilinear = Linear interpolation
+                        - hamming = Similar to bilinear, but better downscaling
                         - bicubic = Cubic spline interpolation
                         - lanczos = A high-quality downsampling filter
   --quantize-method QUANTIZE_METHOD

{sticker-convert-2.7.2 → sticker-convert-2.7.4}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "sticker-convert"
 description = "Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python."
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 license = {file = "LICENSE"}
 keywords = ["telegram", "line", "tgs", "whatsapp", "kakao", "signal", "imessage", "wastickers"]
 authors = [
@@ -48,4 +48,19 @@ where = ["src"]
 
 [tool.setuptools.dynamic]
 version = {attr = "sticker_convert.__version__"}
-dependencies = {file = ["requirements.txt"]}
+dependencies = {file = ["requirements.txt"]}
+
+[tool.pyright]
+include = ["src", "scripts", "tests", "compile.py"]
+strict = ["*"]
+
+[tool.mypy]
+python_version = "3.8"
+files = ["src", "scripts", "tests", "compile.py"]
+
+[tool.isort]
+line_length = 200
+extend_skip = ["msicreator"]
+
+[tool.ruff]
+exclude = ["msicreator"]

{sticker-convert-2.7.2 → sticker-convert-2.7.4}/requirements.txt

@@ -4,12 +4,12 @@ beautifulsoup4~=4.12.3
 rookiepy~=0.3.6
 imagequant~=1.1.1
 memory-tempfile~=2.2.3
-numpy~=1.26.4
+numpy>=1.22.4
 Pillow~=10.2.0
 pyoxipng~=9.0.0
 python-telegram-bot~=20.5
 requests~=2.31.0
-rlottie_python~=1.3.2
+rlottie_python~=1.3.3
 signalstickers-client~=3.3.0
 sqlcipher3-wheels~=0.5.2.post1
 tqdm~=4.66.2

{sticker-convert-2.7.2 → sticker-convert-2.7.4}/src/sticker_convert/__init__.py

@@ -1,3 +1,4 @@
 #!/usr/bin/env python3
 """sticker-convert"""
+
 from sticker_convert.version import __version__  # noqa

{sticker-convert-2.7.2 → sticker-convert-2.7.4}/src/sticker_convert/__main__.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
-def main():
+
+
+def main() -> None:
     import multiprocessing
     import sys
 

{sticker-convert-2.7.2 → sticker-convert-2.7.4}/src/sticker_convert/cli.py

@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
 import argparse
 import signal
+import sys
 from argparse import Namespace
 from json.decoder import JSONDecodeError
 from math import ceil
 from multiprocessing import cpu_count
 from pathlib import Path
-from typing import Any
+from typing import Any, Dict
 
-from sticker_convert.definitions import CONFIG_DIR, DEFAULT_DIR, ROOT_DIR
+from sticker_convert.definitions import CONFIG_DIR, DEFAULT_DIR
 from sticker_convert.job import Job
 from sticker_convert.job_option import CompOption, CredOption, InputOption, OutputOption
 from sticker_convert.utils.auth.get_kakao_auth import GetKakaoAuth
@@ -21,27 +22,22 @@ from sticker_convert.version import __version__
 
 
 class CLI:
-    def __init__(self):
+    def __init__(self) -> None:
         self.cb = Callback()
 
-    def cli(self):
+    def cli(self) -> None:
         try:
-            self.help: dict[str, dict[str, str]] = JsonManager.load_json(
-                ROOT_DIR / "resources/help.json"
-            )
-            self.input_presets = JsonManager.load_json(
-                ROOT_DIR / "resources/input.json"
-            )
-            self.compression_presets = JsonManager.load_json(
-                ROOT_DIR / "resources/compression.json"
-            )
-            self.output_presets = JsonManager.load_json(
-                ROOT_DIR / "resources/output.json"
-            )
+            from sticker_convert.utils.files.json_resources_loader import COMPRESSION_JSON, EMOJI_JSON, HELP_JSON, INPUT_JSON, OUTPUT_JSON
         except RuntimeError as e:
-            self.cb.msg(e.__str__)
+            self.cb.msg(str(e))
             return
 
+        self.help = HELP_JSON
+        self.input_presets = INPUT_JSON
+        self.compression_presets = COMPRESSION_JSON
+        self.output_presets = OUTPUT_JSON
+        self.emoji_list = EMOJI_JSON
+
         parser = argparse.ArgumentParser(
             description="CLI for stickers-convert",
             formatter_class=argparse.RawTextHelpFormatter,
@@ -125,7 +121,7 @@ class CLI:
             "quantize_method",
         )
         flags_comp_bool = ("fake_vid",)
-        keyword_args: dict[str, Any]
+        keyword_args: Dict[str, Any]
         for k, v in self.help["comp"].items():
             if k in flags_comp_int:
                 keyword_args = {"type": int, "default": None}
@@ -186,7 +182,7 @@ class CLI:
 
         signal.signal(signal.SIGINT, job.cancel)
         status = job.start()
-        exit(status)
+        sys.exit(status)
 
     def get_opt_input(self, args: Namespace) -> InputOption:
         download_options = {
@@ -212,7 +208,7 @@ class CLI:
                 self.cb.msg(f"Detected URL input source: {download_option}")
             else:
                 self.cb.msg(f"Error: Unrecognied URL input source for url: {url}")
-                exit()
+                sys.exit()
 
         opt_input = InputOption(
             option=download_option,
@@ -296,15 +292,15 @@ class CLI:
             size_max_vid=self.compression_presets[preset]["size_max"]["vid"]
             if args.vid_size_max is None
             else args.vid_size_max,
-            format_img=tuple(
+            format_img=(
                 self.compression_presets[preset]["format"]["img"]
                 if args.img_format is None
-                else args.img_format
+                else args.img_format,
             ),
-            format_vid=tuple(
+            format_vid=(
                 self.compression_presets[preset]["format"]["vid"]
                 if args.vid_format is None
-                else args.vid_format
+                else args.vid_format,
             ),
             fps_min=self.compression_presets[preset]["fps"]["min"]
             if args.fps_min is None