sticker-convert 2.13.2.1__tar.gz → 2.13.3.0__tar.gz

{sticker_convert-2.13.2.1/src/sticker_convert.egg-info → sticker_convert-2.13.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.2.1
+Version: 2.13.3.0
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, Discord, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -364,22 +364,22 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.2.1
-Requires-Dist: anyio~=4.9.0
+Requires-Dist: anyio~=4.10.0
 Requires-Dist: apngasm_python~=1.3.2
 Requires-Dist: av>=13.1.0
 Requires-Dist: beautifulsoup4~=4.13.4
-Requires-Dist: cryptg~=0.5.0.post0
+Requires-Dist: cryptg~=0.5.1
 Requires-Dist: rookiepy~=0.5.6
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.4
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
-Requires-Dist: Pillow~=11.2.1
+Requires-Dist: Pillow~=11.3.0
 Requires-Dist: pyoxipng~=9.1.0
-Requires-Dist: python-telegram-bot~=22.1
+Requires-Dist: python-telegram-bot~=22.3
 Requires-Dist: psutil~=7.0.0
-Requires-Dist: PyMemoryEditor~=1.5.22
+Requires-Dist: PyMemoryEditor~=1.5.24
 Requires-Dist: requests~=2.32.4
 Requires-Dist: rlottie_python~=1.3.7
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
@@ -497,27 +497,37 @@ Dynamic: license-file
 To run in CLI mode, pass on any arguments
 
 ```
-usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress] [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
+usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress]
+                          [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
                           [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-telegram-telethon DOWNLOAD_TELEGRAM_TELETHON | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-band DOWNLOAD_BAND | --download-ogq DOWNLOAD_OGQ | --download-viber DOWNLOAD_VIBER | --download-discord DOWNLOAD_DISCORD | --download-discord-emoji DOWNLOAD_DISCORD_EMOJI]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
                           [--export-signal | --export-telegram | --export-telegram-emoji | --export-telegram-telethon | --export-telegram-emoji-telethon | --export-viber | --export-whatsapp | --export-imessage]
                           [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,band,ogq,viber,discord,discord_emoji,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] [--padding-percent PADDING_PERCENT]
-                          [--bg-color BG_COLOR] [--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] [--chromium-path CHROMIUM_PATH] [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
-                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--telethon-setup] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
-                          [--kakao-get-auth-desktop] [--kakao-bin-path KAKAO_BIN_PATH] [--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] [--viber-auth VIBER_AUTH]
-                          [--viber-get-auth VIBER_GET_AUTH] [--viber-bin-path VIBER_BIN_PATH] [--discord-get-auth]
-                          [--discord-token DISCORD_TOKEN] [--save-cred]
+                          [--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-snap-pow2]
+                          [--no-res-snap-pow2] [--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] [--padding-percent PADDING_PERCENT]
+                          [--bg-color BG_COLOR] [--vid-size-max VID_SIZE_MAX]
+                          [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
+                          [--img-format IMG_FORMAT] [--fake-vid] [--no-fake-vid]
+                          [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD]
+                          [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH]
+                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
+                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
+                          [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID]
+                          [--telethon-setup] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
+                          [--kakao-get-auth-desktop] [--kakao-bin-path KAKAO_BIN_PATH]
+                          [--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] [--viber-auth VIBER_AUTH]
+                          [--viber-get-auth VIBER_GET_AUTH] [--viber-bin-path VIBER_BIN_PATH]
+                          [--discord-get-auth] [--discord-token DISCORD_TOKEN] [--save-cred]
 
 CLI for stickers-convert
 
@@ -619,6 +629,9 @@ Compression options:
                         Between -1 and positive infinity.
                         Power lower = More importance of the parameter,
                         try harder to keep higher and not sacrifice.
+  --res-snap-pow2       Snap resolution to nearest power of 2 (1,2,4,8,16,...).
+                        Ignored if no power of 2 present between minimum and maximum resolutions
+  --no-res-snap-pow2    Disable res_snap_pow2
   --quality-min QUALITY_MIN
                         Set minimum quality.
   --quality-max QUALITY_MAX
@@ -653,6 +666,7 @@ Compression options:
                         Useful if:
                         (1) Size limit for video is larger than image;
                         (2) Mix image and video into same pack.
+  --no-fake-vid         Disable fake_vid
   --scale-filter SCALE_FILTER
                         Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
@@ -663,9 +677,12 @@ Compression options:
                         - 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
+                        - imagequant = Speed+ Compression+ Quality++++ RGBA Supported
+                        - fastoctree = Speed++, Compression++++ Quality+ RGBA Supported
+                        - maxcoverage = Speed+++, Compression+++ Quality++ RGBA unsupported
+                        - mediancut = Speed++++ Compression++ Quality+++ RGBA unsupported
                         - none = No image quantizing, large image size as result
+                        Lower quality would make image chunky
   --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.13.2.1 → sticker_convert-2.13.3.0}/README.md

@@ -105,27 +105,37 @@
 To run in CLI mode, pass on any arguments
 
 ```
-usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress] [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
+usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress]
+                          [--custom-presets CUSTOM_PRESETS] [--input-dir INPUT_DIR]
                           [--download-auto DOWNLOAD_AUTO | --download-signal DOWNLOAD_SIGNAL | --download-telegram DOWNLOAD_TELEGRAM | --download-telegram-telethon DOWNLOAD_TELEGRAM_TELETHON | --download-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-band DOWNLOAD_BAND | --download-ogq DOWNLOAD_OGQ | --download-viber DOWNLOAD_VIBER | --download-discord DOWNLOAD_DISCORD | --download-discord-emoji DOWNLOAD_DISCORD_EMOJI]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
                           [--export-signal | --export-telegram | --export-telegram-emoji | --export-telegram-telethon | --export-telegram-emoji-telethon | --export-viber | --export-whatsapp | --export-imessage]
                           [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,band,ogq,viber,discord,discord_emoji,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] [--padding-percent PADDING_PERCENT]
