sticker-convert 2.13.2.2__tar.gz → 2.14.0.0__tar.gz

{sticker_convert-2.13.2.2/src/sticker_convert.egg-info → sticker_convert-2.14.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sticker-convert
-Version: 2.13.2.2
+Version: 2.14.0.0
 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>
@@ -364,27 +364,28 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiolimiter~=1.2.1
-Requires-Dist: anyio~=4.9.0
+Requires-Dist: anyio~=4.10.0
 Requires-Dist: apngasm_python~=1.3.2
-Requires-Dist: av>=13.1.0
-Requires-Dist: beautifulsoup4~=4.13.4
-Requires-Dist: cryptg~=0.5.0.post0
+Requires-Dist: av<15,>=13.1.0
+Requires-Dist: beautifulsoup4~=4.13.5
+Requires-Dist: cryptg~=0.5.1
+Requires-Dist: cryptography~=46.0.1
 Requires-Dist: rookiepy~=0.5.6
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: imagequant~=1.1.4
 Requires-Dist: memory-tempfile~=2.2.3
 Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
-Requires-Dist: Pillow~=11.2.1
-Requires-Dist: pyoxipng~=9.1.0
-Requires-Dist: python-telegram-bot~=22.1
+Requires-Dist: Pillow~=11.3.0
+Requires-Dist: pyoxipng~=9.1.1
+Requires-Dist: python-telegram-bot~=22.4
 Requires-Dist: psutil~=7.0.0
-Requires-Dist: PyMemoryEditor~=1.5.22
+Requires-Dist: PyMemoryEditor~=1.5.24
 Requires-Dist: requests~=2.32.4
-Requires-Dist: rlottie_python~=1.3.7
+Requires-Dist: rlottie_python~=1.3.8
 Requires-Dist: signalstickers-client-fork-laggykiller~=3.3.0.post2
 Requires-Dist: socksio~=1.0.0
-Requires-Dist: telethon~=1.40.0
+Requires-Dist: telethon~=1.41.2
 Requires-Dist: tqdm~=4.67.1
 Requires-Dist: ttkbootstrap-fork-laggykiller~=1.5.1
 Requires-Dist: websocket_client~=1.8.0
@@ -504,20 +505,22 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress] [--cus
                           [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,band,ogq,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}]
                           [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--fps-power FPS_POWER]
-                          [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN]
-                          [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX]
-                          [--quality-power QUALITY_POWER] [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER]
-                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--padding-percent PADDING_PERCENT]
-                          [--bg-color BG_COLOR] [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
-                          [--img-format IMG_FORMAT] [--fake-vid] [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD]
-                          [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH] [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
-                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--telethon-setup] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
-                          [--kakao-get-auth-desktop] [--kakao-bin-path KAKAO_BIN_PATH] [--kakao-username KAKAO_USERNAME]
+                          [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX]
+                          [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--res-snap-pow2]
+                          [--no-res-snap-pow2] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER]
+                          [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER] [--duration-min DURATION_MIN]
+                          [--duration-max DURATION_MAX] [--padding-percent PADDING_PERCENT] [--bg-color BG_COLOR]
+                          [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
+                          [--img-format IMG_FORMAT] [--fake-vid] [--no-fake-vid] [--scale-filter SCALE_FILTER]
+                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH]
+                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD]
+                          [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID] [--telethon-setup]
+                          [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth-android-login] [--kakao-get-auth-desktop-memdump]
+                          [--kakao-get-auth-desktop-login] [--kakao-bin-path KAKAO_BIN_PATH] [--kakao-username KAKAO_USERNAME]
                           [--kakao-password KAKAO_PASSWORD] [--kakao-country-code KAKAO_COUNTRY_CODE]
