sticker-convert 2.3.1__tar.gz → 2.4.0__tar.gz

{sticker-convert-2.3.1/src/sticker_convert.egg-info → sticker-convert-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.3.1
+Version: 2.4.0
 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>
@@ -368,7 +368,7 @@ Requires-Dist: apngasm_python~=1.2.2
 Requires-Dist: av~=11.0.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.3.6
-Requires-Dist: imageio~=2.33.1
+Requires-Dist: imagequant~=1.1.0
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: numpy~=1.26.3
 Requires-Dist: Pillow~=10.2.0
@@ -476,12 +476,14 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
                           [--export-signal | --export-telegram | --export-whatsapp | --export-imessage] [--no-compress]
                           [--preset {auto,signal,telegram,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}]
-                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--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] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--color-min COLOR_MIN]
-                          [--color-max COLOR_MAX] [--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] [--cache-dir CACHE_DIR]
+                          [--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] [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID]
                           [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth] [--kakao-username KAKAO_USERNAME]
@@ -538,6 +540,8 @@ Compression options:
                         Processes higher = Compress faster but consume more resources.
   --fps-min FPS_MIN     Set minimum output fps.
   --fps-max FPS_MAX     Set maximum output fps.
+  --fps-power FPS_POWER
+                        Between -1 and positive infinity. Power lower = More importance of the parameter, try harder to keep higher and not sacrifice.
   --res-min RES_MIN     Set minimum width and height
   --res-max RES_MAX     Set maximum width and height
   --res-w-min RES_W_MIN
@@ -548,14 +552,22 @@ Compression options:
                         Set minimum height.
   --res-h-max RES_H_MAX
                         Set maximum height.
+  --res-power RES_POWER
+                        Between -1 and positive infinity.
+                        Power lower = More importance of the parameter,
+                        try harder to keep higher and not sacrifice.
   --quality-min QUALITY_MIN
                         Set minimum quality.
   --quality-max QUALITY_MAX
                         Set maximum quality.
+  --quality-power QUALITY_POWER
+                        Between -1 and positive infinity. Power lower = More importance of the parameter, try harder to keep higher and not sacrifice.
   --color-min COLOR_MIN
                         Set minimum number of colors (For converting to apng and apng only).
   --color-max COLOR_MAX
                         Set maximum number of colors (For converting to apng and apng only).
+  --color-power COLOR_POWER
+                        Between -1 and positive infinity. Power lower = More importance of the parameter, try harder to keep higher and not sacrifice.
   --duration-min DURATION_MIN
                         Set minimum output duration in miliseconds.
   --duration-max DURATION_MAX
@@ -578,6 +590,11 @@ Compression options:
                         - bilinear = linear interpolation
                         - bicubic = Cubic spline interpolation
                         - lanczos = A high-quality downsampling filter
+  --quantize-method QUANTIZE_METHOD
+                        Set method for quantizing image. Default as imagequant. Valid options are:
+                        - imagequant = Best quality but slow
+                        - fastoctree = Fast but image looks chunky
+                        - none = No image quantizing, large image size as result
   --cache-dir CACHE_DIR
                         Set custom cache directory.
                         Useful for debugging, or speed up conversion if cache_dir is on RAM disk.

{sticker-convert-2.3.1 → sticker-convert-2.4.0}/README.md

@@ -92,12 +92,14 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
                           [--export-signal | --export-telegram | --export-whatsapp | --export-imessage] [--no-compress]
                           [--preset {auto,signal,telegram,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}]
-                          [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--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] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--color-min COLOR_MIN]
-                          [--color-max COLOR_MAX] [--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] [--cache-dir CACHE_DIR]
+                          [--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] [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID]
                           [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth] [--kakao-username KAKAO_USERNAME]
@@ -154,6 +156,8 @@ Compression options:
                         Processes higher = Compress faster but consume more resources.
   --fps-min FPS_MIN     Set minimum output fps.
   --fps-max FPS_MAX     Set maximum output fps.
+  --fps-power FPS_POWER
+                        Between -1 and positive infinity. Power lower = More importance of the parameter, try harder to keep higher and not sacrifice.
   --res-min RES_MIN     Set minimum width and height
   --res-max RES_MAX     Set maximum width and height
   --res-w-min RES_W_MIN
@@ -164,14 +168,22 @@ Compression options:
                         Set minimum height.
   --res-h-max RES_H_MAX
                         Set maximum height.
+  --res-power RES_POWER
+                        Between -1 and positive infinity.
+                        Power lower = More importance of the parameter,
+                        try harder to keep higher and not sacrifice.
   --quality-min QUALITY_MIN
                         Set minimum quality.
   --quality-max QUALITY_MAX
                         Set maximum quality.
+  --quality-power QUALITY_POWER
+                        Between -1 and positive infinity. Power lower = More importance of the parameter, try harder to keep higher and not sacrifice.
   --color-min COLOR_MIN
                         Set minimum number of colors (For converting to apng and apng only).
   --color-max COLOR_MAX
                         Set maximum number of colors (For converting to apng and apng only).
