sticker-convert 2.10.6__tar.gz → 2.10.8__tar.gz

{sticker_convert-2.10.6/src/sticker_convert.egg-info → sticker_convert-2.10.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.10.6
+Version: 2.10.8
 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>
@@ -363,27 +363,27 @@ 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: aiolimiter~=1.2.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: httpx~=0.28.0
+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: python-telegram-bot~=21.8
 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: tqdm~=4.67.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 Requires-Dist: websocket_client~=1.8.0
 

{sticker_convert-2.10.6 → sticker_convert-2.10.8}/requirements.txt

@@ -1,23 +1,23 @@
-aiolimiter~=1.1.0
+aiolimiter~=1.2.0
 anyio~=4.6.2.post1
 apngasm_python~=1.3.1
 av~=13.1.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.6
-httpx~=0.27.2
-imagequant~=1.1.2
+httpx~=0.28.0
+imagequant~=1.1.3
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 mini-racer~=0.12.4
 numpy>=1.22.4
 Pillow~=11.0.0
 pyoxipng~=9.0.0
-python-telegram-bot~=21.7
+python-telegram-bot~=21.8
 psutil~=6.1.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
 rlottie_python~=1.3.6
 signalstickers-client-fork-laggykiller~=3.3.0.post2
-tqdm~=4.67.0
+tqdm~=4.67.1
 ttkbootstrap-fork-laggykiller~=1.5.1
 websocket_client~=1.8.0

{sticker_convert-2.10.6 → sticker_convert-2.10.8}/src/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-2.10.6 → sticker_convert-2.10.8}/src/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-2.10.6 → sticker_convert-2.10.8}/src/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-2.10.6 → sticker_convert-2.10.8}/src/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-2.10.6 → sticker_convert-2.10.8}/src/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)
 
@@ -155,8 +154,7 @@ class UploadTelegram(UploadBase):
 
             init_input_stickers: List[InputSticker] = []
             sticker_format = None
-            sticker_format_prev = None
-            for count, src in enumerate(stickers):
+            for src in stickers:
                 self.cb.put(f"Verifying {src} for uploading to telegram")
 
                 emoji = extract_emojis(emoji_dict.get(Path(src).stem, ""))
@@ -207,29 +205,7 @@ class UploadTelegram(UploadBase):
                 )
 
                 if sticker_set is None:
-                    if count < 50 and (
-                        sticker_format_prev is None
-                        or sticker_format_prev == sticker_format
-                    ):
-                        init_input_stickers.append(input_sticker)
-                    else:
-                        start_msg = f"Creating pack and bulk uploading {count} stickers with same format of {pack_short_name}"
-                        finish_msg = f"Created pack and bulk uploaded {count} stickers with same format of {pack_short_name}"
-                        error_msg = f"Cannot create pack and bulk upload {count} stickers with same format of {pack_short_name} due to"
-                        self.cb.put(start_msg)
-                        try:
-                            await bot.create_new_sticker_set(
-                                user_id=self.telegram_userid,
-                                name=pack_short_name,
-                                title=pack_title,
-                                stickers=init_input_stickers,
-                                sticker_type=sticker_type,
-                            )
-                            sticker_set = True
-                            self.cb.put(finish_msg)
-                        except TelegramError as e:
-                            self.cb.put(f"{error_msg} {e}")
-                            return None
+                    init_input_stickers.append(input_sticker)
                 else:
                     try:
                         # We could use tg.start_soon() here
@@ -253,7 +229,24 @@ class UploadTelegram(UploadBase):
                             f"Cannot upload sticker {src} of {pack_short_name} due to {e}"
                         )
 
-                sticker_format_prev = sticker_format
+            if sticker_set is None and len(init_input_stickers) > 0:
+                start_msg = f"Creating pack and bulk uploading {len(init_input_stickers)} stickers with same format of {pack_short_name}"
+                finish_msg = f"Created pack and bulk uploaded {len(init_input_stickers)} stickers with same format of {pack_short_name}"
+                error_msg = f"Cannot create pack and bulk upload {len(init_input_stickers)} stickers with same format of {pack_short_name} due to"
+                self.cb.put(start_msg)
+                try:
+                    await bot.create_new_sticker_set(
+                        user_id=self.telegram_userid,
+                        name=pack_short_name,
+                        title=pack_title,
+                        stickers=init_input_stickers,
+                        sticker_type=sticker_type,
+                    )
+                    sticker_set = True
+                    self.cb.put(finish_msg)
+                except TelegramError as e:
+                    self.cb.put(f"{error_msg} {e}")
+                    return None
 
             cover_path = MetadataHandler.get_cover(self.opt_output.dir)
             if cover_path:

{sticker_convert-2.10.6 → sticker_convert-2.10.8}/src/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-2.10.6 → sticker_convert-2.10.8}/src/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-2.10.6 → sticker_convert-2.10.8}/src/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-2.10.6 → sticker_convert-2.10.8}/src/sticker_convert/version.py

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

{sticker_convert-2.10.6 → sticker_convert-2.10.8/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.10.6
+Version: 2.10.8
 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>
@@ -363,27 +363,27 @@ 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: aiolimiter~=1.2.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: httpx~=0.28.0
+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: python-telegram-bot~=21.8
 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: tqdm~=4.67.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 Requires-Dist: websocket_client~=1.8.0
 

{sticker_convert-2.10.6 → sticker_convert-2.10.8}/src/sticker_convert.egg-info/requires.txt

@@ -1,23 +1,23 @@
-aiolimiter~=1.1.0
+aiolimiter~=1.2.0
 anyio~=4.6.2.post1
 apngasm_python~=1.3.1
 av~=13.1.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.6
-httpx~=0.27.2
-imagequant~=1.1.2
+httpx~=0.28.0
+imagequant~=1.1.3
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 mini-racer~=0.12.4
 numpy>=1.22.4
 Pillow~=11.0.0
 pyoxipng~=9.0.0
-python-telegram-bot~=21.7
+python-telegram-bot~=21.8
 psutil~=6.1.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
 rlottie_python~=1.3.6
 signalstickers-client-fork-laggykiller~=3.3.0.post2
-tqdm~=4.67.0
+tqdm~=4.67.1
 ttkbootstrap-fork-laggykiller~=1.5.1
 websocket_client~=1.8.0