sticker-convert 2.10.2__py3-none-any.whl → 2.10.3__py3-none-any.whl

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

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

{sticker_convert-2.10.2.dist-info → sticker_convert-2.10.3.dist-info}/METADATA

@@ -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.dist-info → sticker_convert-2.10.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
 sticker_convert/__init__.py,sha256=iQnv6UOOA69c3soAn7ZOnAIubTIQSUxtq1Uhh8xRWvU,102
-sticker_convert/__main__.py,sha256=6RJauR-SCSSTT3TU7FFB6B6PVwsCxO2xZXtmZ3jc2Is,463
+sticker_convert/__main__.py,sha256=elDCMvU27letiYs8jPUpxaCq5puURnvcDuqGsAAb6_w,592
 sticker_convert/cli.py,sha256=yI_56AfEi3Q2q8h1p8-l7wSK7wk3ktQNE_rwTAWwW1Q,20526
-sticker_convert/converter.py,sha256=XMiYzIzlcdvx_AFyyk7j-Zdyj3ablLFJFUZ6tjrlGIs,35861
+sticker_convert/converter.py,sha256=ZppZcz6ZCmzx23RjtBWBQ3oLh2fTiPV1U3nEVWHt_xM,35947
 sticker_convert/definitions.py,sha256=ZhP2ALCEud-w9ZZD4c3TDG9eHGPZyaAL7zPUsJAbjtE,2073
-sticker_convert/gui.py,sha256=5mJxeGgmbsniP2fpq5Ow7jNv1BQXFtWwvUyr2KWvBDo,31829
+sticker_convert/gui.py,sha256=9nvxA56m4S_OapRXXJJ-lLR1Boj0s721zfZr51hclPY,33011
 sticker_convert/job.py,sha256=ae0DKz74nctDLSI0VU7BYI4dx3kwTM8ynky_aLspQVU,26491
 sticker_convert/job_option.py,sha256=lhcyioT6qPHrNYRBTv5wxPmmY9RkATo1-DE7-lzCwp0,7887
-sticker_convert/version.py,sha256=MMka4FopHFO0UAth4qBkny-QsgGsAkwDLnB1vTG4lqE,47
+sticker_convert/version.py,sha256=9euJw4TloOUB-GV8lXF8DvHpUBDmFvNbEId1fEPNpWs,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
@@ -105,9 +105,9 @@ sticker_convert/utils/media/apple_png_normalize.py,sha256=LbrQhc7LlYX4I9ek4XJsZE
 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.2.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-sticker_convert-2.10.2.dist-info/METADATA,sha256=dRaXHpGKAHOllhohuhCskDSOMW0ouNp_hkCvFD5UAdU,52542
-sticker_convert-2.10.2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-sticker_convert-2.10.2.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
-sticker_convert-2.10.2.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
-sticker_convert-2.10.2.dist-info/RECORD,,
+sticker_convert-2.10.3.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+sticker_convert-2.10.3.dist-info/METADATA,sha256=cqSne7lAi53NRz4k6MzoVvaG52ETaPnGUcZy4M5ZTu8,52542
+sticker_convert-2.10.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+sticker_convert-2.10.3.dist-info/entry_points.txt,sha256=MNJ7XyC--ugxi5jS1nzjDLGnxCyLuaGdsVLnJhDHCqs,66
+sticker_convert-2.10.3.dist-info/top_level.txt,sha256=r9vfnB0l1ZnH5pTH5RvkobnK3Ow9m0RsncaOMAtiAtk,16
+sticker_convert-2.10.3.dist-info/RECORD,,

{sticker_convert-2.10.2.dist-info → sticker_convert-2.10.3.dist-info}/WHEEL

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