+  --color-power COLOR_POWER
+                        Between -1 and positive infinity. Power lower = More importance of the parameter, try harder to keep higher and not sacrifice.
   --duration-min DURATION_MIN
                         Set minimum output duration in miliseconds.
   --duration-max DURATION_MAX
@@ -194,6 +206,11 @@ Compression options:
                         - bilinear = linear interpolation
                         - bicubic = Cubic spline interpolation
                         - lanczos = A high-quality downsampling filter
+  --quantize-method QUANTIZE_METHOD
+                        Set method for quantizing image. Default as imagequant. Valid options are:
+                        - imagequant = Best quality but slow
+                        - fastoctree = Fast but image looks chunky
+                        - none = No image quantizing, large image size as result
   --cache-dir CACHE_DIR
                         Set custom cache directory.
                         Useful for debugging, or speed up conversion if cache_dir is on RAM disk.

{sticker-convert-2.3.1 → sticker-convert-2.4.0}/requirements.txt

@@ -2,7 +2,7 @@ apngasm_python~=1.2.2
 av~=11.0.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.3.6
-imageio~=2.33.1
+imagequant~=1.1.0
 memory-tempfile~=2.2.3
 numpy~=1.26.3
 Pillow~=10.2.0

{sticker-convert-2.3.1 → sticker-convert-2.4.0}/src/sticker_convert/__init__.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 '''sticker-convert'''
-__version__ = '2.3.1'
+__version__ = '2.4.0'

{sticker-convert-2.3.1 → sticker-convert-2.4.0}/src/sticker_convert/cli.py

@@ -67,11 +67,14 @@ class CLI:
                     'color_min', 'color_max',
                     'duration_min', 'duration_max',
                     'vid_size_max', 'img_size_max')
-        flags_str = ('vid_format', 'img_format', 'cache_dir', 'scale_filter')
+        flags_float = ('fps_power', 'res_power', 'quality_power', 'color_power')
+        flags_str = ('vid_format', 'img_format', 'cache_dir', 'scale_filter', 'quantize_method')
         flags_bool = ('fake_vid')
         for k, v in self.help['comp'].items():
             if k in flags_int:
                 keyword_args = {'type': int, 'default': None}
+            elif k in flags_float:
+                keyword_args = {'type': float, 'default': None}
             elif k in flags_str:
                 keyword_args = {'default': None}
             elif k in flags_bool:
@@ -202,7 +205,8 @@ class CLI:
             },
             'fps': {
                 'min': self.compression_presets[preset]['fps']['min'] if args.fps_min == None else args.fps_min,
-                'max': self.compression_presets[preset]['fps']['max'] if args.fps_max == None else args.fps_max
+                'max': self.compression_presets[preset]['fps']['max'] if args.fps_max == None else args.fps_max,
+                'power': self.compression_presets[preset]['fps']['power'] if args.fps_power == None else args.fps_power,
             },
             'res': {
                 'w': {
@@ -212,15 +216,18 @@ class CLI:
                 'h': {
                     'min': self.compression_presets[preset]['res']['h']['min'] if args.res_h_min == None else args.res_h_min,
                     'max': self.compression_presets[preset]['res']['h']['max'] if args.res_h_max == None else args.res_h_max
-                }
+                },
+                'power': self.compression_presets[preset]['res']['power'] if args.res_power == None else args.res_power,
             },
             'quality': {
                 'min': self.compression_presets[preset]['quality']['min'] if args.quality_min == None else args.quality_min,
-                'max': self.compression_presets[preset]['quality']['max'] if args.quality_max == None else args.quality_max
+                'max': self.compression_presets[preset]['quality']['max'] if args.quality_max == None else args.quality_max,
+                'power': self.compression_presets[preset]['quality']['power'] if args.quality_power == None else args.quality_power,
             },
             'color': {
                 'min': self.compression_presets[preset]['color']['min'] if args.color_min == None else args.color_min,
-                'max': self.compression_presets[preset]['color']['max'] if args.color_max == None else args.color_max
+                'max': self.compression_presets[preset]['color']['max'] if args.color_max == None else args.color_max,
+                'power': self.compression_presets[preset]['color']['power'] if args.color_power == None else args.color_power,
             },
             'duration': {
                 'min': self.compression_presets[preset]['duration']['min'] if args.duration_min == None else args.duration_min,
@@ -229,8 +236,9 @@ class CLI:
             'steps': self.compression_presets[preset]['steps'] if args.steps == None else args.steps,
             'fake_vid': self.compression_presets[preset]['fake_vid'] if args.fake_vid == None else args.fake_vid,
             'cache_dir': args.cache_dir,
-            'scale_filter': args.scale_filter,
-            'default_emoji': args.default_emoji,
+            'scale_filter': self.compression_presets[preset]['scale_filter'] if args.scale_filter == None else args.scale_filter,
+            'quantize_method': self.compression_presets[preset]['quantize_method'] if args.quantize_method == None else args.quantize_method,
+            'default_emoji': self.compression_presets[preset]['default_emoji'] if args.default_emoji == None else args.default_emoji,
             'no_compress': args.no_compress,
             'processes': args.processes if args.processes else math.ceil(cpu_count() / 2)
         }