sticker-convert 2.7.10__py3-none-any.whl → 2.7.12__py3-none-any.whl

sticker_convert/cli.py

@@ -9,6 +9,8 @@ from multiprocessing import cpu_count
 from pathlib import Path
 from typing import Any, Dict
 
+from mergedeep import merge  # type: ignore
+
 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
@@ -50,6 +52,12 @@ class CLI:
             action="store_true",
             help=self.help["global"]["no_confirm"],
         )
+        parser.add_argument(
+            "--custom-presets",
+            dest="custom_presets",
+            default=None,
+            help=self.help["global"]["custom_presets"],
+        )
 
         parser_input = parser.add_argument_group("Input options")
         for k, v_str in self.help["input"].items():
@@ -162,6 +170,16 @@ class CLI:
 
         args = parser.parse_args()
 
+        if args.custom_presets:
+            try:
+                custom_presets = JsonManager.load_json(Path(args.custom_presets))
+                self.compression_presets: Dict[Any, Any] = merge(  # type: ignore
+                    self.compression_presets,  # type: ignore
+                    custom_presets,
+                )
+            except RuntimeError:
+                print(f"Error: Cannot load custom presets from {args.custom_presets}")
+
         self.cb.no_confirm = args.no_confirm
 
         self.opt_input = self.get_opt_input(args)

sticker_convert/converter.py

@@ -714,20 +714,24 @@ class StickerConvert:
         else:
             extra_kwargs["optimize"] = True
 
-        # Only enable transparency if all pixels have alpha channel
-        # with value of 0 or 255
-        alpha_channel_values = np.unique(np.array(self.frames_raw)[:, :, :, 3])
-        illegals = np.setxor1d(
-            alpha_channel_values, [0, 255]
-        )  # Find all values not 0 or 255
-        if illegals.size == 0:
+        # GIF can only have one alpha color
+        # Change lowest alpha to alpha=0
+        # Only keep alpha=0 and alpha=255, nothing in between
+        frames_processed = np.array(self.frames_processed)
+        alpha = frames_processed[:, :, :, 3]
+        alpha_min = np.min(alpha)  # type: ignore
+        if alpha_min < 255:
+            alpha[alpha > alpha_min] = 255
+            alpha[alpha == alpha_min] = 0
+
+        if 0 in alpha:
             extra_kwargs["transparency"] = 0
             extra_kwargs["disposal"] = 2
-            im_out = [self.quantize(Image.fromarray(i)) for i in self.frames_processed]
+            im_out = [self.quantize(Image.fromarray(i)) for i in frames_processed]
         else:
             im_out = [
                 self.quantize(Image.fromarray(i).convert("RGB")).convert("RGB")
-                for i in self.frames_processed
+                for i in frames_processed
             ]
 
         if self.fps:

sticker_convert/resources/help.json