-                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth] [--line-cookies LINE_COOKIES] [--viber-auth VIBER_AUTH]
-                          [--viber-get-auth VIBER_GET_AUTH] [--viber-bin-path VIBER_BIN_PATH] [--discord-get-auth]
-                          [--discord-token DISCORD_TOKEN] [--save-cred]
+                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--kakao-device-uuid KAKAO_DEVICE_UUID] [--line-get-auth]
+                          [--line-cookies LINE_COOKIES] [--viber-auth VIBER_AUTH] [--viber-get-auth VIBER_GET_AUTH]
+                          [--viber-bin-path VIBER_BIN_PATH] [--discord-get-auth] [--discord-token DISCORD_TOKEN] [--save-cred]
 
 CLI for stickers-convert
 
@@ -619,6 +622,9 @@ Compression options:
                         Between -1 and positive infinity.
                         Power lower = More importance of the parameter,
                         try harder to keep higher and not sacrifice.
+  --res-snap-pow2       Snap resolution to nearest power of 2 (1,2,4,8,16,...).
+                        Ignored if no power of 2 present between minimum and maximum resolutions
+  --no-res-snap-pow2    Disable res_snap_pow2
   --quality-min QUALITY_MIN
                         Set minimum quality.
   --quality-max QUALITY_MAX
@@ -653,6 +659,7 @@ Compression options:
                         Useful if:
                         (1) Size limit for video is larger than image;
                         (2) Mix image and video into same pack.
+  --no-fake-vid         Disable fake_vid
   --scale-filter SCALE_FILTER
                         Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
@@ -663,9 +670,12 @@ Compression options:
                         - lanczos = A high-quality downsampling filter
   --quantize-method QUANTIZE_METHOD
                         Set method for quantizing image. Default as imagequant. Valid options are:
-                        - imagequant = Best quality but slow
-                        - fastoctree = Fast but image looks chunky
+                        - imagequant = Speed+ Compression+ Quality++++ RGBA Supported
+                        - fastoctree = Speed++, Compression++++ Quality+ RGBA Supported
+                        - maxcoverage = Speed+++, Compression+++ Quality++ RGBA unsupported
+                        - mediancut = Speed++++ Compression++ Quality+++ RGBA unsupported
                         - none = No image quantizing, large image size as result
+                        Lower quality would make image chunky
   --cache-dir CACHE_DIR
                         Set custom cache directory.
                         Useful for debugging, or speed up conversion if cache_dir is on RAM disk.
@@ -689,29 +699,35 @@ Credentials options:
   --telethon-setup      Setup Telethon
   --kakao-auth-token KAKAO_AUTH_TOKEN
                         Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx
-  --kakao-get-auth      Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.
-  --kakao-get-auth-desktop
-                        Get Kakao auth_token from Kakao Desktop application.
+  --kakao-get-auth-android-login
+                        Get Kakao auth_token by simulating login from Android. Kakao username, password, country code and phone number required.
+  --kakao-get-auth-desktop-memdump
+                        Get Kakao auth_token from installed Kakao Desktop application with memdump.
+  --kakao-get-auth-desktop-login
+                        Get Kakao auth_token by simulating login from Desktop application. Kakao username and password required.
   --kakao-bin-path KAKAO_BIN_PATH
                         Set Kakao Desktop application path for launching and getting auth_token.
                         Useful for portable installation.
   --kakao-username KAKAO_USERNAME
                         Set Kakao username, which is email or phone number used for signing up Kakao account
                         Example: +447700900142
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android/desktop login.
   --kakao-password KAKAO_PASSWORD
                         Set Kakao password (Password of Kakao account).
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android/desktop login.
   --kakao-country-code KAKAO_COUNTRY_CODE
                         Set Kakao country code of phone.
                         Example: 82 (For korea), 44 (For UK), 1 (For USA).
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android login.
   --kakao-phone-number KAKAO_PHONE_NUMBER
                         Set Kakao phone number (Phone number associated with your Kakao account)
                         Do NOT enter country code
                         Example: 7700900142
                         Used for send / receive verification code via SMS.
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android login.
+  --kakao-device-uuid KAKAO_DEVICE_UUID
+                        Set Kakao device uuid for desktop login. Defaults to real device uuid.
+                        Optional for getting Kakao auth_token by simulating desktop login
   --line-get-auth       Get Line cookies from browser, which is required to create custom message stickers.
   --line-cookies LINE_COOKIES
                         Set Line cookies, which is required to create custom message stickers.

