sticker-convert 2.7.8__tar.gz → 2.7.9__tar.gz

{sticker-convert-2.7.8/src/sticker_convert.egg-info → sticker-convert-2.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.8
+Version: 2.7.9
 Summary: Convert (animated) stickers to/from WhatsApp, Telegram, Signal, Line, Kakao, iMessage. Written in Python.
 Author-email: laggykiller <chaudominic2@gmail.com>
 Maintainer-email: laggykiller <chaudominic2@gmail.com>
@@ -372,6 +372,7 @@ Requires-Dist: beautifulsoup4~=4.12.3
 Requires-Dist: rookiepy~=0.3.6
 Requires-Dist: imagequant~=1.1.1
 Requires-Dist: memory-tempfile~=2.2.3
+Requires-Dist: mergedeep~=1.3.4
 Requires-Dist: numpy>=1.22.4
 Requires-Dist: Pillow==10.1.0
 Requires-Dist: pyoxipng~=9.0.0
@@ -482,18 +483,19 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,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]
+                          [--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] [--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]
-                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD]
-                          [--signal-get-auth] [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
+                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--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] [--default-emoji DEFAULT_EMOJI]
+                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
+                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
                           [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
                           [--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] [--save-cred SAVE_CRED]
+                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth]  
+                          [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
 
 CLI for stickers-convert
 
@@ -538,7 +540,7 @@ Output options:
 
 Compression options:
   --no-compress         Do not compress files. Useful for only downloading stickers.
-  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}
+  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}        
                         Apply preset for compression.
   --steps STEPS         Set number of divisions between min and max settings.
                         Steps higher = Slower but yields file more closer to the specified file size limit.
@@ -579,6 +581,10 @@ Compression options:
                         Set minimum output duration in miliseconds.
   --duration-max DURATION_MAX
                         Set maximum output duration in miliseconds.
+  --bg-color BG_COLOR   Set custom background color.
+                        Example: 00ff00 for green.
+                        If this is not set, background color would be auto set to black if image is bright, or white if image is dark.
+                        Note: The color should not be visible if output format supports transparency.
   --vid-size-max VID_SIZE_MAX
                         Set maximum file size limit for animated stickers.
   --img-size-max IMG_SIZE_MAX
@@ -622,10 +628,10 @@ Credentials options:
   --telegram-token TELEGRAM_TOKEN
                         Set Telegram token. Required for uploading and downloading Telegram stickers.
   --telegram-userid TELEGRAM_USERID
-                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.
+                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.     
   --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. Kakao username, password, country code and phone number are also required.
+                        Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx        
+  --kakao-get-auth      Generate Kakao auth_token. Kakao username, password, country code and phone number are also required.    
   --kakao-username KAKAO_USERNAME
                         Set Kakao username, which is email or phone number used for signing up Kakao account
                         Example: +447700900142

{sticker-convert-2.7.8 → sticker-convert-2.7.9}/README.md

