sticker-convert 2.8.9__tar.gz → 2.8.10__tar.gz

{sticker_convert-2.8.9/src/sticker_convert.egg-info → sticker_convert-2.8.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.9
+Version: 2.8.10
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -365,9 +365,9 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.1.0
-Requires-Dist: anyio~=4.3.0
-Requires-Dist: apngasm_python~=1.2.3
-Requires-Dist: av~=12.0.0
+Requires-Dist: anyio~=4.4.0
+Requires-Dist: apngasm_python~=1.3.1
+Requires-Dist: av~=12.1.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.5.1
 Requires-Dist: imagequant~=1.1.1
@@ -376,14 +376,13 @@ Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=10.3.0
 Requires-Dist: pyoxipng~=9.0.0
-Requires-Dist: python-telegram-bot~=21.1
-Requires-Dist: requests~=2.31.0
+Requires-Dist: python-telegram-bot~=21.2
+Requires-Dist: requests~=2.32.2
 Requires-Dist: rlottie_python~=1.3.4
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post1
 Requires-Dist: sqlcipher3-wheels~=0.5.2.post1
 Requires-Dist: tqdm~=4.66.4
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
-Requires-Dist: webp~=0.3.0
 
 # sticker-convert
 ![imgs/banner.png](imgs/banner.png)
@@ -479,22 +478,28 @@ Requires-Dist: webp~=0.3.0
 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-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-viber DOWNLOAD_VIBER]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
-                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage] [--no-compress]
+                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage]
+                          [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,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]
-                          [--force-pywebp] [--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]
+                          [--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] [--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]
 
 CLI for stickers-convert
 
@@ -620,7 +625,6 @@ Compression options:
                         - imagequant = Best quality but slow
                         - fastoctree = Fast but image looks chunky
                         - none = No image quantizing, large image size as result
-  --force-pywebp        Force using pywebp for encoding webp files instead of Pillow.
   --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.8.9 → sticker_convert-2.8.10}/README.md

@@ -92,22 +92,28 @@
 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-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-viber DOWNLOAD_VIBER]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
-                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage] [--no-compress]
+                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage]
+                          [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,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]
-                          [--force-pywebp] [--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]
+                          [--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] [--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]
 
 CLI for stickers-convert
 
@@ -233,7 +239,6 @@ Compression options:
                         - imagequant = Best quality but slow
                         - fastoctree = Fast but image looks chunky
                         - none = No image quantizing, large image size as result
-  --force-pywebp        Force using pywebp for encoding webp files instead of Pillow.
   --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.8.9/src/sticker_convert.egg-info/requires.txt → sticker_convert-2.8.10/requirements.txt

@@ -1,7 +1,7 @@
 aiolimiter~=1.1.0
-anyio~=4.3.0
-apngasm_python~=1.2.3
-av~=12.0.0
+anyio~=4.4.0
+apngasm_python~=1.3.1
+av~=12.1.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.1
 imagequant~=1.1.1
@@ -10,11 +10,10 @@ mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=10.3.0
 pyoxipng~=9.0.0
-python-telegram-bot~=21.1
-requests~=2.31.0
+python-telegram-bot~=21.2
+requests~=2.32.2
 rlottie_python~=1.3.4
 signalstickers-client-fork-laggykiller~=3.3.0.post1
 sqlcipher3-wheels~=0.5.2.post1
 tqdm~=4.66.4
-ttkbootstrap-fork-laggykiller~=1.5.1
-webp~=0.3.0
+ttkbootstrap-fork-laggykiller~=1.5.1

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/cli.py

@@ -136,7 +136,7 @@ class CLI:
             "scale_filter",
             "quantize_method",
         )
-        flags_comp_bool = ("fake_vid", "force_pywebp")
+        flags_comp_bool = ("fake_vid",)
         keyword_args: Dict[str, Any]
         for k, v in self.help["comp"].items():
             if k in flags_comp_int:
@@ -390,9 +390,6 @@ class CLI:
             fake_vid=self.compression_presets[preset]["fake_vid"]
             if args.fake_vid is None
             else args.fake_vid,
-            force_pywebp=self.compression_presets[preset]["force_pywebp"]
-            if args.force_pywebp is None
-            else args.force_pywebp,
             cache_dir=args.cache_dir,
             scale_filter=self.compression_presets[preset]["scale_filter"]
             if args.scale_filter is None

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/converter.py

@@ -33,19 +33,6 @@ MSG_FAIL_COMP = (
     "[F] Failed Compression {} -> {}, "
     "cannot get below limit {} with lowest quality under current settings (Best size: {})"
 )
