sticker-convert 2.11.2__tar.gz → 2.11.4__tar.gz

{sticker_convert-2.11.2/src/sticker_convert.egg-info → sticker_convert-2.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sticker-convert
-Version: 2.11.2
+Version: 2.11.4
 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>
@@ -379,7 +379,7 @@ Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=21.10
-Requires-Dist: psutil~=6.1.1
+Requires-Dist: psutil~=7.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3
 Requires-Dist: rlottie_python~=1.3.6

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/requirements.txt

@@ -14,7 +14,7 @@ numpy>=1.22.4
 Pillow~=11.1.0
 pyoxipng~=9.0.0
 python-telegram-bot~=21.10
-psutil~=6.1.1
+psutil~=7.0.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
 rlottie_python~=1.3.6

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/src/sticker_convert/converter.py

@@ -284,10 +284,14 @@ class StickerConvert:
                 return self.compress_fail()
 
     def check_if_compatible(self) -> Optional[bytes]:
+        f_fmt = self.opt_comp.get_format()
         if (
-            FormatVerify.check_format(
+            # Issue #260: Some webp file not accepted by Whatsapp
+            ".webp" not in f_fmt[0]
+            and ".webp" not in f_fmt[1]
+            and FormatVerify.check_format(
                 self.in_f,
-                fmt=self.opt_comp.get_format(),
+                fmt=f_fmt,
                 file_info=self.codec_info_orig,
             )
             and FormatVerify.check_file_res(
@@ -577,9 +581,9 @@ class StickerConvert:
             colors = colors[colors[:, 3] != 0]
             if colors.shape[0] != 0:
                 alphas = colors[:, 3] / 255
-                r_mean = np.mean(colors[:, 0] * alphas)
-                g_mean = np.mean(colors[:, 1] * alphas)
-                b_mean = np.mean(colors[:, 2] * alphas)
+                r_mean = cast(float, np.mean(colors[:, 0] * alphas))
+                g_mean = cast(float, np.mean(colors[:, 1] * alphas))
+                b_mean = cast(float, np.mean(colors[:, 2] * alphas))
                 mean_total += (r_mean + g_mean + b_mean) / 3
 
         if mean_total / len(self.frames_raw) < 128:

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/src/sticker_convert/downloaders/download_signal.py

@@ -58,6 +58,18 @@ class DownloadSignal(DownloadBase):
 
             self.cb.put("update_bar")
 
+        if pack.cover is not None and pack.cover.image_data is not None:
+            cover_path = Path(self.out_dir, "cover")
+            with open(cover_path, "wb") as f:
+                f.write(pack.cover.image_data)
+
+            cover_codec = CodecInfo.get_file_codec(cover_path)
+            if cover_codec == "":
+                cover_codec = "png"
+            cover_path_new = Path(self.out_dir, f"cover.{cover_codec}")
+            cover_path.rename(cover_path_new)
+            self.cb.put(f"Downloaded cover.{cover_codec}")
+
         MetadataHandler.set_metadata(
             self.out_dir, title=pack.title, author=pack.author, emoji_dict=emoji_dict
         )

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/src/sticker_convert/gui.py

@@ -634,7 +634,7 @@ class GUI(Window):
         initialvalue: Optional[str] = None,
         cli_show_initialvalue: bool = True,
         parent: Optional[object] = None,
-    ) -> Any:
+    ) -> str:
         self.action = partial(
             Querybox.get_string,  # type: ignore
             question,
@@ -646,7 +646,12 @@ class GUI(Window):
         self.response_event.wait()
         self.response_event.clear()
 
-        return self.response
+        if self.response is None:
+            return ""
+        elif isinstance(self.response, str):
+            return self.response
+        else:
+            raise RuntimeError(f"Invalid response in cb_ask_str: {self.response}")
 
     def cb_ask_bool(
         self, question: str, parent: Union[Window, Toplevel, None] = None
@@ -701,9 +706,9 @@ class GUI(Window):
             set_progress_mode, steps, update_bar, *args, **kwargs
         )
 
-    def highlight_fields(self) -> bool:
+    def highlight_fields(self):
         if not self.init_done:
-            return True
+            return
 
         input_option = self.get_input_name()
         input_option_display = self.get_input_display_name()
@@ -853,5 +858,3 @@ class GUI(Window):
         else:
             self.comp_frame.comp_preset_opt.config(bootstyle="secondary")  # type: ignore
             self.output_frame.output_option_opt.config(bootstyle="secondary")  # type: ignore
-
-        return True

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/src/sticker_convert/job.py

@@ -642,7 +642,12 @@ class Job:
 
             if not in_f.is_file():
                 continue
-            if CodecInfo.get_file_ext(i) in (".txt", ".m4a") or Path(i).stem == "cover":
+            if (
+                CodecInfo.get_file_ext(i) in (".txt", ".m4a")
+                or (
+                    self.opt_comp.preset != "signal" and Path(i).stem == "cover"
+                )  # Signal cover has same spec as normal sticker
+            ):
                 shutil.copy(in_f, output_dir / i.name)
             else:
                 in_fs.append(i)

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/src/sticker_convert/uploaders/upload_signal.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import copy
 from pathlib import Path
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import anyio
 from signalstickers_client.errors import SignalException
@@ -46,51 +46,77 @@ class UploadSignal(UploadBase):
         )
         return result
 
-    def add_stickers_to_pack(
-        self, pack: LocalStickerPack, stickers: List[Path], emoji_dict: Dict[str, str]
-    ) -> None:
-        for src in stickers:
-            self.cb.put(f"Verifying {src} for uploading to signal")
+    def create_sticker(
+        self, src: Path, emoji_dict: Dict[str, str]
+    ) -> Optional[Sticker]:
+        self.cb.put(f"Verifying {src} for uploading to signal")
 
-            sticker = Sticker()
-            sticker.id = pack.nb_stickers
+        sticker = Sticker()
 
-            emoji = extract_emojis(emoji_dict.get(Path(src).stem, ""))
-            if emoji == "":
-                self.cb.put(
-                    f"Warning: Cannot find emoji for file {Path(src).name}, using default emoji..."
-                )
-                emoji = self.opt_comp.default_emoji
-            sticker.emoji = emoji[:1]
+        emoji = extract_emojis(emoji_dict.get(Path(src).stem, ""))
+        if emoji == "":
+            self.cb.put(
+                f"Warning: Cannot find emoji for file {Path(src).name}, using default emoji..."
+            )
+            emoji = self.opt_comp.default_emoji
+        sticker.emoji = emoji
 
-            if Path(src).suffix == ".webp":
-                spec_choice = self.webp_spec
+        if Path(src).suffix == ".webp":
+            spec_choice = self.webp_spec
+        else:
+            spec_choice = self.png_spec
+
+        if not FormatVerify.check_file(src, spec=spec_choice):
+            if self.opt_comp.fake_vid or CodecInfo.is_anim(src):
+                dst = "bytes.apng"
             else:
-                spec_choice = self.png_spec
-
-            if not FormatVerify.check_file(src, spec=spec_choice):
-                if self.opt_comp.fake_vid or CodecInfo.is_anim(src):
-                    dst = "bytes.apng"
-                else:
-                    dst = "bytes.png"
-                success, _, image_data, _ = StickerConvert.convert(
-                    Path(src), Path(dst), self.opt_comp_merged, self.cb, self.cb_return
+                dst = "bytes.png"
+            success, _, image_data, _ = StickerConvert.convert(
+                Path(src), Path(dst), self.opt_comp_merged, self.cb, self.cb_return
+            )
+            if not success:
+                self.cb.put(
+                    f"Warning: Cannot compress file {Path(src).name}, skip uploading this file..."
                 )
-                if not success:
-                    self.cb.put(
-                        f"Warning: Cannot compress file {Path(src).name}, skip uploading this file..."
-                    )
-                    continue
+                return None
 
-                assert isinstance(image_data, bytes)
+            assert isinstance(image_data, bytes)
 
-                sticker.image_data = image_data
-            else:
-                with open(src, "rb") as f:
-                    sticker.image_data = f.read()
+            sticker.image_data = image_data
+        else:
+            with open(src, "rb") as f:
+                sticker.image_data = f.read()
+
+        return sticker
 
+    def add_stickers_to_pack(
+        self, pack: LocalStickerPack, stickers: List[Path], emoji_dict: Dict[str, str]
+    ) -> None:
+        cover_file = MetadataHandler.get_cover(self.opt_output.dir)
+        cover_file_bytes = None
+        if cover_file:
+            with open(cover_file, "rb") as f:
+                cover_file_bytes = f.read()
+        for src in stickers:
+            sticker = self.create_sticker(src, emoji_dict)
+            if sticker is None:
+                continue
+            sticker.id = pack.nb_stickers
             pack._addsticker(sticker)  # type: ignore
 
+            if (
+                cover_file
+                and pack.cover is None
+                and sticker.image_data == cover_file_bytes
+            ):
+                pack.cover = sticker
+
+        if cover_file and pack.cover is None:
+            sticker = self.create_sticker(cover_file, emoji_dict)
+            if sticker is not None:
+                sticker.id = pack.nb_stickers
+                pack.cover = sticker
+
     def upload_stickers_signal(self) -> Tuple[int, int, List[str]]:
         urls: List[str] = []
 

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/src/sticker_convert/version.py

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

{sticker_convert-2.11.2 → sticker_convert-2.11.4/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sticker-convert
-Version: 2.11.2
+Version: 2.11.4
 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>
@@ -379,7 +379,7 @@ Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=11.1.0
 Requires-Dist: pyoxipng~=9.0.0
 Requires-Dist: python-telegram-bot~=21.10
-Requires-Dist: psutil~=6.1.1
+Requires-Dist: psutil~=7.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3
 Requires-Dist: rlottie_python~=1.3.6

{sticker_convert-2.11.2 → sticker_convert-2.11.4}/src/sticker_convert.egg-info/requires.txt

@@ -14,7 +14,7 @@ numpy>=1.22.4
 Pillow~=11.1.0
 pyoxipng~=9.0.0
 python-telegram-bot~=21.10
-psutil~=6.1.1
+psutil~=7.0.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3
 rlottie_python~=1.3.6