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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.2.1
+Version: 2.13.2.2
 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>

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

@@ -597,12 +597,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(
                             (

{sticker_convert-2.13.2.1 → sticker_convert-2.13.2.2}/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.2.2}/src/sticker_convert/uploaders/upload_telegram.py

@@ -165,22 +165,32 @@ class UploadTelegram(UploadBase):
                     src, fmt=spec_choice.get_format(), file_info=file_info
                 )
             )
-            if sticker_format == "video":
-                # For video stickers (Only)
-                # Allow file with one of the dimension = 512 but another <512
-                # https://core.telegram.org/stickers#video-requirements
-                check_file_result = check_file_result and (
-                    file_info.res[0] == 512 or file_info.res[1] == 512
-                )
-                check_file_result = check_file_result and (
-                    file_info.res[0] <= 512 and file_info.res[1] <= 512
-                )
+            if self.opt_output.option == "telegram":
+                if sticker_format == "animated":
+                    check_file_result = (
+                        check_file_result
+                        and file_info.res[0] == 512
+                        and file_info.res[1] == 512
+                    )
+                else:
+                    # For video and static stickers (Not animated)
+                    # Allow file with one of the dimension = 512 but another <512
+                    # https://core.telegram.org/stickers#video-requirements
+                    check_file_result = check_file_result and (
+                        file_info.res[0] == 512 or file_info.res[1] == 512
+                    )
+                    check_file_result = check_file_result and (
+                        file_info.res[0] <= 512 and file_info.res[1] <= 512
+                    )
             else:
+                # telegram_emoji
                 check_file_result = (
                     check_file_result
-                    and file_info.res[0] == 512
-                    and file_info.res[1] == 512
+                    and file_info.res[0] == 100
+                    and file_info.res[1] == 100
                 )
+
+            if sticker_format == "static":
                 # It is important to check if webp and png are static only
                 check_file_result = check_file_result and FormatVerify.check_animated(
                     src, animated=spec_choice.animated, file_info=file_info
@@ -298,7 +308,6 @@ class UploadTelegram(UploadBase):
         stickers_total = 0
         stickers_ok = 0
         for pack_title, stickers in packs.items():
-            stickers_total += len(stickers)
             self.cb.put(f"Uploading pack {pack_title}")
             result, stickers_total_pack, stickers_ok_pack = anyio.run(
                 self.upload_pack, pack_title, stickers, emoji_dict

sticker_convert-2.13.2.2/src/sticker_convert/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.2.1
+Version: 2.13.2.2
 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>

sticker_convert-2.13.2.1/src/sticker_convert/version.py

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