@@ -1,6 +1,7 @@
 {
     "global": {
-        "no_confirm": "Do not ask any questions."
+        "no_confirm": "Do not ask any questions.",
+        "custom_presets": "Specify a json file containing custom compression presets.\nSee compression.json for format.\nNote that if present, 'custom_preset.json' from config directory would be auto loaded."
     },
     "input": {
         "input_dir": "Specify input directory."
@@ -46,7 +47,7 @@
         "vid_format": "Set file format if input is animated.",
         "img_format": "Set file format if input is static.",
         "fake_vid": "Convert (faking) image to video.\nUseful if:\n(1) Size limit for video is larger than image;\n(2) Mix image and video into same pack.",
-        "scale_filter": "Set scale filter. Default as bicubic. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n-box = Similar to nearest, but better downscaling\n- bilinear = Linear interpolation\n- hamming = Similar to bilinear, but better downscaling\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
+        "scale_filter": "Set scale filter. Default as bicubic. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n- box = Similar to nearest, but better downscaling\n- bilinear = Linear interpolation\n- hamming = Similar to bilinear, but better downscaling\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
         "quantize_method": "Set method for quantizing image. Default as imagequant. Valid options are:\n- imagequant = Best quality but slow\n- fastoctree = Fast but image looks chunky\n- none = No image quantizing, large image size as result",
         "cache_dir": "Set custom cache directory.\nUseful for debugging, or speed up conversion if cache_dir is on RAM disk.",
         "default_emoji": "Set the default emoji for uploading Signal and Telegram sticker packs."

sticker_convert/utils/auth/get_line_auth.py

@@ -22,6 +22,12 @@ class GetLineAuth:
             rookiepy.vivaldi,  # type: ignore
         ]
 
+        # 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(
                 [

sticker_convert/utils/files/json_resources_loader.py

@@ -1,12 +1,27 @@
-from typing import Dict
+from typing import Any, Dict
 
-from sticker_convert.definitions import ROOT_DIR
+from mergedeep import merge  # type: ignore
+
+from sticker_convert.definitions import CONFIG_DIR, ROOT_DIR
 from sticker_convert.utils.files.json_manager import JsonManager
 
+
+def _load_compression() -> Dict[Any, Any]:
+    compression_json = JsonManager.load_json(ROOT_DIR / "resources/compression.json")
+    custom_preset_json_path = CONFIG_DIR / "custom_preset.json"
+    if custom_preset_json_path.exists():
+        custom_preset_json = JsonManager.load_json(custom_preset_json_path)
+        compression_json: Dict[Any, Any] = merge(  # type: ignore
+            compression_json,  # type: ignore
+            custom_preset_json,
+        )
+    return compression_json
+
+
 HELP_JSON: Dict[str, Dict[str, str]] = JsonManager.load_json(
     ROOT_DIR / "resources/help.json"
 )
 INPUT_JSON = JsonManager.load_json(ROOT_DIR / "resources/input.json")
-COMPRESSION_JSON = JsonManager.load_json(ROOT_DIR / "resources/compression.json")
+COMPRESSION_JSON = _load_compression()
 OUTPUT_JSON = JsonManager.load_json(ROOT_DIR / "resources/output.json")
 EMOJI_JSON = JsonManager.load_json(ROOT_DIR / "resources/emoji.json")

sticker_convert/version.py

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

{sticker_convert-2.7.10.dist-info → sticker_convert-2.7.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.10
+Version: 2.7.12
 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>
@@ -475,7 +475,7 @@ Requires-Dist: webp ~=0.3.0
 To run in CLI mode, pass on any arguments
 
 ```
-usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR]
+usage: sticker-convert.py [-h] [--version] [--no-confirm] [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
                           [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
                           [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage]
@@ -483,7 +483,7 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--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]        
+                          [--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] [--bg-color BG_COLOR]
@@ -494,15 +494,19 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--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]  
+                          [--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
 
-options:
+optional arguments:
   -h, --help            show this help message and exit
   --version             show program's version number and exit
   --no-confirm          Do not ask any questions.
+  --custom-presets CUSTOM_PRESETS
+                        Specify a json file containing custom compression presets.
+                        See compression.json for format.
+                        Note that if present, 'custom_preset.json' from config directory would be auto loaded.
 
 Input options:
   --input-dir INPUT_DIR
@@ -540,7 +544,7 @@ Output options:
 
 Compression options:
   --no-compress         Do not compress files. Useful for only downloading stickers.
-  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}        
+  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}
                         Apply preset for compression.
   --steps STEPS         Set number of divisions between min and max settings.
                         Steps higher = Slower but yields file more closer to the specified file size limit.
@@ -600,7 +604,7 @@ Compression options:
   --scale-filter SCALE_FILTER
                         Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
-                        -box = Similar to nearest, but better downscaling
+                        - box = Similar to nearest, but better downscaling
                         - bilinear = Linear interpolation
                         - hamming = Similar to bilinear, but better downscaling
                         - bicubic = Cubic spline interpolation
@@ -628,10 +632,10 @@ Credentials options:
   --telegram-token TELEGRAM_TOKEN
                         Set Telegram token. Required for uploading and downloading Telegram stickers.
   --telegram-userid TELEGRAM_USERID
-                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.     
+                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.
   --kakao-auth-token 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. Kakao username, password, country code and phone number are also required.    
+                        Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx
+  --kakao-get-auth      Generate Kakao auth_token. Kakao username, password, country code and phone number are also required.
   --kakao-username KAKAO_USERNAME
                         Set Kakao username, which is email or phone number used for signing up Kakao account
                         Example: +447700900142

{sticker_convert-2.7.10.dist-info → sticker_convert-2.7.12.dist-info}/RECORD

@@ -1,12 +1,12 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=6RJauR-SCSSTT3TU7FFB6B6PVwsCxO2xZXtmZ3jc2Is,463
-sticker_convert/cli.py,sha256=Ex5Nculo1cbkfhLPibnYR6-SM431ODGPb324Bos0z6k,17702
-sticker_convert/converter.py,sha256=RjsKMhxq10SJKd9dRpin_wqp07OUj4EXQCV6-ASCIPU,32805
+sticker_convert/cli.py,sha256=kyfhvMoHq42uLZsYYLrr6b30xsNE93GVZlbGYPFjC2I,18385
+sticker_convert/converter.py,sha256=-BxUT-VCw-VbfbG7ZZxNTI4FIJcU3Pq2rzw0VuitiVI,32904
 sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjtE,2073
 sticker_convert/gui.py,sha256=TqdgFbHBRYgcXWWrsfxLUJ8Zu9WeE11vYyZMX6nalik,30599
 sticker_convert/job.py,sha256=J4e7dZ48t5EhM3fG-xF1BEQ10WYljx3wWamKXAJjCa8,26000
 sticker_convert/job_option.py,sha256=1YVhyTfu2cWz3qpAKbdIM11jbL0CJz0ksOYAeg8v6dc,7649
-sticker_convert/version.py,sha256=eWoky_Xc6Fg1odZm_L5C8BA63Wxj-o-_bVEz5-u16VQ,47
+sticker_convert/version.py,sha256=itLv7GvtbPZ961xSemMjepArEGEJR3yg6PpGH0MuovQ,47
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_base.py,sha256=5R7c8kwahAflOOYrtSQPnBVQ4T-DsprPUMP7G9wcJX4,2824
 sticker_convert/downloaders/download_kakao.py,sha256=RYrebTxEjKjXAr9xw18r0dMW0dFjSqZxzi8dpaq56TY,8581
@@ -68,7 +68,7 @@ sticker_convert/resources/appicon.ico,sha256=-ldugcl2Yq2pBRTktnhGKWInpKyWzRjCiPv
 sticker_convert/resources/appicon.png,sha256=6XBEQz7PnerqS43aRkwpWolFG4WvKMuQ-st1ly-_JPg,5265
 sticker_convert/resources/compression.json,sha256=vwn6wLsfsPnNnpjhJHRvzozBI4F_kkb9-eBR8IlyYLo,10833
 sticker_convert/resources/emoji.json,sha256=sXSuKusyG1L2Stuf9BL5ZqfzOIOdeAeE3RXcrXAsLdY,413367
-sticker_convert/resources/help.json,sha256=dYLh751rhhriSwc2p_xKVdWPCgUZTPyNJ1QFZdUjA2M,6259
+sticker_convert/resources/help.json,sha256=TUZi_70uVmgImApBUtKieDGEMtu8syVjE0ah8sKEcbk,6470
 sticker_convert/resources/input.json,sha256=sRz8qWaLh2KTjjlPIxz2UfynVn2Bn0olywbb8-qT_Hc,2251
 sticker_convert/resources/output.json,sha256=QYP2gqDvEaAm5I9bH4NReaB1XMLboevv69u-V8YdZUs,1373
 sticker_convert/uploaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -80,11 +80,11 @@ sticker_convert/uploaders/xcode_imessage.py,sha256=mwnUTNclq4SFGX8JgFoM-bsvAtsYt
 sticker_convert/utils/callback.py,sha256=JnwrgaSNdl-74Nd-fz6EH-r6ePLLb-4a5C1P0OAPjNQ,5279
 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=WzO5aGL1-_KHTcBA6ymOZLD3vLp35MUj0pG7w08K5Wo,2436
+sticker_convert/utils/auth/get_line_auth.py,sha256=CAg5oAyqnzyAr1sP0iaecJPpmreeERiZnVxIX9X_Ib0,2682
 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
-sticker_convert/utils/files/json_resources_loader.py,sha256=H3uMn-77wtALwiGAPhA31OIohcZtWvvzXO7rFmM8EMg,535
+sticker_convert/utils/files/json_resources_loader.py,sha256=flZFixUXRTrOAhvRQpuSQgmJ69yXL94sxukcowLT1JQ,1049
 sticker_convert/utils/files/metadata_handler.py,sha256=TJpQ-7KdnqQh09hwR6xB_scRLhbJ6D3zgORy3dkf858,9933
 sticker_convert/utils/files/run_bin.py,sha256=QalA9je6liHxiOtxsjsFsIkc2t59quhcJCVpP1X3p50,1743
 sticker_convert/utils/files/sanitize_filename.py,sha256=HBklPGsHRJjFQUIC5rYTQsUrsuTtezZXIEA8CPhLP8A,2156
@@ -92,9 +92,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=JHHlfCLSpepYFv6TSL1XqwUJoVOpOPFxurRtduplPGY,12856
 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.7.10.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.7.10.dist-info/METADATA,sha256=2TNBaAF4qvthg7_9hijcjjFX2yKe1Vth2aoH3c_nFiM,48837
-sticker_convert-2.7.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sticker_convert-2.7.10.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.7.10.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.7.10.dist-info/RECORD,,
+sticker_convert-2.7.12.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.7.12.dist-info/METADATA,sha256=tJ1IQvfsDyRiDDQSkHech1YhfhlB9U9HPeUEk5a15eY,49133
+sticker_convert-2.7.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sticker_convert-2.7.12.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.7.12.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.7.12.dist-info/RECORD,,