{sticker_convert-2.13.2.2 → sticker_convert-2.14.0.0}/README.md

@@ -112,20 +112,22 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--no-progress] [--cus
                           [--no-compress]
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,band,ogq,viber,discord,discord_emoji,imessage_small,imessage_medium,imessage_large,custom}]
                           [--steps STEPS] [--processes PROCESSES] [--fps-min FPS_MIN] [--fps-max FPS_MAX] [--fps-power FPS_POWER]
-                          [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX] [--res-h-min RES_H_MIN]
-                          [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX]
-                          [--quality-power QUALITY_POWER] [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER]
-                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--padding-percent PADDING_PERCENT]
-                          [--bg-color BG_COLOR] [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
-                          [--img-format IMG_FORMAT] [--fake-vid] [--scale-filter SCALE_FILTER] [--quantize-method QUANTIZE_METHOD]
-                          [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH] [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID]
-                          [--signal-password SIGNAL_PASSWORD] [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN]
-                          [--telegram-userid TELEGRAM_USERID] [--telethon-setup] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
-                          [--kakao-get-auth-desktop] [--kakao-bin-path KAKAO_BIN_PATH] [--kakao-username KAKAO_USERNAME]
+                          [--res-min RES_MIN] [--res-max RES_MAX] [--res-w-min RES_W_MIN] [--res-w-max RES_W_MAX]
+                          [--res-h-min RES_H_MIN] [--res-h-max RES_H_MAX] [--res-power RES_POWER] [--res-snap-pow2]
+                          [--no-res-snap-pow2] [--quality-min QUALITY_MIN] [--quality-max QUALITY_MAX] [--quality-power QUALITY_POWER]
+                          [--color-min COLOR_MIN] [--color-max COLOR_MAX] [--color-power COLOR_POWER] [--duration-min DURATION_MIN]
+                          [--duration-max DURATION_MAX] [--padding-percent PADDING_PERCENT] [--bg-color BG_COLOR]
+                          [--vid-size-max VID_SIZE_MAX] [--img-size-max IMG_SIZE_MAX] [--vid-format VID_FORMAT]
+                          [--img-format IMG_FORMAT] [--fake-vid] [--no-fake-vid] [--scale-filter SCALE_FILTER]
+                          [--quantize-method QUANTIZE_METHOD] [--cache-dir CACHE_DIR] [--chromium-path CHROMIUM_PATH]
+                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD]
+                          [--signal-get-auth] [--telegram-token TELEGRAM_TOKEN] [--telegram-userid TELEGRAM_USERID] [--telethon-setup]
+                          [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth-android-login] [--kakao-get-auth-desktop-memdump]
+                          [--kakao-get-auth-desktop-login] [--kakao-bin-path KAKAO_BIN_PATH] [--kakao-username KAKAO_USERNAME]
                           [--kakao-password KAKAO_PASSWORD] [--kakao-country-code KAKAO_COUNTRY_CODE]
-                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth] [--line-cookies LINE_COOKIES] [--viber-auth VIBER_AUTH]
-                          [--viber-get-auth VIBER_GET_AUTH] [--viber-bin-path VIBER_BIN_PATH] [--discord-get-auth]
-                          [--discord-token DISCORD_TOKEN] [--save-cred]
+                          [--kakao-phone-number KAKAO_PHONE_NUMBER] [--kakao-device-uuid KAKAO_DEVICE_UUID] [--line-get-auth]
+                          [--line-cookies LINE_COOKIES] [--viber-auth VIBER_AUTH] [--viber-get-auth VIBER_GET_AUTH]
+                          [--viber-bin-path VIBER_BIN_PATH] [--discord-get-auth] [--discord-token DISCORD_TOKEN] [--save-cred]
 
 CLI for stickers-convert
 
@@ -227,6 +229,9 @@ Compression options:
                         Between -1 and positive infinity.
                         Power lower = More importance of the parameter,
                         try harder to keep higher and not sacrifice.