-                          [--bg-color BG_COLOR] [--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] [--chromium-path CHROMIUM_PATH] [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
-                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--telethon-setup] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
-                          [--kakao-get-auth-desktop] [--kakao-bin-path KAKAO_BIN_PATH] [--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] [--viber-auth VIBER_AUTH]
-                          [--viber-get-auth VIBER_GET_AUTH] [--viber-bin-path VIBER_BIN_PATH] [--discord-get-auth]
-                          [--discord-token DISCORD_TOKEN] [--save-cred]
+                          [--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-snap-pow2]
+                          [--no-res-snap-pow2] [--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] [--padding-percent PADDING_PERCENT]
+                          [--bg-color BG_COLOR] [--vid-size-max VID_SIZE_MAX]
+                          [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
+                          [--img-format IMG_FORMAT] [--fake-vid] [--no-fake-vid]
+                          [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD]
+                          [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH]
+                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
+                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
+                          [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID]
+                          [--telethon-setup] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
+                          [--kakao-get-auth-desktop] [--kakao-bin-path KAKAO_BIN_PATH]
+                          [--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] [--viber-auth VIBER_AUTH]
+                          [--viber-get-auth VIBER_GET_AUTH] [--viber-bin-path VIBER_BIN_PATH]
+                          [--discord-get-auth] [--discord-token DISCORD_TOKEN] [--save-cred]
 
 CLI for stickers-convert
 
@@ -227,6 +237,9 @@ Compression options:
                         Between -1 and positive infinity.
                         Power lower = More importance of the parameter,
                         try harder to keep higher and not sacrifice.
+  --res-snap-pow2       Snap resolution to nearest power of 2 (1,2,4,8,16,...).
+                        Ignored if no power of 2 present between minimum and maximum resolutions
+  --no-res-snap-pow2    Disable res_snap_pow2
   --quality-min QUALITY_MIN
                         Set minimum quality.
   --quality-max QUALITY_MAX
@@ -261,6 +274,7 @@ Compression options:
                         Useful if:
                         (1) Size limit for video is larger than image;
                         (2) Mix image and video into same pack.
+  --no-fake-vid         Disable fake_vid
   --scale-filter SCALE_FILTER
                         Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
@@ -271,9 +285,12 @@ Compression options:
                         - 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
+                        - imagequant = Speed+ Compression+ Quality++++ RGBA Supported
+                        - fastoctree = Speed++, Compression++++ Quality+ RGBA Supported
+                        - maxcoverage = Speed+++, Compression+++ Quality++ RGBA unsupported
+                        - mediancut = Speed++++ Compression++ Quality+++ RGBA unsupported
                         - none = No image quantizing, large image size as result
+                        Lower quality would make image chunky
   --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.13.2.1 → sticker_convert-2.13.3.0}/requirements.txt

