sticker-convert 2.7.2__py3-none-any.whl → 2.7.4__py3-none-any.whl

sticker_convert/resources/emoji.json

@@ -640,6 +640,19 @@
   , "unicode_version": "9.0"
   , "ios_version": "10.2"
   }
+, {
+    "emoji": "🫨"
+  , "description": "shaking face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "shaking_face"
+    ]
+  , "tags": [
+      "shock"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "😌"
   , "description": "relieved face"
@@ -1302,7 +1315,7 @@
   }
 , {
     "emoji": "😡"
-  , "description": "pouting face"
+  , "description": "enraged face"
   , "category": "Smileys & Emotion"
   , "aliases": [
       "rage"
@@ -1660,19 +1673,6 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
-, {
-    "emoji": "💋"
-  , "description": "kiss mark"
-  , "category": "Smileys & Emotion"
-  , "aliases": [
-      "kiss"
-    ]
-  , "tags": [
-      "lipstick"
-    ]
-  , "unicode_version": "6.0"
-  , "ios_version": "6.0"
-  }
 , {
     "emoji": "💌"
   , "description": "love letter"
@@ -1847,6 +1847,18 @@
   , "unicode_version": ""
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🩷"
+  , "description": "pink heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "pink_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "🧡"
   , "description": "orange heart"
@@ -1895,6 +1907,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🩵"
+  , "description": "light blue heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "light_blue_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "💜"
   , "description": "purple heart"
@@ -1931,6 +1955,18 @@
   , "unicode_version": "9.0"
   , "ios_version": "10.2"
   }
+, {
+    "emoji": "🩶"
+  , "description": "grey heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "grey_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "🤍"
   , "description": "white heart"
@@ -1943,6 +1979,19 @@
   , "unicode_version": "12.0"
   , "ios_version": "13.0"
   }
+, {
+    "emoji": "💋"
+  , "description": "kiss mark"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kiss"
+    ]
+  , "tags": [
+      "lipstick"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
 , {
     "emoji": "💯"
   , "description": "hundred points"
@@ -2038,19 +2087,6 @@
   , "unicode_version": "7.0"
   , "ios_version": "9.1"
   }
-, {
-    "emoji": "💣"
-  , "description": "bomb"
-  , "category": "Smileys & Emotion"
-  , "aliases": [
-      "bomb"
-    ]
-  , "tags": [
-      "boom"
-    ]
-  , "unicode_version": "6.0"
-  , "ios_version": "6.0"
-  }
 , {
     "emoji": "💬"
   , "description": "speech balloon"
@@ -2115,7 +2151,7 @@
   }
 , {
     "emoji": "💤"
-  , "description": "zzz"
+  , "description": "ZZZ"
   , "category": "Smileys & Emotion"
   , "aliases": [
       "zzz"
@@ -2249,6 +2285,32 @@
   , "ios_version": "15.4"
   , "skin_tones": true
   }
+, {
+    "emoji": "🫷"
+  , "description": "leftwards pushing hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "leftwards_pushing_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🫸"
+  , "description": "rightwards pushing hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "rightwards_pushing_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  , "skin_tones": true
+  }
 , {
     "emoji": "👌"
   , "description": "OK hand"
@@ -6416,7 +6478,7 @@
     ]
   , "unicode_version": "12.0"
   , "ios_version": "13.0"
-  , "skin_tones": false
+  , "skin_tones": true
   }
 , {
     "emoji": "👭"
@@ -7190,6 +7252,32 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🫎"
+  , "description": "moose"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "moose"
+    ]
+  , "tags": [
+      "canada"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
+, {
+    "emoji": "🫏"
+  , "description": "donkey"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "donkey"
+    ]
+  , "tags": [
+      "mule"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "🐎"
   , "description": "horse"
@@ -7941,6 +8029,44 @@
   , "unicode_version": "11.0"
   , "ios_version": "12.1"
   }
+, {
+    "emoji": "🪽"
+  , "description": "wing"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "wing"
+    ]
+  , "tags": [
+      "fly"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
+, {
+    "emoji": "🐦‍⬛"
+  , "description": "black bird"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "black_bird"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
+, {
+    "emoji": "🪿"
+  , "description": "goose"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "goose"
+    ]
+  , "tags": [
+      "honk"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "🐸"
   , "description": "frog"
@@ -8188,6 +8314,18 @@
   , "unicode_version": "14.0"
   , "ios_version": "15.4"
   }
+, {
+    "emoji": "🪼"
+  , "description": "jellyfish"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "jellyfish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "🐌"
   , "description": "snail"
@@ -8521,6 +8659,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪻"
+  , "description": "hyacinth"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hyacinth"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "🌱"
   , "description": "seedling"
@@ -8708,6 +8858,19 @@
   , "unicode_version": "14.0"
   , "ios_version": "15.4"
   }
+, {
+    "emoji": "🍄"
+  , "description": "mushroom"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "mushroom"
+    ]
+  , "tags": [
+      "fungus"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
 , {
     "emoji": "🍇"
   , "description": "grapes"
@@ -9088,18 +9251,6 @@
   , "unicode_version": "12.0"
   , "ios_version": "13.0"
   }
-, {
-    "emoji": "🍄"
-  , "description": "mushroom"
-  , "category": "Food & Drink"
-  , "aliases": [
-      "mushroom"
-    ]
-  , "tags": [
-    ]
-  , "unicode_version": "6.0"
-  , "ios_version": "6.0"
-  }
 , {
     "emoji": "🥜"
   , "description": "peanuts"
@@ -9136,6 +9287,30 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🫚"
+  , "description": "ginger root"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "ginger_root"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
+, {
+    "emoji": "🫛"
+  , "description": "pea pod"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pea_pod"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "🍞"
   , "description": "bread"
@@ -13727,6 +13902,20 @@
   , "unicode_version": "12.0"
   , "ios_version": "13.0"
   }
+, {
+    "emoji": "🔫"
+  , "description": "water pistol"
+  , "category": "Activities"
+  , "aliases": [
+      "gun"
+    ]
+  , "tags": [
+      "shoot"
+    , "weapon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
 , {
     "emoji": "🎱"
   , "description": "pool 8 ball"
@@ -13766,30 +13955,6 @@
   , "unicode_version": "13.0"
   , "ios_version": "14.0"
   }
-, {
-    "emoji": "🧿"
-  , "description": "nazar amulet"
-  , "category": "Activities"
-  , "aliases": [
-      "nazar_amulet"
-    ]
-  , "tags": [
-    ]
-  , "unicode_version": "11.0"
-  , "ios_version": "12.1"
-  }
-, {
-    "emoji": "🪬"
-  , "description": "hamsa"
-  , "category": "Activities"
-  , "aliases": [
-      "hamsa"
-    ]
-  , "tags": [
-    ]
-  , "unicode_version": "14.0"
-  , "ios_version": "15.4"
-  }
 , {
     "emoji": "🎮"
   , "description": "video game"
@@ -14335,6 +14500,19 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪭"
+  , "description": "folding hand fan"
+  , "category": "Objects"
+  , "aliases": [
+      "folding_hand_fan"
+    ]
+  , "tags": [
+      "sensu"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "👛"
   , "description": "purse"
@@ -14512,6 +14690,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪮"
+  , "description": "hair pick"
+  , "category": "Objects"
+  , "aliases": [
+      "hair_pick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "👑"
   , "description": "crown"
@@ -14999,6 +15189,32 @@
   , "unicode_version": "13.0"
   , "ios_version": "14.0"
   }
+, {
+    "emoji": "🪇"
+  , "description": "maracas"
+  , "category": "Objects"
+  , "aliases": [
+      "maracas"
+    ]
+  , "tags": [
+      "shaker"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
+, {
+    "emoji": "🪈"
+  , "description": "flute"
+  , "category": "Objects"
+  , "aliases": [
+      "flute"
+    ]
+  , "tags": [
+      "recorder"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "📱"
   , "description": "mobile phone"
@@ -16490,15 +16706,14 @@
   , "ios_version": "9.1"
   }
 , {
-    "emoji": "🔫"
-  , "description": "water pistol"
+    "emoji": "💣"
+  , "description": "bomb"
   , "category": "Objects"
   , "aliases": [
-      "gun"
+      "bomb"
     ]
   , "tags": [
-      "shoot"
-    , "weapon"
+      "boom"
     ]
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
@@ -17239,6 +17454,30 @@
   , "unicode_version": "4.1"
   , "ios_version": "9.1"
   }
+, {
+    "emoji": "🧿"
+  , "description": "nazar amulet"
+  , "category": "Objects"
+  , "aliases": [
+      "nazar_amulet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🪬"
+  , "description": "hamsa"
+  , "category": "Objects"
+  , "aliases": [
+      "hamsa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "14.0"
+  , "ios_version": "15.4"
+  }
 , {
     "emoji": "🗿"
   , "description": "moai"
@@ -17995,6 +18234,18 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🪯"
+  , "description": "khanda"
+  , "category": "Symbols"
+  , "aliases": [
+      "khanda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "♈"
   , "description": "Aries"
@@ -18420,6 +18671,19 @@
   , "unicode_version": "6.0"
   , "ios_version": "6.0"
   }
+, {
+    "emoji": "🛜"
+  , "description": "wireless"
+  , "category": "Symbols"
+  , "aliases": [
+      "wireless"
+    ]
+  , "tags": [
+      "wifi"
+    ]
+  , "unicode_version": "15.0"
+  , "ios_version": "16.4"
+  }
 , {
     "emoji": "📳"
   , "description": "vibration mode"

sticker_convert/resources/help.json

@@ -45,7 +45,7 @@
         "vid_format": "Set file format if input is animated.",
         "img_format": "Set file format if input is static.",
         "fake_vid": "Convert (faking) image to video.\nUseful if:\n(1) Size limit for video is larger than image;\n(2) Mix image and video into same pack.",
-        "scale_filter": "Set scale filter. Default as lanczos. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n- bilinear = linear interpolation\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
+        "scale_filter": "Set scale filter. Default as lanczos. Valid options are:\n- nearest = Use nearest neighbour (Suitable for pixel art)\n-box = Similar to nearest, but better downscaling\n- bilinear = Linear interpolation\n- hamming = Similar to bilinear, but better downscaling\n- bicubic = Cubic spline interpolation\n- lanczos = A high-quality downsampling filter",
         "quantize_method": "Set method for quantizing image. Default as imagequant. Valid options are:\n- imagequant = Best quality but slow\n- fastoctree = Fast but image looks chunky\n- none = No image quantizing, large image size as result",
         "cache_dir": "Set custom cache directory.\nUseful for debugging, or speed up conversion if cache_dir is on RAM disk.",
         "default_emoji": "Set the default emoji for uploading Signal and Telegram sticker packs."

sticker_convert/uploaders/compress_wastickers.py

@@ -4,12 +4,12 @@ import shutil
 import zipfile
 from pathlib import Path
 from queue import Queue
-from typing import Any, Optional, Union
+from typing import Any, List, Union
 
 from sticker_convert.converter import StickerConvert
 from sticker_convert.job_option import CompOption, CredOption, OutputOption
 from sticker_convert.uploaders.upload_base import UploadBase
-from sticker_convert.utils.callback import Callback, CallbackReturn
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
 from sticker_convert.utils.files.cache_store import CacheStore
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.files.sanitize_filename import sanitize_filename
@@ -18,17 +18,15 @@ from sticker_convert.utils.media.format_verify import FormatVerify
 
 
 class CompressWastickers(UploadBase):
-    def __init__(self, *args: Any, **kwargs: Any):
-        super(CompressWastickers, self).__init__(*args, **kwargs)
-        base_spec = CompOption(
-            size_max_img=100000,
-            size_max_vid=500000,
-            duration_min=8,
-            duration_max=10000,
-            square=True,
-        )
-        base_spec.set_res(512)
-        base_spec.set_format((".webp",))
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.base_spec.size_max_img = 100000
+        self.base_spec.size_max_vid = 500000
+        self.base_spec.duration_min = 8
+        self.base_spec.duration_max = 10000
+        self.base_spec.square = True
+        self.base_spec.set_res(512)
+        self.base_spec.set_format((".webp",))
 
         self.spec_cover = CompOption(
             size_max_img=50000,
@@ -40,19 +38,19 @@ class CompressWastickers(UploadBase):
         self.spec_cover.set_fps(0)
         self.spec_cover.set_format((".png",))
 
-        self.webp_spec = copy.deepcopy(base_spec)
+        self.webp_spec = copy.deepcopy(self.base_spec)
         self.webp_spec.set_format((".webp",))
         self.webp_spec.animated = None if self.opt_comp.fake_vid else True
 
-        self.png_spec = copy.deepcopy(base_spec)
+        self.png_spec = copy.deepcopy(self.base_spec)
         self.png_spec.set_format((".png",))
         self.png_spec.animated = False
 
         self.opt_comp_merged = copy.deepcopy(self.opt_comp)
-        self.opt_comp_merged.merge(base_spec)
+        self.opt_comp_merged.merge(self.base_spec)
 
-    def compress_wastickers(self) -> list[str]:
-        urls: list[str] = []
+    def compress_wastickers(self) -> List[str]:
+        urls: List[str] = []
         title, author, _ = MetadataHandler.get_metadata(
             self.opt_output.dir,
             title=self.opt_output.title,
@@ -112,7 +110,7 @@ class CompressWastickers(UploadBase):
 
         return urls
 
-    def add_metadata(self, pack_dir: Path, title: str, author: str):
+    def add_metadata(self, pack_dir: Path, title: str, author: str) -> None:
         opt_comp_merged = copy.deepcopy(self.opt_comp)
         opt_comp_merged.merge(self.spec_cover)
 
@@ -152,17 +150,8 @@ class CompressWastickers(UploadBase):
         opt_output: OutputOption,
         opt_comp: CompOption,
         opt_cred: CredOption,
-        cb: Union[
-            Queue[
-                Union[
-                    tuple[str, Optional[tuple[str]], Optional[dict[str, str]]],
-                    str,
-                    None,
-                ]
-            ],
-            Callback,
-        ],
+        cb: "Union[Queue[CbQueueItemType], Callback]",
         cb_return: CallbackReturn,
-    ) -> list[str]:
+    ) -> List[str]:
         exporter = CompressWastickers(opt_output, opt_comp, opt_cred, cb, cb_return)
         return exporter.compress_wastickers()