+  --res-snap-pow2       Snap resolution to nearest power of 2 (1,2,4,8,16,...).
+                        Ignored if no power of 2 present between minimum and maximum resolutions
+  --no-res-snap-pow2    Disable res_snap_pow2
   --quality-min QUALITY_MIN
                         Set minimum quality.
   --quality-max QUALITY_MAX
@@ -261,6 +266,7 @@ Compression options:
                         Useful if:
                         (1) Size limit for video is larger than image;
                         (2) Mix image and video into same pack.
+  --no-fake-vid         Disable fake_vid
   --scale-filter SCALE_FILTER
                         Set scale filter. Default as bicubic. Valid options are:
                         - nearest = Use nearest neighbour (Suitable for pixel art)
@@ -271,9 +277,12 @@ Compression options:
                         - lanczos = A high-quality downsampling filter
   --quantize-method QUANTIZE_METHOD
                         Set method for quantizing image. Default as imagequant. Valid options are:
-                        - imagequant = Best quality but slow
-                        - fastoctree = Fast but image looks chunky
+                        - imagequant = Speed+ Compression+ Quality++++ RGBA Supported
+                        - fastoctree = Speed++, Compression++++ Quality+ RGBA Supported
+                        - maxcoverage = Speed+++, Compression+++ Quality++ RGBA unsupported
+                        - mediancut = Speed++++ Compression++ Quality+++ RGBA unsupported
                         - none = No image quantizing, large image size as result
+                        Lower quality would make image chunky
   --cache-dir CACHE_DIR
                         Set custom cache directory.
                         Useful for debugging, or speed up conversion if cache_dir is on RAM disk.
@@ -297,29 +306,35 @@ Credentials options:
   --telethon-setup      Setup Telethon
   --kakao-auth-token KAKAO_AUTH_TOKEN
                         Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx
-  --kakao-get-auth      Generate Kakao auth_token by simulating login. Kakao username, password, country code and phone number are also required.
-  --kakao-get-auth-desktop
-                        Get Kakao auth_token from Kakao Desktop application.
+  --kakao-get-auth-android-login
+                        Get Kakao auth_token by simulating login from Android. Kakao username, password, country code and phone number required.
+  --kakao-get-auth-desktop-memdump
+                        Get Kakao auth_token from installed Kakao Desktop application with memdump.
+  --kakao-get-auth-desktop-login
+                        Get Kakao auth_token by simulating login from Desktop application. Kakao username and password required.
   --kakao-bin-path KAKAO_BIN_PATH
                         Set Kakao Desktop application path for launching and getting auth_token.
                         Useful for portable installation.
   --kakao-username KAKAO_USERNAME
                         Set Kakao username, which is email or phone number used for signing up Kakao account
                         Example: +447700900142
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android/desktop login.
   --kakao-password KAKAO_PASSWORD
                         Set Kakao password (Password of Kakao account).
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android/desktop login.
   --kakao-country-code KAKAO_COUNTRY_CODE
                         Set Kakao country code of phone.
                         Example: 82 (For korea), 44 (For UK), 1 (For USA).
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android login.
   --kakao-phone-number KAKAO_PHONE_NUMBER
                         Set Kakao phone number (Phone number associated with your Kakao account)
                         Do NOT enter country code
                         Example: 7700900142
                         Used for send / receive verification code via SMS.
-                        Required for generating Kakao auth_token.
+                        Required for getting Kakao auth_token by simulating android login.
+  --kakao-device-uuid KAKAO_DEVICE_UUID
+                        Set Kakao device uuid for desktop login. Defaults to real device uuid.
+                        Optional for getting Kakao auth_token by simulating desktop login
   --line-get-auth       Get Line cookies from browser, which is required to create custom message stickers.
   --line-cookies LINE_COOKIES
                         Set Line cookies, which is required to create custom message stickers.

{sticker_convert-2.13.2.2 → sticker_convert-2.14.0.0}/requirements.txt

@@ -1,25 +1,26 @@
 aiolimiter~=1.2.1
-anyio~=4.9.0
+anyio~=4.10.0
 apngasm_python~=1.3.2