@@ -96,18 +96,19 @@ usage: sticker-convert.py [-h] [--version] [--no-confirm] [--input-dir INPUT_DIR
                           [--preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,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]
+                          [--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] [--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]
-                          [--default-emoji DEFAULT_EMOJI] [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD]
-                          [--signal-get-auth] [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
+                          [--duration-min DURATION_MIN] [--duration-max DURATION_MAX] [--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] [--default-emoji DEFAULT_EMOJI]
+                          [--signal-uuid SIGNAL_UUID] [--signal-password SIGNAL_PASSWORD] [--signal-get-auth]
+                          [--signal-data-dir SIGNAL_DATA_DIR] [--telegram-token TELEGRAM_TOKEN]
                           [--telegram-userid TELEGRAM_USERID] [--kakao-auth-token KAKAO_AUTH_TOKEN] [--kakao-get-auth]
                           [--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] [--save-cred SAVE_CRED]
+                          [--kakao-country-code KAKAO_COUNTRY_CODE] [--kakao-phone-number KAKAO_PHONE_NUMBER] [--line-get-auth]  
+                          [--line-cookies LINE_COOKIES] [--save-cred SAVE_CRED]
 
 CLI for stickers-convert
 
@@ -152,7 +153,7 @@ Output options:
 
 Compression options:
   --no-compress         Do not compress files. Useful for only downloading stickers.
-  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}
+  --preset {auto,signal,telegram,telegram_emoji,whatsapp,line,kakao,imessage_small,imessage_medium,imessage_large,custom}        
                         Apply preset for compression.
   --steps STEPS         Set number of divisions between min and max settings.
                         Steps higher = Slower but yields file more closer to the specified file size limit.
@@ -193,6 +194,10 @@ Compression options:
                         Set minimum output duration in miliseconds.
   --duration-max DURATION_MAX
                         Set maximum output duration in miliseconds.
+  --bg-color BG_COLOR   Set custom background color.
+                        Example: 00ff00 for green.
+                        If this is not set, background color would be auto set to black if image is bright, or white if image is dark.
+                        Note: The color should not be visible if output format supports transparency.
   --vid-size-max VID_SIZE_MAX
                         Set maximum file size limit for animated stickers.
   --img-size-max IMG_SIZE_MAX
@@ -236,10 +241,10 @@ Credentials options:
   --telegram-token TELEGRAM_TOKEN
                         Set Telegram token. Required for uploading and downloading Telegram stickers.
   --telegram-userid TELEGRAM_USERID
-                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.
+                        Set telegram user_id (From real account, not bot account). Required for uploading Telegram stickers.     
   --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. Kakao username, password, country code and phone number are also required.
+                        Set Kakao auth_token. Required for downloading animated stickers from https://e.kakao.com/t/xxxxx        
+  --kakao-get-auth      Generate Kakao auth_token. Kakao username, password, country code and phone number are also required.    
   --kakao-username KAKAO_USERNAME
                         Set Kakao username, which is email or phone number used for signing up Kakao account
                         Example: +447700900142

{sticker-convert-2.7.8 → sticker-convert-2.7.9}/requirements.txt

@@ -6,6 +6,7 @@ beautifulsoup4~=4.12.3
 rookiepy~=0.3.6
 imagequant~=1.1.1
 memory-tempfile~=2.2.3
+mergedeep~=1.3.4
 numpy>=1.22.4
 Pillow==10.1.0
 pyoxipng~=9.0.0

{sticker-convert-2.7.8 → sticker-convert-2.7.9}/src/sticker_convert/cli.py

@@ -114,6 +114,7 @@ class CLI:
         )
         flags_comp_float = ("fps_power", "res_power", "quality_power", "color_power")
         flags_comp_str = (
+            "bg_color",
             "vid_format",
             "img_format",
             "cache_dir",
@@ -350,6 +351,9 @@ class CLI:
             duration_max=self.compression_presets[preset]["duration"]["max"]
             if args.duration_max is None
             else args.duration_max,
+            bg_color=self.compression_presets[preset]["bg_color"]
+            if args.bg_color is None
+            else args.bg_color,
             steps=self.compression_presets[preset]["steps"]
             if args.steps is None
             else args.steps,

{sticker-convert-2.7.8 → sticker-convert-2.7.9}/src/sticker_convert/converter.py

@@ -526,6 +526,26 @@ class StickerConvert:
         else:
             resample = Image.BICUBIC
 
+        if not self.opt_comp.bg_color:
+            # Calculate average color of all frames for selecting background color
+            frames_raw_np = np.array(self.frames_raw)
+            s = frames_raw_np.shape
+            colors = frames_raw_np.reshape((-1, s[3]))  # type: ignore
+            # Do not count in alpha=0
+            # If alpha > 0, use alpha as weight
+            colors = colors[colors[:, 3] != 0]
+            if colors.shape[0] == 0:
+                bg = (0, 0, 0, 0)
+            else:
+                colors = colors * (colors[3] / 255)
+                if np.mean(colors[:, :3]) < 128:
+                    bg = (255, 255, 255, 0)
+                else:
+                    bg = (0, 0, 0, 0)
+        else:
+            r, g, b = bytes.fromhex(self.opt_comp.bg_color)
+            bg = (r, g, b, 0)
+
         for frame in frames_in:
             with Image.fromarray(frame, "RGBA") as im:  # type: ignore
                 width, height = im.size
@@ -543,10 +563,8 @@ class StickerConvert:
                 width_new = width * self.res_h // height
 
             with im.resize((width_new, height_new), resample=resample) as im_resized:
-                with Image.new(
-                    "RGBA", (self.res_w, self.res_h), (0, 0, 0, 0)
-                ) as im_new:
-                    im_new.paste(
+                with Image.new("RGBA", (self.res_w, self.res_h), bg) as im_new:
+                    im_new.alpha_composite(
                         im_resized,
                         ((self.res_w - width_new) // 2, (self.res_h - height_new) // 2),
                     )

{sticker-convert-2.7.8 → sticker-convert-2.7.9}/src/sticker_convert/gui.py

@@ -12,6 +12,7 @@ from threading import Thread
 from typing import Any, Callable, Dict, Optional, Union
 from urllib.parse import urlparse
 
+from mergedeep import merge  # type: ignore
 from PIL import ImageFont
 from ttkbootstrap import BooleanVar, DoubleVar, IntVar, StringVar, Toplevel, Window  # type: ignore
 from ttkbootstrap.dialogs import Messagebox, Querybox  # type: ignore
@@ -127,6 +128,7 @@ class GUI(Window):
         self.img_size_max_var = IntVar(self)
         self.vid_size_max_var = IntVar(self)
         self.size_disable_var = BooleanVar()
+        self.bg_color_var = StringVar()
         self.img_format_var = StringVar(self)
         self.vid_format_var = StringVar(self)
         self.fake_vid_var = BooleanVar()
@@ -265,7 +267,12 @@ class GUI(Window):
     def save_config(self) -> None:
         # Only update comp_custom if custom preset is selected
         if self.comp_preset_var.get() == "custom":
-            comp_custom = self.get_opt_comp().to_dict()
+            comp_custom: Dict[Any, Any] = merge(  # type: ignore
+                self.compression_presets.get("custom"),  # type: ignore
+                self.get_opt_comp().to_dict(),
+            )
+            comp_custom["format"]["img"] = comp_custom["format"]["img"][0]
+            comp_custom["format"]["vid"] = comp_custom["format"]["vid"][0]
             del comp_custom["preset"]
             del comp_custom["no_compress"]
         else:
@@ -332,7 +339,9 @@ class GUI(Window):
         )
         comp_custom = self.settings.get("comp_custom")
         if comp_custom:
-            self.compression_presets["custom"] = comp_custom
+            self.compression_presets["custom"] = merge(
+                self.compression_presets["custom"], comp_custom
+            )
         self.cache_dir_var.set(self.settings.get("comp", {}).get("cache_dir", ""))
         self.processes_var.set(
             self.settings.get("comp", {}).get("processes", ceil(cpu_count() / 2))
@@ -509,6 +518,7 @@ class GUI(Window):
             duration_max=self.duration_max_var.get()
             if not self.duration_disable_var.get()
             else None,
+            bg_color=self.bg_color_var.get(),
             steps=self.steps_var.get(),
             fake_vid=self.fake_vid_var.get(),
             scale_filter=self.scale_filter_var.get(),

{sticker-convert-2.7.8 → sticker-convert-2.7.9}/src/sticker_convert/gui_components/frames/comp_frame.py

@@ -110,73 +110,33 @@ class CompFrame(LabelFrame):
             else:
                 self.gui.no_compress_var.set(False)
 
-        self.gui.fps_min_var.set(self.gui.compression_presets[selection]["fps"]["min"])
-        self.gui.fps_max_var.set(self.gui.compression_presets[selection]["fps"]["max"])
-        self.gui.fps_power_var.set(
-            self.gui.compression_presets[selection]["fps"]["power"]
-        )
-        self.gui.res_w_min_var.set(
-            self.gui.compression_presets[selection]["res"]["w"]["min"]
-        )
-        self.gui.res_w_max_var.set(
-            self.gui.compression_presets[selection]["res"]["w"]["max"]
-        )
-        self.gui.res_h_min_var.set(
-            self.gui.compression_presets[selection]["res"]["h"]["min"]
-        )
-        self.gui.res_h_max_var.set(
-            self.gui.compression_presets[selection]["res"]["h"]["max"]
-        )
-        self.gui.res_power_var.set(
-            self.gui.compression_presets[selection]["res"]["power"]
-        )
-        self.gui.quality_min_var.set(
-            self.gui.compression_presets[selection]["quality"]["min"]
-        )
-        self.gui.quality_max_var.set(
-            self.gui.compression_presets[selection]["quality"]["max"]
-        )
-        self.gui.quality_power_var.set(
-            self.gui.compression_presets[selection]["quality"]["power"]
-        )
-        self.gui.color_min_var.set(
-            self.gui.compression_presets[selection]["color"]["min"]
-        )
-        self.gui.color_max_var.set(
-            self.gui.compression_presets[selection]["color"]["max"]
-        )
-        self.gui.color_power_var.set(
-            self.gui.compression_presets[selection]["color"]["power"]
-        )
-        self.gui.duration_min_var.set(
-            self.gui.compression_presets[selection]["duration"]["min"]
-        )
-        self.gui.duration_max_var.set(
-            self.gui.compression_presets[selection]["duration"]["max"]
-        )
-        self.gui.img_size_max_var.set(
-            self.gui.compression_presets[selection]["size_max"]["img"]
-        )
-        self.gui.vid_size_max_var.set(
-            self.gui.compression_presets[selection]["size_max"]["vid"]
-        )
-        self.gui.img_format_var.set(
-            self.gui.compression_presets[selection]["format"]["img"]
-        )
-        self.gui.vid_format_var.set(
-            self.gui.compression_presets[selection]["format"]["vid"]
-        )
-        self.gui.fake_vid_var.set(self.gui.compression_presets[selection]["fake_vid"])
-        self.gui.scale_filter_var.set(
-            self.gui.compression_presets[selection]["scale_filter"]
-        )
-        self.gui.quantize_method_var.set(
-            self.gui.compression_presets[selection]["quantize_method"]
-        )
-        self.gui.default_emoji_var.set(
-            self.gui.compression_presets[selection]["default_emoji"]
-        )
-        self.gui.steps_var.set(self.gui.compression_presets[selection]["steps"])
+        preset = self.gui.compression_presets[selection]
+        self.gui.fps_min_var.set(preset.get("fps", {}).get("min"))
+        self.gui.fps_max_var.set(preset.get("fps", {}).get("max"))
+        self.gui.fps_power_var.set(preset.get("fps", {}).get("power"))
+        self.gui.res_w_min_var.set(preset.get("res", {}).get("w", {}).get("min"))
+        self.gui.res_w_max_var.set(preset.get("res", {}).get("w", {}).get("max"))
+        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.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"))
+        self.gui.color_min_var.set(preset.get("color", {}).get("min"))
+        self.gui.color_max_var.set(preset.get("color", {}).get("max"))
+        self.gui.color_power_var.set(preset.get("color", {}).get("power"))
+        self.gui.duration_min_var.set(preset.get("duration", {}).get("min"))
+        self.gui.duration_max_var.set(preset.get("duration", {}).get("max"))
+        self.gui.img_size_max_var.set(preset.get("size_max", {}).get("img"))
+        self.gui.vid_size_max_var.set(preset.get("size_max", {}).get("vid"))
+        self.gui.img_format_var.set(preset.get("format", {}).get("img"))
+        self.gui.vid_format_var.set(preset.get("format", {}).get("vid"))
+        self.gui.bg_color_var.set(preset.get("bg_color"))
+        self.gui.fake_vid_var.set(preset.get("fake_vid"))
+        self.gui.scale_filter_var.set(preset.get("scale_filter"))
+        self.gui.quantize_method_var.set(preset.get("quantize_method"))
+        self.gui.default_emoji_var.set(preset.get("default_emoji"))
+        self.gui.steps_var.set(preset.get("steps"))
 
         self.cb_no_compress()
         self.gui.highlight_fields()