-MSG_PYWEBP_FLAG_SET = "`--force-pywebp` was set\n"
-MSG_PYWEBP_NO_LIBWEBP = "system WebP>=0.5.0 was not found.\n"
-MSG_PYWEBP_DUPFRAME = (
-    "[W] {} contains duplicated frame.\n"
-    "    Using pywebp instead of Pillow as {}"
-    "    This is faster, but known to collapse same frames into single frame,\n"
-    "    causing problem with animation timing."
-)
-MSG_WEBP_PIL_DUPFRAME = (
-    "[W] {} contains duplicated frame.\n"
-    "    Using Pillow to create animated webp to avoid same frames collapse\n"
-    "    into single frame, but this is slower."
-)
 
 YUV_RGB_MATRIX = np.array(
     [
@@ -197,8 +184,6 @@ class StickerConvert:
         self.result_step: Optional[int] = None
 
         self.apngasm = None
-        self.msg_pywebp_dupframe_displayed = False
-        self.msg_webp_pil_dupframe_displayed = False
 
     @staticmethod
     def convert(
@@ -698,11 +683,9 @@ class StickerConvert:
                 self._frames_export_apng()
             else:
                 self._frames_export_png()
-        elif self.out_f.suffix == ".webp":
-            self._frames_export_webp()
         elif self.out_f.suffix == ".gif":
             self._frames_export_pil_anim()
-        elif self.out_f.suffix in (".webm", ".mp4", ".mkv") or is_animated:
+        elif self.out_f.suffix in (".webm", ".mp4", ".mkv", ".webp") or is_animated:
             self._frames_export_pyav()
         else:
             self._frames_export_pil()
@@ -719,46 +702,6 @@ class StickerConvert:
 
         return False
 
-    def _frames_export_webp(self) -> None:
-        # TODO: Encode webp with pyav when available
-        # https://github.com/PyAV-Org/PyAV/issues/1352
-        has_dup_frames = self._check_dup()
-        if self.fps:
-            # It was noted that pywebp would collapse all frames.
-            # aed005b attempted to fix this by creating webp with
-            # variable frame duration. However, the webp created would
-            # not be accepted by WhatsApp.
-            # Therefore, we are preferring Pillow over pywebp.
-            if has_dup_frames:
-                if self.opt_comp.force_pywebp:
-                    if not self.msg_pywebp_dupframe_displayed:
-                        self.cb.put(
-                            MSG_PYWEBP_DUPFRAME.format(
-                                self.in_f_name, MSG_PYWEBP_FLAG_SET
-                            )
-                        )
-                        self.msg_pywebp_dupframe_displayed = True
-                    self._frames_export_pywebp()
-                elif not PIL_WEBP_ANIM:
-                    if not self.msg_pywebp_dupframe_displayed:
-                        self.cb.put(
-                            MSG_PYWEBP_DUPFRAME.format(
-                                self.in_f_name, MSG_PYWEBP_NO_LIBWEBP
-                            )
-                        )
-                        self.msg_pywebp_dupframe_displayed = True
-                    self._frames_export_pywebp()
-                else:
-                    # Warn that using Pillow is slower
-                    if not self.msg_webp_pil_dupframe_displayed:
-                        self.cb.put(MSG_WEBP_PIL_DUPFRAME.format(self.in_f_name))
-                        self.msg_webp_pil_dupframe_displayed = True
-                    self._frames_export_pil_anim()
-            else:
-                self._frames_export_pywebp()
-        else:
-            self._frames_export_pil()
-
     def _frames_export_pil(self) -> None:
         with Image.fromarray(self.frames_processed[0]) as im:  # type: ignore
             im.save(
@@ -771,30 +714,38 @@ class StickerConvert:
         import av
         from av.video.stream import VideoStream
 
-        options: Dict[str, str] = {}
+        options_container: Dict[str, str] = {}
+        options_stream: Dict[str, str] = {}
 
         if isinstance(self.quality, int):
             # Seems not actually working
-            options["quality"] = str(self.quality)
-            options["lossless"] = "0"
+            options_stream["quality"] = str(self.quality)
+            options_stream["lossless"] = "0"
 
         if self.out_f.suffix in (".apng", ".png"):
             codec = "apng"
             pixel_format = "rgba"
-            options["plays"] = "0"
+            options_container["plays"] = "0"
         elif self.out_f.suffix in (".webm", ".mkv"):
             codec = "libvpx-vp9"
             pixel_format = "yuva420p"
-            options["loop"] = "0"
+            options_container["loop"] = "0"
+        elif self.out_f.suffix == ".webp":
+            codec = "webp"
+            pixel_format = "yuva420p"
+            options_container["loop"] = "0"
         else:
             codec = "libvpx-vp9"
             pixel_format = "yuv420p"
-            options["loop"] = "0"
+            options_container["loop"] = "0"
 
         with av.open(
-            self.tmp_f, "w", format=self.out_f.suffix.replace(".", "")
+            self.tmp_f,
+            "w",
+            format=self.out_f.suffix.replace(".", ""),
+            options=options_container,
         ) as output:
-            out_stream = output.add_stream(codec, rate=self.fps, options=options)
+            out_stream = output.add_stream(codec, rate=self.fps, options=options_stream)
             out_stream = cast(VideoStream, out_stream)
             assert isinstance(self.res_w, int) and isinstance(self.res_h, int)
             out_stream.width = self.res_w
@@ -858,21 +809,6 @@ class StickerConvert:
             **extra_kwargs,
         )
 
-    def _frames_export_pywebp(self) -> None:
-        import webp  # type: ignore
-
-        assert self.fps
-
-        config = webp.WebPConfig.new(quality=self.quality)  # type: ignore
-        enc = webp.WebPAnimEncoder.new(self.res_w, self.res_h)  # type: ignore
-        timestamp_ms = 0
-        for frame in self.frames_processed:
-            pic = webp.WebPPicture.from_numpy(frame)  # type: ignore
-            enc.encode_frame(pic, timestamp_ms, config=config)  # type: ignore
-            timestamp_ms += int(1000 / self.fps)
-        anim_data = enc.assemble(timestamp_ms)  # type: ignore
-        self.tmp_f.write(anim_data.buffer())  # type: ignore
-
     def _frames_export_png(self) -> None:
         with Image.fromarray(self.frames_processed[0], "RGBA") as image:  # type: ignore
             image_quant = self.quantize(image)

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/gui.py

@@ -135,7 +135,6 @@ class GUI(Window):
         self.fake_vid_var = BooleanVar()
         self.scale_filter_var = StringVar(self)
         self.quantize_method_var = StringVar(self)
-        self.force_pywebp_var = BooleanVar()
         self.cache_dir_var = StringVar(self)
         self.default_emoji_var = StringVar(self)
         self.steps_var = IntVar(self)
@@ -526,7 +525,6 @@ class GUI(Window):
             fake_vid=self.fake_vid_var.get(),
             scale_filter=self.scale_filter_var.get(),
             quantize_method=self.quantize_method_var.get(),
-            force_pywebp=self.force_pywebp_var.get(),
             cache_dir=self.cache_dir_var.get()
             if self.cache_dir_var.get() != ""
             else None,

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/gui_components/frames/comp_frame.py

@@ -135,7 +135,6 @@ class CompFrame(LabelFrame):
         self.gui.fake_vid_var.set(preset.get("fake_vid"))
         self.gui.scale_filter_var.set(preset.get("scale_filter"))
         self.gui.quantize_method_var.set(preset.get("quantize_method"))
-        self.gui.force_pywebp_var.set(preset.get("force_pywebp"))
         self.gui.default_emoji_var.set(preset.get("default_emoji"))
         self.gui.steps_var.set(preset.get("steps"))
 

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/gui_components/windows/advanced_compression_window.py

@@ -293,18 +293,6 @@ class AdvancedCompressionWindow(BaseWindow):
             bootstyle="secondary",  # type: ignore
         )
 
-        self.force_pywebp_help_btn = self.add_help_btn(
-            self.gui.help["comp"]["force_pywebp"]
-        )
-        self.force_pywebp_lbl = Label(self.frame_advcomp, text="Force pywebp")
-        self.force_pywebp_cbox = Checkbutton(
-            self.frame_advcomp,
-            variable=self.gui.force_pywebp_var,
-            onvalue=True,
-            offvalue=False,
-            bootstyle="success-round-toggle",  # type: ignore
-        )
-
         self.cache_dir_help_btn = self.add_help_btn(self.gui.help["comp"]["cache_dir"])
         self.cache_dir_lbl = Label(self.frame_advcomp, text="Custom cache directory")
         self.cache_dir_entry = Entry(
@@ -424,10 +412,6 @@ class AdvancedCompressionWindow(BaseWindow):
             column=2, row=r, columnspan=4, sticky="nes", padx=3, pady=3
         )
         r += 1
-        self.force_pywebp_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
-        self.force_pywebp_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
-        self.force_pywebp_cbox.grid(column=6, row=r, sticky="nes", padx=3, pady=3)
-        r += 1
         self.cache_dir_help_btn.grid(column=0, row=r, sticky="w", padx=3, pady=3)
         self.cache_dir_lbl.grid(column=1, row=r, sticky="w", padx=3, pady=3)
         self.cache_dir_entry.grid(

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/job_option.py

@@ -74,7 +74,6 @@ class CompOption(BaseOption):
     steps: int = 1
     fake_vid: Optional[bool] = None
     quantize_method: Optional[str] = None
-    force_pywebp: Optional[bool] = None
     scale_filter: Optional[str] = None
     cache_dir: Optional[str] = None
     default_emoji: str = "😀"

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/resources/compression.json

@@ -44,7 +44,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "signal": {
@@ -92,7 +91,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "telegram": {
@@ -140,7 +138,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "telegram_emoji": {
@@ -188,7 +185,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "whatsapp": {
@@ -236,7 +232,6 @@
         "fake_vid": true,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "line": {
@@ -284,7 +279,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "kakao": {
@@ -332,7 +326,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "viber": {
@@ -380,7 +373,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "imessage_small": {
@@ -428,7 +420,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "imessage_medium": {
@@ -476,7 +467,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "imessage_large": {
@@ -524,7 +514,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     },
     "custom": {
@@ -572,7 +561,6 @@
         "fake_vid": false,
         "scale_filter": "bicubic",
         "quantize_method": "imagequant",
-        "force_pywebp": false,
         "default_emoji": "😀"
     }
 }

{sticker_convert-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/resources/help.json

@@ -51,7 +51,6 @@
         "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",
         "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",
-        "force_pywebp": "Force using pywebp for encoding webp files instead of Pillow.",
         "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-2.8.9 → sticker_convert-2.8.10}/src/sticker_convert/version.py

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

{sticker_convert-2.8.9 → sticker_convert-2.8.10/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.8.9
+Version: 2.8.10
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, Viber, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -365,9 +365,9 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.1.0
-Requires-Dist: anyio~=4.3.0
-Requires-Dist: apngasm_python~=1.2.3
-Requires-Dist: av~=12.0.0
+Requires-Dist: anyio~=4.4.0
+Requires-Dist: apngasm_python~=1.3.1
+Requires-Dist: av~=12.1.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.5.1
 Requires-Dist: imagequant~=1.1.1
@@ -376,14 +376,13 @@ Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=10.3.0
 Requires-Dist: pyoxipng~=9.0.0
-Requires-Dist: python-telegram-bot~=21.1
-Requires-Dist: requests~=2.31.0
+Requires-Dist: python-telegram-bot~=21.2
+Requires-Dist: requests~=2.32.2
 Requires-Dist: rlottie_python~=1.3.4
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post1
 Requires-Dist: sqlcipher3-wheels~=0.5.2.post1
 Requires-Dist: tqdm~=4.66.4
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
-Requires-Dist: webp~=0.3.0
 
 # sticker-convert
 ![imgs/banner.png](imgs/banner.png)
@@ -479,22 +478,28 @@ Requires-Dist: webp~=0.3.0
 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-line DOWNLOAD_LINE | --download-kakao DOWNLOAD_KAKAO | --download-viber DOWNLOAD_VIBER]
                           [--output-dir OUTPUT_DIR] [--author AUTHOR] [--title TITLE]
-                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage] [--no-compress]
+                          [--export-signal | --export-telegram | --export-telegram-emoji | --export-whatsapp | --export-imessage]
+                          [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,viber,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]
-                          [--force-pywebp] [--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]
+                          [--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] [--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]
 
 CLI for stickers-convert
 
@@ -620,7 +625,6 @@ Compression options:
                         - imagequant = Best quality but slow
                         - fastoctree = Fast but image looks chunky
                         - none = No image quantizing, large image size as result
-  --force-pywebp        Force using pywebp for encoding webp files instead of Pillow.
   --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.8.9/requirements.txt → sticker_convert-2.8.10/src/sticker_convert.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiolimiter~=1.1.0
-anyio~=4.3.0
-apngasm_python~=1.2.3
-av~=12.0.0
+anyio~=4.4.0
+apngasm_python~=1.3.1
+av~=12.1.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.1
 imagequant~=1.1.1
@@ -10,11 +10,10 @@ mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow~=10.3.0
 pyoxipng~=9.0.0
-python-telegram-bot~=21.1
-requests~=2.31.0
+python-telegram-bot~=21.2
+requests~=2.32.2
 rlottie_python~=1.3.4
 signalstickers-client-fork-laggykiller~=3.3.0.post1
 sqlcipher3-wheels~=0.5.2.post1
 tqdm~=4.66.4
 ttkbootstrap-fork-laggykiller~=1.5.1
-webp~=0.3.0