-av>=13.1.0
-beautifulsoup4~=4.13.4
-cryptg~=0.5.0.post0
+av>=13.1.0,<15
+beautifulsoup4~=4.13.5
+cryptg~=0.5.1
+cryptography~=46.0.1
 rookiepy~=0.5.6
 httpx~=0.28.1
 imagequant~=1.1.4
 memory-tempfile~=2.2.3
 mergedeep~=1.3.4
 numpy>=1.22.4
-Pillow~=11.2.1
-pyoxipng~=9.1.0
-python-telegram-bot~=22.1
+Pillow~=11.3.0
+pyoxipng~=9.1.1
+python-telegram-bot~=22.4
 psutil~=7.0.0
-PyMemoryEditor~=1.5.22
+PyMemoryEditor~=1.5.24
 requests~=2.32.4
-rlottie_python~=1.3.7
+rlottie_python~=1.3.8
 signalstickers-client-fork-laggykiller~=3.3.0.post2
 socksio~=1.0.0
-telethon~=1.40.0
+telethon~=1.41.2
 tqdm~=4.67.1
 ttkbootstrap-fork-laggykiller~=1.5.1
 websocket_client~=1.8.0

{sticker_convert-2.13.2.2 → sticker_convert-2.14.0.0}/src/sticker_convert/cli.py

@@ -15,8 +15,9 @@ from sticker_convert.definitions import CONFIG_DIR, DEFAULT_DIR
 from sticker_convert.job import Job
 from sticker_convert.job_option import CompOption, CredOption, InputOption, OutputOption
 from sticker_convert.utils.auth.get_discord_auth import GetDiscordAuth
-from sticker_convert.utils.auth.get_kakao_auth import GetKakaoAuth
-from sticker_convert.utils.auth.get_kakao_desktop_auth import GetKakaoDesktopAuth
+from sticker_convert.utils.auth.get_kakao_auth_android_login import GetKakaoAuthAndroidLogin
+from sticker_convert.utils.auth.get_kakao_auth_desktop_login import GetKakaoAuthDesktopLogin
+from sticker_convert.utils.auth.get_kakao_auth_desktop_memdump import GetKakaoAuthDesktopMemdump
 from sticker_convert.utils.auth.get_line_auth import GetLineAuth
 from sticker_convert.utils.auth.get_signal_auth import GetSignalAuth
 from sticker_convert.utils.auth.get_viber_auth import GetViberAuth
@@ -141,7 +142,12 @@ class CLI:
             "quantize_method",
             "chromium_path",
         )
-        flags_comp_bool = ("fake_vid",)
+        flags_comp_bool = (
+            "fake_vid",
+            "no_fake_vid",
+            "res_snap_pow2",
+            "no_res_snap_pow2",
+        )
         keyword_args: Dict[str, Any]
         for k, v in self.help["comp"].items():
             if k in flags_comp_int:
@@ -171,8 +177,9 @@ class CLI:
         flags_cred_bool = (
             "signal_get_auth",
             "telethon_setup",
-            "kakao_get_auth",
-            "kakao_get_auth_desktop",
+            "kakao_get_auth_desktop_memdump",
+            "kakao_get_auth_desktop_login",
+            "kakao_get_auth_android_login",
             "line_get_auth",
             "discord_get_auth",
             "save_cred",
@@ -394,6 +401,9 @@ class CLI:
             res_power=self.compression_presets[preset]["res"]["power"]
             if args.res_power is None
             else args.res_power,
+            res_snap_pow2=self.compression_presets[preset]["res"]["snap_pow2"]
+            if args.res_snap_pow2 is None and args.no_res_snap_pow2 is None
+            else args.res_snap_pow2,
             quality_min=self.compression_presets[preset]["quality"]["min"]
             if args.quality_min is None
             else args.quality_min,
@@ -428,7 +438,7 @@ class CLI:
             if args.steps is None
             else args.steps,
             fake_vid=self.compression_presets[preset]["fake_vid"]
-            if args.fake_vid is None
+            if args.fake_vid is None and args.no_fake_vid is None
             else args.fake_vid,
             chromium_path=args.chromium_path,
             cache_dir=args.cache_dir,
@@ -503,28 +513,42 @@ class CLI:
             else creds.get("discord", {}).get("token"),
         )
 
