sticker-convert 2.10.2__tar.gz → 2.10.3__tar.gz

{sticker_convert-2.10.2/src/sticker_convert.egg-info → sticker_convert-2.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.10.2
+Version: 2.10.3
 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>
@@ -370,7 +370,7 @@ Requires-Dist: apngasm_python~=1.3.1
 Requires-Dist: av~=12.3.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.5.2
-Requires-Dist: httpx~=0.27.0
+Requires-Dist: httpx~=0.27.2
 Requires-Dist: imagequant~=1.1.1
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
@@ -378,7 +378,7 @@ Requires-Dist: mini-racer~=0.12.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=10.4.0
 Requires-Dist: pyoxipng~=9.0.0
-Requires-Dist: python-telegram-bot~=21.4
+Requires-Dist: python-telegram-bot~=21.5
 Requires-Dist: psutil~=6.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3

{sticker_convert-2.10.2 → sticker_convert-2.10.3}/requirements.txt

@@ -4,7 +4,7 @@ apngasm_python~=1.3.1
 av~=12.3.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.2
-httpx~=0.27.0
+httpx~=0.27.2
 imagequant~=1.1.1
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
@@ -12,7 +12,7 @@ mini-racer~=0.12.4
 numpy>=1.22.4
 Pillow~=10.4.0
 pyoxipng~=9.0.0
-python-telegram-bot~=21.4
+python-telegram-bot~=21.5
 psutil~=6.0.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3

{sticker_convert-2.10.2 → sticker_convert-2.10.3}/src/sticker_convert/__main__.py

@@ -9,6 +9,9 @@ def main() -> None:
 
     multiprocessing.freeze_support()
     print(f"sticker-convert {__version__}")
+    print("Free and Opensource software by laggykiller")
+    print("https://github.com/laggykiller/sticker-convert")
+    print()
     if len(sys.argv) == 1:
         print("Launching GUI...")
         from sticker_convert.gui import GUI

{sticker_convert-2.10.2 → sticker_convert-2.10.3}/src/sticker_convert/converter.py

@@ -324,6 +324,7 @@ class StickerConvert:
 
     def generate_steps_list(self) -> List[Tuple[Optional[int], ...]]:
         steps_list: List[Tuple[Optional[int], ...]] = []
+        need_even = self.out_f.suffix in (".webm", ".mp4", ".mkv", ".webp")
         for step in range(self.opt_comp.steps, -1, -1):
             steps_list.append(
                 (
@@ -333,7 +334,7 @@ class StickerConvert:
                         step,
                         self.opt_comp.steps,
                         self.opt_comp.res_power,
-                        True,
+                        need_even,
                     ),
                     get_step_value(
                         self.opt_comp.res_h_max,
@@ -341,7 +342,7 @@ class StickerConvert:
                         step,
                         self.opt_comp.steps,
                         self.opt_comp.res_power,
-                        True,
+                        need_even,
                     ),
                     get_step_value(
                         self.opt_comp.quality_max,

{sticker_convert-2.10.2 → sticker_convert-2.10.3}/src/sticker_convert/gui.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import locale
 import os
 import platform
 import signal
@@ -9,7 +10,7 @@ from math import ceil
 from multiprocessing import Event, cpu_count
 from pathlib import Path
 from threading import Thread
-from typing import Any, Callable, Dict, Optional, Union
+from typing import Any, Callable, Dict, Optional, Union, cast
 from urllib.parse import urlparse
 
 from mergedeep import merge  # type: ignore
@@ -62,6 +63,7 @@ class GUI(Window):
         self.apply_creds()
         self.init_frames()
         self.pack_frames()
+        self.author_info()
         self.warn_tkinter_bug()
         GUIUtils.finalize_window(self)
 
@@ -206,6 +208,34 @@ class GUI(Window):
             column=0, row=4, columnspan=2, sticky="news", padx=5, pady=5
         )
 
+    def is_cn(self) -> bool:
+        cn_locs = ("zh_CHS", "zh_CN")
+        loc = cast(str, locale.getdefaultlocale()[0])
+        winloc = ""
+        if platform.system() == "Windows":
+            import ctypes
+
+            windll = ctypes.windll.kernel32  # type: ignore
+            winloc_id = cast(int, windll.GetUserDefaultUILanguage())  # type: ignore
+            winloc = cast(str, locale.windows_locale[winloc_id])  # type: ignore
+
+        if loc.startswith(cn_locs) or winloc.startswith(cn_locs):
+            return True
+        return False
+
+    def author_info(self) -> None:
+        if self.is_cn():
+            msg = "sticker-convert是laggykiller创作的免费开源项目，严禁翻售\n"
+            msg += "https://github.com/laggykiller/sticker-convert\n"
+            msg += "尊重知识产权，做个文明人，请不要转售贴图！\n"
+        else:
+            msg = "sticker-convert is Free and Opensource software by laggykiller\n"
+            msg += "https://github.com/laggykiller/sticker-convert\n"
+            msg += "Please use the stickers with your friends only.\n"
+            msg += "It is illegal and immoral to sell stickers downloaded from this program.\n"
+
+        self.cb_msg(msg)
+
     def warn_tkinter_bug(self) -> None:
         if (
             platform.system() == "Darwin"
@@ -215,13 +245,9 @@ class GUI(Window):
             and sys.version_info[2] <= 6
         ):
             msg = "NOTICE: If buttons are not responsive, try to press "
-            msg += "on title bar or move mouse cursor away from window for a while."
-            self.cb_msg(msg)
-            msg = (
-                "(This is due to a bug in tkinter specific to macOS 14 python <=3.11.6)"
-            )
-            self.cb_msg(msg)
-            msg = "(https://github.com/python/cpython/issues/110218)"
+            msg += "on title bar or move mouse cursor away from window for a while.\n"
+            msg += "(This is a bug in tkinter specific to macOS 14 python <=3.11.6)\n"
+            msg += "(https://github.com/python/cpython/issues/110218)\n"
             self.cb_msg(msg)
 
     def load_jsons(self) -> None:

{sticker_convert-2.10.2 → sticker_convert-2.10.3}/src/sticker_convert/version.py

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

{sticker_convert-2.10.2 → sticker_convert-2.10.3/src/sticker_convert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.10.2
+Version: 2.10.3
 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>
@@ -370,7 +370,7 @@ Requires-Dist: apngasm_python~=1.3.1
 Requires-Dist: av~=12.3.0
 Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.5.2
-Requires-Dist: httpx~=0.27.0
+Requires-Dist: httpx~=0.27.2
 Requires-Dist: imagequant~=1.1.1
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
@@ -378,7 +378,7 @@ Requires-Dist: mini-racer~=0.12.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow~=10.4.0
 Requires-Dist: pyoxipng~=9.0.0
-Requires-Dist: python-telegram-bot~=21.4
+Requires-Dist: python-telegram-bot~=21.5
 Requires-Dist: psutil~=6.0.0
 Requires-Dist: PyMemoryEditor~=1.5.22
 Requires-Dist: requests~=2.32.3

{sticker_convert-2.10.2 → sticker_convert-2.10.3}/src/sticker_convert.egg-info/requires.txt

@@ -4,7 +4,7 @@ apngasm_python~=1.3.1
 av~=12.3.0
 beautifulsoup4~=4.12.3
 rookiepy~=0.5.2
-httpx~=0.27.0
+httpx~=0.27.2
 imagequant~=1.1.1
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
@@ -12,7 +12,7 @@ mini-racer~=0.12.4
 numpy>=1.22.4
 Pillow~=10.4.0
 pyoxipng~=9.0.0
-python-telegram-bot~=21.4
+python-telegram-bot~=21.5
 psutil~=6.0.0
 PyMemoryEditor~=1.5.22
 requests~=2.32.3