@@ -1,20 +1,20 @@
 aiolimiter~=1.2.1
-anyio~=4.9.0
+anyio~=4.10.0
 apngasm_python~=1.3.2
 av>=13.1.0
 beautifulsoup4~=4.13.4
-cryptg~=0.5.0.post0
+cryptg~=0.5.1
 rookiepy~=0.5.6
 httpx~=0.28.1
 imagequant~=1.1.4
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
-Pillow~=11.2.1
+Pillow~=11.3.0
 pyoxipng~=9.1.0
-python-telegram-bot~=22.1
+python-telegram-bot~=22.3
 psutil~=7.0.0
-PyMemoryEditor~=1.5.22
+PyMemoryEditor~=1.5.24
 requests~=2.32.4
 rlottie_python~=1.3.7
 signalstickers-client-fork-laggykiller~=3.3.0.post2

{sticker_convert-2.13.2.1 → sticker_convert-2.13.3.0}/src/sticker_convert/cli.py

@@ -141,7 +141,12 @@ class CLI:
             "quantize_method",
             "chromium_path",
         )
-        flags_comp_bool = ("fake_vid",)
+        flags_comp_bool = (
+            "fake_vid",
+            "no_fake_vid",
+            "res_snap_pow2",
+            "no_res_snap_pow2",
+        )
         keyword_args: Dict[str, Any]
         for k, v in self.help["comp"].items():
             if k in flags_comp_int:
@@ -394,6 +399,9 @@ class CLI:
             res_power=self.compression_presets[preset]["res"]["power"]
             if args.res_power is None
             else args.res_power,
+            res_snap_pow2=self.compression_presets[preset]["res"]["snap_pow2"]
+            if args.res_snap_pow2 is None and args.no_res_snap_pow2 is None
+            else args.res_snap_pow2,
             quality_min=self.compression_presets[preset]["quality"]["min"]
             if args.quality_min is None
             else args.quality_min,
@@ -428,7 +436,7 @@ class CLI:
             if args.steps is None
             else args.steps,
             fake_vid=self.compression_presets[preset]["fake_vid"]
-            if args.fake_vid is None
+            if args.fake_vid is None and args.no_fake_vid is None
             else args.fake_vid,
             chromium_path=args.chromium_path,
             cache_dir=args.cache_dir,

{sticker_convert-2.13.2.1 → sticker_convert-2.13.3.0}/src/sticker_convert/converter.py

@@ -3,7 +3,7 @@ import json
 import os
 from fractions import Fraction
 from io import BytesIO
-from math import ceil, floor
+from math import ceil, floor, log2
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
@@ -57,6 +57,7 @@ def get_step_value(
     steps: int,
     power: float = 1.0,
     even: bool = False,
+    snap_pow2: bool = False,
 ) -> Optional[int]:
     # Power should be between -1 and positive infinity
     # Smaller power = More 'importance' of the parameter