-        if args.kakao_get_auth:
-            get_kakao_auth = GetKakaoAuth(
+        if args.kakao_get_auth_android_login:
+            get_kakao_auth_android_login = GetKakaoAuthAndroidLogin(
                 opt_cred=opt_cred,
                 cb_msg=self.cb.msg,
                 cb_msg_block=self.cb.msg_block,
                 cb_ask_str=self.cb.ask_str,
             )
-            auth_token = get_kakao_auth.get_cred()
+            auth_token = get_kakao_auth_android_login.get_cred()
 
             if auth_token:
                 opt_cred.kakao_auth_token = auth_token
 
                 self.cb.msg(f"Got auth_token successfully: {auth_token}")
 
-        if args.kakao_get_auth_desktop:
-            get_kakao_desktop_auth = GetKakaoDesktopAuth(
+        if args.kakao_get_auth_desktop_memdump:
+            get_kakao_auth_desktop_memdump = GetKakaoAuthDesktopMemdump(
                 cb_ask_str=self.cb.ask_str,
             )
             kakao_bin_path = None
             if args.kakao_bin_path:
                 kakao_bin_path = args.kakao_bin_path
-            auth_token, msg = get_kakao_desktop_auth.get_cred(kakao_bin_path)
+            auth_token, msg = get_kakao_auth_desktop_memdump.get_cred(kakao_bin_path)
+
+            if auth_token:
+                opt_cred.kakao_auth_token = auth_token
+
+            self.cb.msg(msg)
+
+        if args.kakao_get_auth_desktop_login:
+            get_kakao_auth_desktop_login = GetKakaoAuthDesktopLogin(
+                opt_cred=opt_cred,
+                cb_msg=self.cb.msg,
+                cb_msg_block=self.cb.msg_block,
+                cb_ask_str=self.cb.ask_str,
+            )
+            auth_token, msg = get_kakao_auth_desktop_login.get_cred()
 
             if auth_token:
                 opt_cred.kakao_auth_token = auth_token

{sticker_convert-2.13.2.2 → sticker_convert-2.14.0.0}/src/sticker_convert/converter.py

@@ -3,7 +3,7 @@ import json
 import os
 from fractions import Fraction
 from io import BytesIO
-from math import ceil, floor
+from math import ceil, floor, log2
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
@@ -57,6 +57,7 @@ def get_step_value(
     steps: int,
     power: float = 1.0,
     even: bool = False,
+    snap_pow2: bool = False,
 ) -> Optional[int]:
     # Power should be between -1 and positive infinity
     # Smaller power = More 'importance' of the parameter
@@ -70,6 +71,15 @@ def get_step_value(
 
     if max_step is not None and min_step is not None:
         v = round((max_step - min_step) * step / steps * factor + min_step)
+        if snap_pow2 is True and floor(log2(max_step)) >= ceil(log2(min_step)):
+            lower_exp = max(floor(log2(v)), ceil(log2(min_step)))
+            lower_pow2 = 2**lower_exp
+            upper_exp = min(ceil(log2(v)), floor(log2(max_step)))
+            upper_pow2 = 2**upper_exp
+            if abs(v - lower_pow2) <= abs(v - upper_pow2):
+                return lower_pow2
+            else:
+                return upper_pow2
         if even is True and v % 2 == 1:
             return v + 1
         return v
@@ -101,10 +111,10 @@ def yuva_to_rgba(frame: "VideoFrame") -> "np.ndarray[Any, Any]":
     u = u.repeat(2, axis=0).repeat(2, axis=1)
     v = v.repeat(2, axis=0).repeat(2, axis=1)
 
-    y = y.reshape((y.shape[0], y.shape[1], 1))
-    u = u.reshape((u.shape[0], u.shape[1], 1))
-    v = v.reshape((v.shape[0], v.shape[1], 1))
-    a = a.reshape((a.shape[0], a.shape[1], 1))
+    y = y.reshape((y.shape[0], y.shape[1], 1))  # type: ignore
+    u = u.reshape((u.shape[0], u.shape[1], 1))  # type: ignore
+    v = v.reshape((v.shape[0], v.shape[1], 1))  # type: ignore
+    a = a.reshape((a.shape[0], a.shape[1], 1))  # type: ignore
 
     yuv_array = np.concatenate((y, u, v), axis=2)
 
@@ -342,6 +352,7 @@ class StickerConvert:
                         self.opt_comp.steps,
                         self.opt_comp.res_power,
                         need_even,
+                        self.opt_comp.res_snap_pow2,
                     ),
                     get_step_value(
                         self.opt_comp.res_h_max,
@@ -350,6 +361,7 @@ class StickerConvert:
                         self.opt_comp.steps,
                         self.opt_comp.res_power,
                         need_even,
+                        self.opt_comp.res_snap_pow2,
                     ),
                     get_step_value(
                         self.opt_comp.quality_max,
@@ -932,13 +944,19 @@ class StickerConvert:
             self.tmp_f.write(frame_optimized)
 
     def _frames_export_apng(self) -> None:
-        from apngasm_python._apngasm_python import APNGAsm, create_frame_from_rgba  # type: ignore
+        from apngasm_python._apngasm_python import APNGAsm, create_frame_from_rgb, create_frame_from_rgba  # type: ignore
 
         assert self.fps
         assert self.res_h
 
         frames_concat = np.concatenate(self.frames_processed)
         with Image.fromarray(frames_concat, "RGBA") as image_concat:  # type: ignore
+            if image_concat.getextrema()[3][0] < 255:  # type: ignore
+                mode = "RGBA"
+                create_frame_method = create_frame_from_rgba
+            else:
+                mode = "RGB"
+                create_frame_method = create_frame_from_rgb
             image_quant = self.quantize(image_concat)
 
         if self.apngasm is None:
@@ -947,15 +965,10 @@ class StickerConvert:
 
         delay_num = int(1000 / self.fps)
         for i in range(0, image_quant.height, self.res_h):
-            with BytesIO() as f:
-                crop_dimension = (0, i, image_quant.width, i + self.res_h)
-                image_cropped = image_quant.crop(crop_dimension)
-                image_cropped.save(f, format="png")
-                f.seek(0)
-                frame_optimized = self.optimize_png(f.read())
-            with Image.open(BytesIO(frame_optimized)) as im:
-                image_final = im.convert("RGBA")
-            frame_final = create_frame_from_rgba(
+            crop_dimension = (0, i, image_quant.width, i + self.res_h)
+            image_cropped = image_quant.crop(crop_dimension)
+            image_final = image_cropped.convert(mode)
+            frame_final = create_frame_method(
                 np.array(image_final),
                 width=image_final.width,
                 height=image_final.height,
@@ -969,7 +982,8 @@ class StickerConvert:
             self.apngasm.assemble(tmp_apng.as_posix())
 
             with open(tmp_apng, "rb") as f:
-                self.tmp_f.write(f.read())
+                apng_optimized = self.optimize_png(f.read())
+                self.tmp_f.write(apng_optimized)
 
         self.apngasm.reset()
 
@@ -978,7 +992,7 @@ class StickerConvert:
 
         return oxipng.optimize_from_memory(
             image_bytes,
-            level=4,
+            level=6,
             fix_errors=True,
             filter=[oxipng.RowFilter.Brute],
             optimize_alpha=True,
@@ -990,8 +1004,8 @@ class StickerConvert:
             return image.copy()
         if self.opt_comp.quantize_method == "imagequant":
             return self._quantize_by_imagequant(image)
-        if self.opt_comp.quantize_method == "fastoctree":
-            return self._quantize_by_fastoctree(image)
+        if self.opt_comp.quantize_method in ("mediancut", "maxcoverage", "fastoctree"):
+            return self._quantize_by_pillow(image)
 
         return image
 
@@ -1022,10 +1036,24 @@ class StickerConvert:
 
         return image
 
-    def _quantize_by_fastoctree(self, image: Image.Image) -> Image.Image:
+    def _quantize_by_pillow(self, image: Image.Image) -> Image.Image:
         assert self.color
 
-        return image.quantize(colors=self.color, method=2)
+        if image.mode == "RGBA" and self.opt_comp.quantize_method in (
+            "mediancut",
+            "maxcoverage",
+        ):
+            self.cb.put(
+                f"[W] {self.opt_comp.quantize_method} does not support RGBA, defaulted to fastoctree quantization"
+            )
+            method = Image.Quantize.FASTOCTREE
+        elif self.opt_comp.quantize_method == "mediancut":
+            method = Image.Quantize.MEDIANCUT
+        elif self.opt_comp.quantize_method == "maxcoverage":
+            method = Image.Quantize.MAXCOVERAGE
+        else:
+            method = Image.Quantize.FASTOCTREE
+        return image.quantize(colors=self.color, method=method)
 
     def fix_fps(self, fps: float) -> Fraction:
         # After rounding fps/duration during export,

{sticker_convert-2.13.2.2 → sticker_convert-2.14.0.0}/src/sticker_convert/gui.py

@@ -116,6 +116,7 @@ class GUI(Window):
         self.res_h_max_var = IntVar(self)
         self.res_h_disable_var = BooleanVar()
         self.res_power_var = DoubleVar()
+        self.res_snap_pow2_var = BooleanVar()
         self.quality_min_var = IntVar(self)
         self.quality_max_var = IntVar(self)
         self.quality_disable_var = BooleanVar()
@@ -162,6 +163,7 @@ class GUI(Window):
         self.kakao_password_var = StringVar(self)
         self.kakao_country_code_var = StringVar(self)
         self.kakao_phone_number_var = StringVar(self)
+        self.kakao_device_uuid_var = StringVar(self)
         self.kakao_bin_path_var = StringVar(self)
         self.line_cookies_var = StringVar(self)
         self.viber_auth_var = StringVar(self)
@@ -426,6 +428,9 @@ class GUI(Window):
         self.kakao_phone_number_var.set(
             self.creds.get("kakao", {}).get("phone_number", "")
         )
+        self.kakao_device_uuid_var.set(
+            self.creds.get("kakao", {}).get("device_uuid", "")
+        )
         self.line_cookies_var.set(self.creds.get("line", {}).get("cookies", ""))
         self.viber_auth_var.set(self.creds.get("viber", {}).get("auth", ""))
         self.discord_token_var.set(self.creds.get("discord", {}).get("token", ""))
@@ -547,6 +552,7 @@ class GUI(Window):
             if not self.res_h_disable_var.get()
             else None,
             res_power=self.res_power_var.get(),
+            res_snap_pow2=self.res_snap_pow2_var.get(),
             quality_min=self.quality_min_var.get()
             if not self.quality_disable_var.get()
             else None,
@@ -597,6 +603,7 @@ class GUI(Window):
             kakao_password=self.kakao_password_var.get(),
             kakao_country_code=self.kakao_country_code_var.get(),
             kakao_phone_number=self.kakao_phone_number_var.get(),
+            kakao_device_uuid=self.kakao_device_uuid_var.get(),
             line_cookies=self.line_cookies_var.get(),
             viber_auth=self.viber_auth_var.get(),
             discord_token=self.discord_token_var.get(),

{sticker_convert-2.13.2.2 → sticker_convert-2.14.0.0}/src/sticker_convert/gui_components/frames/comp_frame.py

@@ -119,6 +119,7 @@ class CompFrame(LabelFrame):
         self.gui.res_h_min_var.set(preset.get("res", {}).get("h", {}).get("min"))
         self.gui.res_h_max_var.set(preset.get("res", {}).get("h", {}).get("max"))
         self.gui.res_power_var.set(preset.get("res", {}).get("power"))
+        self.gui.res_snap_pow2_var.set(preset.get("res", {}).get("snap_pow2"))
         self.gui.quality_min_var.set(preset.get("quality", {}).get("min"))
         self.gui.quality_max_var.set(preset.get("quality", {}).get("max"))
         self.gui.quality_power_var.set(preset.get("quality", {}).get("power"))