sticker-convert 2.10.6__py3-none-any.whl → 2.10.7__py3-none-any.whl

sticker_convert/converter.py

@@ -535,7 +535,7 @@ class StickerConvert:
                         rgba_array = yuva_to_rgba(frame_resized)
 
                     # Remove pixels that was added to make dimensions even
-                    rgba_array = rgba_array[0:width_orig, 0:height_orig]
+                    rgba_array = rgba_array[0:height_orig, 0:width_orig]
                     self.frames_raw.append(rgba_array)
 
     def _frames_import_lottie(self) -> None:
@@ -622,12 +622,12 @@ class StickerConvert:
                 self.res_h = height
 
             scaling = 1 - (self.opt_comp.padding_percent / 100)
-            if width > height:
+            if width / self.res_w > height / self.res_h:
                 width_new = int(self.res_w * scaling)
-                height_new = int(height * self.res_w // width * scaling)
+                height_new = int(height * self.res_w / width * scaling)
             else:
                 height_new = int(self.res_h * scaling)
-                width_new = int(width * self.res_h // height * scaling)
+                width_new = int(width * self.res_h / height * scaling)
 
             with im.resize((width_new, height_new), resample=resample) as im_resized:
                 with Image.new(

sticker_convert/job_option.py

@@ -80,7 +80,6 @@ class CompOption(BaseOption):
     no_compress: Optional[bool] = None
     processes: int = ceil(cpu_count() / 2)
     animated: Optional[bool] = None
-    square: Optional[bool] = None
 
     def to_dict(self) -> Dict[Any, Any]:
         return {
@@ -115,7 +114,6 @@ class CompOption(BaseOption):
             "no_compress": self.no_compress,
             "processes": self.processes,
             "animated": self.animated,
-            "square": self.square,
         }
 
     def get_size_max(self) -> Tuple[Optional[int], Optional[int]]:

sticker_convert/uploaders/compress_wastickers.py

@@ -23,7 +23,6 @@ class CompressWastickers(UploadBase):
         self.base_spec.size_max_vid = 500000
         self.base_spec.duration_min = 8
         self.base_spec.duration_max = 10000
-        self.base_spec.square = True
         self.base_spec.set_res(512)
         self.base_spec.set_format((".webp",))
 

sticker_convert/uploaders/upload_signal.py

@@ -25,7 +25,6 @@ class UploadSignal(UploadBase):
         self.base_spec.set_size_max(300000)
         self.base_spec.set_res_max(512)
         self.base_spec.duration_max = 3000
-        self.base_spec.square = True
 
         self.png_spec = copy.deepcopy(self.base_spec)
         self.png_spec.set_format((".apng",))

sticker_convert/uploaders/upload_telegram.py

@@ -24,7 +24,6 @@ class UploadTelegram(UploadBase):
 
         self.base_spec.size_max_img = 512000
         self.base_spec.size_max_vid = 256000
-        self.base_spec.square = True
         self.base_spec.duration_max = 3000
         self.base_spec.set_res(512)
 
@@ -48,7 +47,7 @@ class UploadTelegram(UploadBase):
         self.opt_comp_merged.merge(self.base_spec)
 
         base_cover_spec = CompOption(
-            size_max_img=128000, size_max_vid=32000, square=True, duration_max=3000
+            size_max_img=128000, size_max_vid=32000, duration_max=3000
         )
         base_cover_spec.set_res(100)
 

sticker_convert/uploaders/upload_viber.py

@@ -23,7 +23,6 @@ class UploadViber(UploadBase):
         super().__init__(*args, **kwargs)
 
         self.base_spec.set_size_max(0)
-        self.base_spec.square = True
 
         self.png_spec = copy.deepcopy(self.base_spec)
         self.png_spec.set_res_max(490)

sticker_convert/uploaders/xcode_imessage.py

@@ -25,7 +25,6 @@ class XcodeImessage(UploadBase):
         self.base_spec.set_size_max(500000)
         self.base_spec.set_res(300)
         self.base_spec.set_format(("png", ".apng", ".gif", ".jpeg", "jpg"))
-        self.base_spec.square = True
 
         self.small_spec = copy.deepcopy(self.base_spec)
 

sticker_convert/utils/media/format_verify.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+from fractions import Fraction
 from pathlib import Path
 from typing import Optional, Tuple, Union
 
@@ -16,9 +17,7 @@ class FormatVerify:
         file_info = CodecInfo(file)
 
         return (
-            FormatVerify.check_file_res(
-                file, res=spec.get_res(), square=spec.square, file_info=file_info
-            )
+            FormatVerify.check_file_res(file, res=spec.get_res(), file_info=file_info)
             and FormatVerify.check_file_fps(
                 file, fps=spec.get_fps(), file_info=file_info
             )
@@ -48,7 +47,6 @@ class FormatVerify:
         res: Tuple[
             Tuple[Optional[int], Optional[int]], Tuple[Optional[int], Optional[int]]
         ],
-        square: Optional[bool] = None,
         file_info: Optional[CodecInfo] = None,
     ) -> bool:
         if file_info:
@@ -65,8 +63,27 @@ class FormatVerify:
                 return False
             if res[1][1] and file_height > res[1][1]:
                 return False
-        if square and file_height != file_width:
-            return False
+
+        min_ratio = None
+        if res[0][0] and res[1][0]:
+            min_ratio = Fraction(res[0][0], res[1][0])
+
+        max_ratio = None
+        if res[0][1] and res[1][1]:
+            max_ratio = Fraction(res[0][1], res[1][1])
+
+        file_ratio = Fraction(file_width, file_height)
+
+        if min_ratio is not None and max_ratio is not None:
+            if min_ratio == max_ratio:
+                return True if file_ratio == min_ratio else False
+            else:
+                return True
+
+        if min_ratio is not None:
+            return True if file_ratio == min_ratio else False
+        if max_ratio is not None:
+            return True if file_ratio == max_ratio else False
 
         return True
 

sticker_convert/version.py

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

{sticker_convert-2.10.6.dist-info → sticker_convert-2.10.7.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.10.6
+Version: 2.10.7
 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>
-License: GNU GENERAL PUBLIC LICENSE
+License:                     GNU GENERAL PUBLIC LICENSE
                                Version 2, June 1991
         
          Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
@@ -363,29 +363,29 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiolimiter ~=1.1.0
-Requires-Dist: anyio ~=4.6.2.post1
-Requires-Dist: apngasm-python ~=1.3.1
-Requires-Dist: av ~=13.1.0
-Requires-Dist: beautifulsoup4 ~=4.12.3
-Requires-Dist: rookiepy ~=0.5.6
-Requires-Dist: httpx ~=0.27.2
-Requires-Dist: imagequant ~=1.1.2
-Requires-Dist: memory-tempfile ~=2.2.3
-Requires-Dist: mergedeep ~=1.3.4
-Requires-Dist: mini-racer ~=0.12.4
-Requires-Dist: numpy >=1.22.4
-Requires-Dist: Pillow ~=11.0.0
-Requires-Dist: pyoxipng ~=9.0.0
-Requires-Dist: python-telegram-bot ~=21.7
-Requires-Dist: psutil ~=6.1.0
-Requires-Dist: PyMemoryEditor ~=1.5.22
-Requires-Dist: requests ~=2.32.3
-Requires-Dist: rlottie-python ~=1.3.6
-Requires-Dist: signalstickers-client-fork-laggykiller ~=3.3.0.post2
-Requires-Dist: tqdm ~=4.67.0
-Requires-Dist: ttkbootstrap-fork-laggykiller ~=1.5.1
-Requires-Dist: websocket-client ~=1.8.0
+Requires-Dist: aiolimiter~=1.1.0
+Requires-Dist: anyio~=4.6.2.post1
+Requires-Dist: apngasm_python~=1.3.1
+Requires-Dist: av~=13.1.0
+Requires-Dist: beautifulsoup4~=4.12.3
+Requires-Dist: rookiepy~=0.5.6
+Requires-Dist: httpx~=0.27.2
+Requires-Dist: imagequant~=1.1.3
+Requires-Dist: memory-tempfile~=2.2.3
+Requires-Dist: mergedeep~=1.3.4
+Requires-Dist: mini-racer~=0.12.4
+Requires-Dist: numpy>=1.22.4
+Requires-Dist: Pillow~=11.0.0
+Requires-Dist: pyoxipng~=9.0.0
+Requires-Dist: python-telegram-bot~=21.7
+Requires-Dist: psutil~=6.1.0
+Requires-Dist: PyMemoryEditor~=1.5.22
+Requires-Dist: requests~=2.32.3
+Requires-Dist: rlottie_python~=1.3.6
+Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
+Requires-Dist: tqdm~=4.67.1
+Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
+Requires-Dist: websocket_client~=1.8.0
 
 # sticker-convert
 ![imgs/banner.png](https://socialify.git.ci/laggykiller/sticker-convert/image?description=1&font=Inter&logo=https%3A%2F%2Fgithub.com%2Flaggykiller%2Fsticker-convert%2Fblob%2Fmaster%2Fsrc%2Fsticker_convert%2Fresources%2Fappicon.png%3Fraw%3Dtrue&name=1&owner=1&theme=Dark)

{sticker_convert-2.10.6.dist-info → sticker_convert-2.10.7.dist-info}/RECORD

@@ -1,12 +1,12 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
 sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
 sticker_convert/cli.py,sha256=yI_56AfEi3Q2q8h1p8-l7wSK7wk3ktQNE_rwTAWwW1Q,20526
-sticker_convert/converter.py,sha256=ZppZcz6ZCmzx23RjtBWBQ3oLh2fTiPV1U3nEVWHt_xM,35947
+sticker_convert/converter.py,sha256=gZIvF6WwYfnNyRkIjIR_VWphrBi5aU36f8uq8ouzVoE,35971
 sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjtE,2073
 sticker_convert/gui.py,sha256=IsVCXr5_6mzBgIgXtUICI3fcKu51J9WaLE9MBLrm5t4,33064
 sticker_convert/job.py,sha256=ae0DKz74nctDLSI0VU7BYI4dx3kwTM8ynky_aLspQVU,26491
-sticker_convert/job_option.py,sha256=lhcyioT6qPHrNYRBTv5wxPmmY9RkATo1-DE7-lzCwp0,7887
-sticker_convert/version.py,sha256=CA6awuoZNzvC34IGCF-QBlpVEft9-A824kERwfZDAmU,47
+sticker_convert/job_option.py,sha256=HgoiZs9JBjki5_fjAp8l3y3kdAWvU7FEAgtPsy4MRt0,7818
+sticker_convert/version.py,sha256=bYJEHSoUxGC_5BYlNNnbAGjQP4nl-tH0j9HcAjHIcLk,47
 sticker_convert/downloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sticker_convert/downloaders/download_base.py,sha256=a34JcNBgZ5yf6gZnxc-B5uNaKVUG-vs3sjOJnLneWsw,4468
 sticker_convert/downloaders/download_discord.py,sha256=HeQFjJ7igb5KOk0aXQAUEuJ9OoPKyiE_mAD2_AW9PDw,3435
@@ -78,12 +78,12 @@ sticker_convert/resources/memdump_linux.sh,sha256=YbdX5C5RyCnoeDUE6JgTo8nQXKhrUw
 sticker_convert/resources/memdump_windows.ps1,sha256=CfyNSSEW3HJOkTu-mKrP3qh5aprN-1VCBfj-R1fELA0,302
 sticker_convert/resources/output.json,sha256=V4OseXEm3O16cAjHDVZRq8-SY-0_7cFFR_cyF-0Y_eQ,1570
 sticker_convert/uploaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sticker_convert/uploaders/compress_wastickers.py,sha256=SMPf1_ir30ZKO2ChHspDFuyaufx0XeVBVLOlHmawEdY,6021
+sticker_convert/uploaders/compress_wastickers.py,sha256=j5gLXwRHjEtmV2Kqv_-KkU8eeW6cZMo3hoSMvT4PKVk,5984
 sticker_convert/uploaders/upload_base.py,sha256=uQupPn6r4zrlAzpKzzX7CgvZb69ATyrwPKahWOQj0ds,1203
-sticker_convert/uploaders/upload_signal.py,sha256=A3jOvPlgrD1f8gb_lPDjzcXv9zapQxB5DXO7GhDS6lA,6489
-sticker_convert/uploaders/upload_telegram.py,sha256=cb4FzYSF5oxs0QpilEyzepk2tcDC83AbCW-dEO6CLAk,15758
-sticker_convert/uploaders/upload_viber.py,sha256=DiY54RstBtVJEfp6rGo0cpABx0X2qI873pJ6tTH-Q9U,6189
-sticker_convert/uploaders/xcode_imessage.py,sha256=1gvOljf6kYsq_11tYhnF19Yf4oGY5y34te2DWBRMwf0,11254
+sticker_convert/uploaders/upload_signal.py,sha256=UuJdzwGAQsKhtj2Pkn4-jvak4Set0XI5XG1pEH2KDvI,6452
+sticker_convert/uploaders/upload_telegram.py,sha256=7_hfPhnSNY40vC2DEhOI53_-U-D3ZiXv5casNVK69Mk,15708
+sticker_convert/uploaders/upload_viber.py,sha256=fkAnsVyWc8vyK24--O4LyPgT-xvt-sAoBfeSWyUOeEg,6152
+sticker_convert/uploaders/xcode_imessage.py,sha256=5UObj4DvfJ6yL1m71grQeZtqhl4BiZmoYwsVeCO_Rrc,11217
 sticker_convert/utils/callback.py,sha256=spYUGlklOs1yPZAxoqwOWgR1sdimpfM8a27if3TaVYk,6155
 sticker_convert/utils/chrome_remotedebug.py,sha256=tLc1C1u7U3kJvAi1WFK5_3gKcdfg4x6SAkTIX2g87VE,4765
 sticker_convert/utils/emoji.py,sha256=AqB26JY-PkYzNwPLReSnqLiQKe-bR9UXnLclAbgubJ8,367
@@ -104,10 +104,10 @@ sticker_convert/utils/files/sanitize_filename.py,sha256=HBklPGsHRJjFQUIC5rYTQsUr
 sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE4l0MygBA1jB-PFiYLEkzk,3657
 sticker_convert/utils/media/codec_info.py,sha256=XoEWBfPWTzr4zSVQIU1XF1yh5viHxH5FytNEpdZR38c,14874
 sticker_convert/utils/media/decrypt_kakao.py,sha256=4wq9ZDRnFkx1WmFZnyEogBofiLGsWQM_X69HlA36578,1947
-sticker_convert/utils/media/format_verify.py,sha256=MH68GLJfXeL8WFT8emtj355K5BLAtUX64tQ59nugx2c,5673
-sticker_convert-2.10.6.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.10.6.dist-info/METADATA,sha256=qXiR2avOMn9Ll57x_i7deaNpyrLQq6LyfRdOqRAK4vI,52498
-sticker_convert-2.10.6.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-sticker_convert-2.10.6.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.10.6.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.10.6.dist-info/RECORD,,
+sticker_convert/utils/media/format_verify.py,sha256=oM32P186tWe9YxvBQRPr8D3FEmBN3b2rEe_2S_MwxyQ,6236
+sticker_convert-2.10.7.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.10.7.dist-info/METADATA,sha256=0emOJ8oIvhGydLxuGL66DOk2MnUyxe8SdPm6RR-JbaM,52495
+sticker_convert-2.10.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sticker_convert-2.10.7.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.10.7.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.10.7.dist-info/RECORD,,

{sticker_convert-2.10.6.dist-info → sticker_convert-2.10.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any