@@ -70,6 +71,15 @@ def get_step_value(
 
     if max_step is not None and min_step is not None:
         v = round((max_step - min_step) * step / steps * factor + min_step)
+        if snap_pow2 is True and floor(log2(max_step)) >= ceil(log2(min_step)):
+            lower_exp = max(floor(log2(v)), ceil(log2(min_step)))
+            lower_pow2 = 2**lower_exp
+            upper_exp = min(ceil(log2(v)), floor(log2(max_step)))
+            upper_pow2 = 2**upper_exp
+            if abs(v - lower_pow2) <= abs(v - upper_pow2):
+                return lower_pow2
+            else:
+                return upper_pow2
         if even is True and v % 2 == 1:
             return v + 1
         return v
@@ -342,6 +352,7 @@ class StickerConvert:
                         self.opt_comp.steps,
                         self.opt_comp.res_power,
                         need_even,
+                        self.opt_comp.res_snap_pow2,
                     ),
                     get_step_value(
                         self.opt_comp.res_h_max,
@@ -350,6 +361,7 @@ class StickerConvert:
                         self.opt_comp.steps,
                         self.opt_comp.res_power,
                         need_even,
+                        self.opt_comp.res_snap_pow2,
                     ),
                     get_step_value(
                         self.opt_comp.quality_max,
@@ -597,12 +609,12 @@ class StickerConvert:
                     else:
                         frame_resized = frame
 
-                    # yuva420p may cause crash for pyav < 14
+                    # yuva420p may cause crash
                     # Not safe to directly call frame.to_ndarray(format="rgba")
                     # https://github.com/PyAV-Org/PyAV/discussions/1510
-                    if int(av.__version__.split(".")[0]) >= 14:
-                        rgba_array = frame_resized.to_ndarray(format="rgba")
-                    elif frame_resized.format.name == "yuv420p":
+                    # if int(av.__version__.split(".")[0]) >= 14:
+                    #     rgba_array = frame_resized.to_ndarray(format="rgba")
+                    if frame_resized.format.name == "yuv420p":
                         rgb_array = frame_resized.to_ndarray(format="rgb24")
                         rgba_array = np.dstack(
                             (
@@ -932,13 +944,19 @@ class StickerConvert:
             self.tmp_f.write(frame_optimized)
 
     def _frames_export_apng(self) -> None:
-        from apngasm_python._apngasm_python import APNGAsm, create_frame_from_rgba  # type: ignore
+        from apngasm_python._apngasm_python import APNGAsm, create_frame_from_rgb, create_frame_from_rgba  # type: ignore
 
         assert self.fps
         assert self.res_h
 
         frames_concat = np.concatenate(self.frames_processed)
         with Image.fromarray(frames_concat, "RGBA") as image_concat:  # type: ignore
+            if image_concat.getextrema()[3][0] < 255:  # type: ignore
+                mode = "RGBA"
+                create_frame_method = create_frame_from_rgba
+            else:
+                mode = "RGB"
+                create_frame_method = create_frame_from_rgb
             image_quant = self.quantize(image_concat)
 
         if self.apngasm is None:
@@ -947,15 +965,10 @@ class StickerConvert:
 
         delay_num = int(1000 / self.fps)
         for i in range(0, image_quant.height, self.res_h):
-            with BytesIO() as f:
-                crop_dimension = (0, i, image_quant.width, i + self.res_h)
-                image_cropped = image_quant.crop(crop_dimension)
-                image_cropped.save(f, format="png")
-                f.seek(0)
-                frame_optimized = self.optimize_png(f.read())
-            with Image.open(BytesIO(frame_optimized)) as im:
-                image_final = im.convert("RGBA")
-            frame_final = create_frame_from_rgba(
+            crop_dimension = (0, i, image_quant.width, i + self.res_h)
+            image_cropped = image_quant.crop(crop_dimension)
+            image_final = image_cropped.convert(mode)
+            frame_final = create_frame_method(
                 np.array(image_final),
                 width=image_final.width,
                 height=image_final.height,
@@ -969,7 +982,8 @@ class StickerConvert:
             self.apngasm.assemble(tmp_apng.as_posix())
 
             with open(tmp_apng, "rb") as f:
-                self.tmp_f.write(f.read())
+                apng_optimized = self.optimize_png(f.read())
+                self.tmp_f.write(apng_optimized)
 
         self.apngasm.reset()
 
@@ -978,7 +992,7 @@ class StickerConvert:
 
         return oxipng.optimize_from_memory(
             image_bytes,
-            level=4,
+            level=6,
             fix_errors=True,
             filter=[oxipng.RowFilter.Brute],
             optimize_alpha=True,
@@ -990,8 +1004,8 @@ class StickerConvert:
             return image.copy()
         if self.opt_comp.quantize_method == "imagequant":
             return self._quantize_by_imagequant(image)
-        if self.opt_comp.quantize_method == "fastoctree":
-            return self._quantize_by_fastoctree(image)
+        if self.opt_comp.quantize_method in ("mediancut", "maxcoverage", "fastoctree"):
+            return self._quantize_by_pillow(image)
 
         return image
 
@@ -1022,10 +1036,24 @@ class StickerConvert:
 
         return image
 
-    def _quantize_by_fastoctree(self, image: Image.Image) -> Image.Image:
+    def _quantize_by_pillow(self, image: Image.Image) -> Image.Image:
         assert self.color
 
-        return image.quantize(colors=self.color, method=2)
+        if image.mode == "RGBA" and self.opt_comp.quantize_method in (
+            "mediancut",
+            "maxcoverage",
+        ):
+            self.cb.put(
+                f"[W] {self.opt_comp.quantize_method} does not support RGBA, defaulted to fastoctree quantization"
+            )
+            method = Image.Quantize.FASTOCTREE
+        elif self.opt_comp.quantize_method == "mediancut":
+            method = Image.Quantize.MEDIANCUT
+        elif self.opt_comp.quantize_method == "maxcoverage":
+            method = Image.Quantize.MAXCOVERAGE
+        else:
+            method = Image.Quantize.FASTOCTREE
+        return image.quantize(colors=self.color, method=method)
 
     def fix_fps(self, fps: float) -> Fraction:
         # After rounding fps/duration during export,

{sticker_convert-2.13.2.1 → sticker_convert-2.13.3.0}/src/sticker_convert/downloaders/download_line.py

@@ -252,7 +252,7 @@ class DownloadLine(DownloadBase):
             )
 
             for num, sticker in enumerate(self.pack_files):
-                if self.resource_type == "ANIMATION":
+                if self.has_animation is True:
                     f_path = str(sticker) + "_animation.png"
                 else:
                     f_path = str(sticker) + ".png"
@@ -273,13 +273,13 @@ class DownloadLine(DownloadBase):
             )
 
             for num, sticker in enumerate(self.pack_files):
-                if self.resource_type in ("ANIMATION", "ANIMATION_SOUND"):
-                    f_path = "animation@2x/" + str(sticker["id"]) + "@2x.png"
-                elif self.resource_type == "POPUP":
+                if self.resource_type == "POPUP":
                     if sticker.get("popup", {}).get("layer") == "BACKGROUND":
                         f_path = str(sticker["id"]) + "@2x.png"
                         self.decompress(zf, f_path, num, "preview-")
                     f_path = "popup/" + str(sticker["id"]) + ".png"
+                elif self.has_animation is True:
+                    f_path = "animation@2x/" + str(sticker["id"]) + "@2x.png"
                 else:
                     f_path = str(sticker["id"]) + "@2x.png"
                 self.decompress(zf, f_path, num)

{sticker_convert-2.13.2.1 → sticker_convert-2.13.3.0}/src/sticker_convert/gui.py

@@ -116,6 +116,7 @@ class GUI(Window):
         self.res_h_max_var = IntVar(self)
         self.res_h_disable_var = BooleanVar()
         self.res_power_var = DoubleVar()
+        self.res_snap_pow2_var = BooleanVar()
         self.quality_min_var = IntVar(self)
         self.quality_max_var = IntVar(self)
         self.quality_disable_var = BooleanVar()
@@ -547,6 +548,7 @@ class GUI(Window):
             if not self.res_h_disable_var.get()
             else None,
             res_power=self.res_power_var.get(),
+            res_snap_pow2=self.res_snap_pow2_var.get(),
             quality_min=self.quality_min_var.get()
             if not self.quality_disable_var.get()
             else None,

{sticker_convert-2.13.2.1 → sticker_convert-2.13.3.0}/src/sticker_convert/gui_components/frames/comp_frame.py

@@ -119,6 +119,7 @@ class CompFrame(LabelFrame):
         self.gui.res_h_min_var.set(preset.get("res", {}).get("h", {}).get("min"))
         self.gui.res_h_max_var.set(preset.get("res", {}).get("h", {}).get("max"))
         self.gui.res_power_var.set(preset.get("res", {}).get("power"))
+        self.gui.res_snap_pow2_var.set(preset.get("res", {}).get("snap_pow2"))
         self.gui.quality_min_var.set(preset.get("quality", {}).get("min"))
         self.gui.quality_max_var.set(preset.get("quality", {}).get("max"))
         self.gui.quality_power_var.set(preset.get("quality", {}).get("power"))

{sticker_convert-2.13.2.1 → sticker_convert-2.13.3.0}/src/sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -15,7 +15,6 @@ from sticker_convert.gui_components.windows.base_window import BaseWindow
 
 
 class AdvancedCompressionWindow(BaseWindow):
-    emoji_column_per_row = 8
     emoji_visible_rows = 5
     emoji_btns: List[Tuple[Button, ImageTk.PhotoImage]] = []
 
@@ -101,6 +100,20 @@ class AdvancedCompressionWindow(BaseWindow):
             bootstyle="danger-round-toggle",  # type: ignore
         )
 
+        self.res_snap_pow2_help_btn = self.add_help_btn(
+            self.gui.help["comp"]["res_snap_pow2"]
+        )
+        self.res_snap_pow2_lbl = Label(
+            self.frame_advcomp, text="Snap resolution to power of 2"
+        )
+        self.res_snap_pow2_cbox = Checkbutton(
+            self.frame_advcomp,
+            variable=self.gui.res_snap_pow2_var,
+            onvalue=True,
+            offvalue=False,
+            bootstyle="success-round-toggle",  # type: ignore
+        )
+
         self.quality_help_btn = self.add_help_btn(self.gui.help["comp"]["quality"])
         self.quality_lbl = Label(self.frame_advcomp, text="Output quality (0-100)")
         self.quality_min_lbl = Label(self.frame_advcomp, text="Min:")
@@ -289,6 +302,8 @@ class AdvancedCompressionWindow(BaseWindow):
             self.gui.quantize_method_var.get(),
             "imagequant",
             "fastoctree",
+            "maxcoverage",
+            "mediancut",
             "none",
             bootstyle="secondary",  # type: ignore
         )
@@ -326,7 +341,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.fps_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.fps_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
         self.fps_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
-        self.fps_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.fps_disable_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.res_w_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.res_w_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -334,7 +349,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.res_w_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.res_w_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
         self.res_w_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
-        self.res_w_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.res_w_disable_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.res_h_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.res_h_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -342,7 +357,11 @@ class AdvancedCompressionWindow(BaseWindow):
         self.res_h_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.res_h_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
         self.res_h_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
-        self.res_h_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.res_h_disable_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
+        r += 1
+        self.res_snap_pow2_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
+        self.res_snap_pow2_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
+        self.res_snap_pow2_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.quality_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.quality_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -350,7 +369,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.quality_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.quality_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
         self.quality_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
-        self.quality_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.quality_disable_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.color_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.color_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -358,7 +377,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.color_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.color_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
         self.color_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
-        self.color_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.color_disable_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.duration_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.duration_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -366,7 +385,7 @@ class AdvancedCompressionWindow(BaseWindow):
         self.duration_min_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.duration_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
         self.duration_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
-        self.duration_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.duration_disable_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.size_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.size_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -374,14 +393,14 @@ class AdvancedCompressionWindow(BaseWindow):
         self.img_size_max_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.vid_size_max_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
         self.vid_size_max_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
-        self.size_disable_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.size_disable_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.format_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.format_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
         self.img_format_lbl.grid(column=2, row=r, sticky="w", padx=3, pady=3)
         self.img_format_entry.grid(column=3, row=r, sticky="nes", padx=3, pady=3)
         self.vid_format_lbl.grid(column=4, row=r, sticky="w", padx=3, pady=3)
-        self.vid_format_entry.grid(column=5, row=r, sticky="nes", padx=3, pady=3)
+        self.vid_format_entry.grid(column=5, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.power_help_btn1.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.power_lbl1.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -404,12 +423,12 @@ class AdvancedCompressionWindow(BaseWindow):
         r += 1
         self.fake_vid_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.fake_vid_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
-        self.fake_vid_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.fake_vid_cbox.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.bg_color_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.bg_color_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
         self.bg_color_entry.grid(column=5, row=r, sticky="w", padx=3, pady=3)
-        self.bg_color_btn.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
+        self.bg_color_btn.grid(column=6, row=r, sticky="w", padx=3, pady=3)
         r += 1
         self.scale_filter_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.scale_filter_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
@@ -662,6 +681,7 @@ class AdvancedCompressionWindow(BaseWindow):
 
         column = 0
         row = 0
+        emoji_column_per_row = 0
 
         self.emoji_btns = []
         for entry in self.gui.emoji_list:
@@ -702,7 +722,12 @@ class AdvancedCompressionWindow(BaseWindow):
 
             column += 1
 
-            if column == self.emoji_column_per_row:
+            if emoji_column_per_row == 0:
+                self.emoji_canvas.update_idletasks()
+                emoji_column_per_row = int(
+                    self.emoji_canvas.winfo_width() / button.winfo_width()
+                )
+            if column == emoji_column_per_row:
                 column = 0
                 row += 1
 
@@ -714,7 +739,7 @@ class AdvancedCompressionWindow(BaseWindow):
         # Resize the canvas frame to show specified number of buttons and the scrollbar
         if len(self.emoji_btns) > 0:
             in_view_columns_width = (
-                self.emoji_btns[0][0].winfo_width() * self.emoji_column_per_row
+                self.emoji_btns[0][0].winfo_width() * emoji_column_per_row
             )
             in_view_rows_height = (
                 self.emoji_btns[0][0].winfo_height() * self.emoji_visible_rows