sticker-convert 2.13.2.0__py3-none-any.whl → 2.13.2.2__py3-none-any.whl

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/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/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/version.py

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

{sticker_convert-2.13.2.0.dist-info → sticker_convert-2.13.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.2.0
+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.0.dist-info → sticker_convert-2.13.2.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
 sticker_convert/cli.py,sha256=RG62v3JFSokhKZo1J7zbc1NL0oY43ufVrIub8nT_f_A,22582
-sticker_convert/converter.py,sha256=6_FGXW-S6t2xs56fid49z2FaEc1VFtJ-jJOA-SUKSH8,39760
+sticker_convert/converter.py,sha256=BQQJ7pARKkq_Jeerp3n8aUuVcgTkfqh9BdIWTGQzigM,39748
 sticker_convert/definitions.py,sha256=BqROmOvqIqw8ANaqZXIxJAXGD0HgjAvCfFouQ4SaWHc,2254
 sticker_convert/gui.py,sha256=bd8rMgFaXrn41y6aOHNlD6gPBDleDmiHMsGMZNfz1jk,34239
 sticker_convert/job.py,sha256=jK65lOuPyevQ6Pt9Qw029bGcgYLMuaHlexpc1n1qFxE,28416
 sticker_convert/job_option.py,sha256=yI_uKWJEAul2XTC6pucz9PfW0iNwwOr0aVC-PAHkMA4,8109
-sticker_convert/version.py,sha256=JBpDy60QO4QozrGe48BrcEqhaz4JxxfNhqnSeo_ed3Y,49
+sticker_convert/version.py,sha256=ShiNfvTMXtQL5MGpW_XtFvnqGR0JVLREGxj2lS8M6q0,49
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_band.py,sha256=JPjwwdxbMXPBM9TXF76wT9mtoDCLssYnrm1iS2C6uVM,3629
 sticker_convert/downloaders/download_base.py,sha256=MI5pCT_tkfoaFlrD1oNynDj1Rv1CK0APuNVElTEAEis,5110
 sticker_convert/downloaders/download_discord.py,sha256=6AFpLAYL2hRvVcsqUtzDUC31U66U02ZcnKXDnZRi2jk,3496
 sticker_convert/downloaders/download_kakao.py,sha256=lRmpEcYjHizIRM0uFBDvjMqNEpur0VmOTKAmiir9eB0,15181
-sticker_convert/downloaders/download_line.py,sha256=751-g6BH0ITwNlYNsZuBxyB92Q8f3o6Qv9VHmHDoLps,18161
+sticker_convert/downloaders/download_line.py,sha256=yISEgSpFtQtLUdWH5b8Qby9l3qY5U6o34DgTt9aqmIw,18126
 sticker_convert/downloaders/download_ogq.py,sha256=-iSTQaCUlROfY7a9EFhJGq6fenY48AZEevfQLT9-pAk,2951
 sticker_convert/downloaders/download_signal.py,sha256=3wv-BLd4qggly4AdtwV8f3vUpCVZ-8GnoPLoWngY3Pk,3728
 sticker_convert/downloaders/download_telegram.py,sha256=iGmOcVjU2Ai19t1lyDY2JhQIc--O5XMyNCGXZAA4DVY,2028
@@ -83,7 +83,7 @@ sticker_convert/uploaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 sticker_convert/uploaders/compress_wastickers.py,sha256=Rgl3WzIDJn7oa00nNqeBFDqIHP-cWvgQqET2-kDbf9c,7417
 sticker_convert/uploaders/upload_base.py,sha256=uQupPn6r4zrlAzpKzzX7CgvZb69ATyrwPKahWOQj0ds,1203
 sticker_convert/uploaders/upload_signal.py,sha256=k9XS6oU0gYCXEph-LzWvUP3IDINAVaQzzzNgDRp_YNM,7443
-sticker_convert/uploaders/upload_telegram.py,sha256=WlUyLJlW83XZz6RhA76jHMXA6TNUIEVbPwhi14RTnds,12482
+sticker_convert/uploaders/upload_telegram.py,sha256=CAZI0cOXImFjKL6MIeIfY2Xfhil8sqntQBxOrnROooo,12862
 sticker_convert/uploaders/upload_viber.py,sha256=_vOK0UgP7V7ZeFG6pR3sVf3A744Q6J19qzO-2hDvt5w,6583
 sticker_convert/uploaders/xcode_imessage.py,sha256=iTTT8gDYOTNkKqXeSWUBuWfxu7xeE418t2Z1YQFR5L0,11365
 sticker_convert/utils/callback.py,sha256=spYUGlklOs1yPZAxoqwOWgR1sdimpfM8a27if3TaVYk,6155
@@ -113,9 +113,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 sticker_convert/utils/media/codec_info.py,sha256=HwA6eVh7cLhOlUoR_K9d_wyBRJ_ocGtB3GAyne_iZAU,16483
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
 sticker_convert/utils/media/format_verify.py,sha256=oM32P186tWe9YxvBQRPr8D3FEmBN3b2rEe_2S_MwxyQ,6236
-sticker_convert-2.13.2.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.13.2.0.dist-info/METADATA,sha256=oMckf3XjtI1hDvWtREahWjzkEWpbFmK9_S4ODLCjHmI,55170
-sticker_convert-2.13.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sticker_convert-2.13.2.0.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.13.2.0.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.13.2.0.dist-info/RECORD,,
+sticker_convert-2.13.2.2.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.13.2.2.dist-info/METADATA,sha256=SfPCujs8Oth6H4InFL4nbMOWBIUw6orJDMzKXRSSDaI,55170
+sticker_convert-2.13.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sticker_convert-2.13.2.2.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.13.2.2.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.13.2.2.dist-info/RECORD,,