sticker-convert 2.8.12__py3-none-any.whl → 2.17.0.0__py3-none-any.whl

sticker_convert/utils/emoji.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+from typing import Callable, List, Sequence, Set
+
+from ugrapheme import graphemes  # type: ignore
+
+from sticker_convert.utils.files.json_resources_loader import load_resource_json
+
+graphemes: Callable[[str], Sequence[str]]  # type: ignore
+
+
+# https://stackoverflow.com/a/480227
+# Return list of unique items of list while preserve order
+def uniques(seq: List[str]):
+    seen: Set[str] = set()
+    seen_add = seen.add
+    return [x for x in seq if not (x in seen or seen_add(x))]
+
+
+def get_emoji_list() -> List[str]:
+    return [i["emoji"] for i in load_resource_json("emoji")]
+
+
+EMOJI_LIST = get_emoji_list()
+
+
+# https://stackoverflow.com/a/43146653
+def extract_emojis(s: str) -> str:
+    return "".join(uniques(list(c for c in graphemes(s) if c in EMOJI_LIST)))

sticker_convert/utils/files/json_resources_loader.py

@@ -1,27 +1,32 @@
-from typing import Any, Dict
+#!/usr/bin/env python3
+from typing import Any, Dict, cast
 
 from mergedeep import merge  # type: ignore
 
-from sticker_convert.definitions import CONFIG_DIR, ROOT_DIR
+from sticker_convert.definitions import CONFIG_DIR, ROOT_DIR, RUNTIME_STATE
 from sticker_convert.utils.files.json_manager import JsonManager
 
 
-def _load_compression() -> Dict[Any, Any]:
-    compression_json = JsonManager.load_json(ROOT_DIR / "resources/compression.json")
-    custom_preset_json_path = CONFIG_DIR / "custom_preset.json"
-    if custom_preset_json_path.exists():
-        custom_preset_json = JsonManager.load_json(custom_preset_json_path)
-        compression_json: Dict[Any, Any] = merge(  # type: ignore
-            compression_json,  # type: ignore
-            custom_preset_json,
-        )
-    return compression_json
+def load_resource_json(json_name: str) -> Dict[Any, Any]:
+    if RUNTIME_STATE.get(f"{json_name}_json") is not None:
+        return cast(Dict[Any, Any], RUNTIME_STATE[f"{json_name}_json"])
+    else:
+        loaded_json = JsonManager.load_json(ROOT_DIR / f"resources/{json_name}.json")
 
+        json_to_merge = None
+        lang = RUNTIME_STATE["LANG"]
+        if lang != "en_US":
+            # Translated json
+            json_to_merge = ROOT_DIR / f"resources/{json_name}.{lang}.json"
+        if json_name == "compression":
+            # Custom preset json
+            json_to_merge = CONFIG_DIR / "custom_preset.json"
 
-HELP_JSON: Dict[str, Dict[str, str]] = JsonManager.load_json(
-    ROOT_DIR / "resources/help.json"
-)
-INPUT_JSON = JsonManager.load_json(ROOT_DIR / "resources/input.json")
-COMPRESSION_JSON = _load_compression()
-OUTPUT_JSON = JsonManager.load_json(ROOT_DIR / "resources/output.json")
-EMOJI_JSON = JsonManager.load_json(ROOT_DIR / "resources/emoji.json")
+        if json_to_merge and json_to_merge.exists():
+            custom_preset_json = JsonManager.load_json(json_to_merge)
+            loaded_json: Dict[Any, Any] = merge(  # type: ignore
+                loaded_json,  # type: ignore
+                custom_preset_json,
+            )
+        RUNTIME_STATE[f"{json_name}_json"] = loaded_json
+        return loaded_json

sticker_convert/utils/files/metadata_handler.py

@@ -5,7 +5,7 @@ import json
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple
 
-from sticker_convert.utils.files.json_resources_loader import INPUT_JSON, OUTPUT_JSON
+from sticker_convert.utils.files.json_resources_loader import load_resource_json
 from sticker_convert.utils.media.codec_info import CodecInfo
 
 RELATED_EXTENSIONS = (
@@ -17,6 +17,7 @@ RELATED_EXTENSIONS = (
     ".tgs",
     ".lottie",
     ".json",
+    ".svg",
     ".mp4",
     ".mkv",
     ".mov",
@@ -37,7 +38,7 @@ RELATED_NAME = (
 )
 
 BLACKLIST_PREFIX = ("cover",)
-BLACKLIST_SUFFIX = (".txt", ".m4a", ".wastickers", ".DS_Store", "._.DS_Store")
+BLACKLIST_SUFFIX = (".txt", ".m4a", ".wastickers", ".zip", ".DS_Store", "._.DS_Store")
 
 XCODE_IMESSAGE_ICONSET = {
     "App-Store-1024x1024pt.png": (1024, 1024),
@@ -165,7 +166,7 @@ class MetadataHandler:
         Does not check if metadata provided via user input in GUI or flag options
         metadata = 'title' or 'author'
         """
-        input_presets = INPUT_JSON
+        input_presets = load_resource_json("input")
         assert input_presets
 
         if input_option == "local":
@@ -184,7 +185,7 @@ class MetadataHandler:
     @staticmethod
     def check_metadata_required(output_option: str, metadata: str) -> bool:
         # metadata = 'title' or 'author'
-        output_presets = OUTPUT_JSON
+        output_presets = load_resource_json("output")
         assert output_presets
         return output_presets[output_option]["metadata_requirements"][metadata]
 
@@ -264,7 +265,7 @@ class MetadataHandler:
                 if len(anim_stickers) == file_per_anim_pack or (
                     finished_all and len(anim_stickers) > 0
                 ):
-                    suffix = f'{"-anim" if image_present else ""}{"-" + str(anim_pack_count) if anim_pack_count > 0 else ""}'
+                    suffix = f"{'-anim' if image_present else ''}{'-' + str(anim_pack_count) if anim_pack_count > 0 else ''}"
                     title_current = str(title) + suffix
                     packs[title_current] = anim_stickers.copy()
                     anim_stickers = []
@@ -272,7 +273,7 @@ class MetadataHandler:
                 if len(image_stickers) == file_per_image_pack or (
                     finished_all and len(image_stickers) > 0
                 ):
-                    suffix = f'{"-image" if anim_present else ""}{"-" + str(image_pack_count) if image_pack_count > 0 else ""}'
+                    suffix = f"{'-image' if anim_present else ''}{'-' + str(image_pack_count) if image_pack_count > 0 else ''}"
                     title_current = str(title) + suffix
                     packs[title_current] = image_stickers.copy()
                     image_stickers = []
@@ -292,7 +293,7 @@ class MetadataHandler:
                 if len(stickers) == file_per_pack or (
                     finished_all and len(stickers) > 0
                 ):
-                    suffix = f'{"-" + str(pack_count) if pack_count > 0 else ""}'
+                    suffix = f"{'-' + str(pack_count) if pack_count > 0 else ''}"
                     title_current = str(title) + suffix
                     packs[title_current] = stickers.copy()
                     stickers = []

sticker_convert/utils/files/run_bin.py

@@ -14,7 +14,7 @@ class RunBin:
         if Path(executable).is_file():
             return executable
 
-        if platform.system() == "Windows":
+        if platform.system() == "Windows" and executable.endswith(".exe") is False:
             executable = executable + ".exe"
 
         which_result = shutil.which(executable)

sticker_convert/utils/media/codec_info.py

@@ -1,18 +1,26 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import json
 import mmap
+import warnings
 from decimal import ROUND_HALF_UP, Decimal
 from fractions import Fraction
 from io import BytesIO
-from math import gcd
+from math import ceil, gcd
 from pathlib import Path
 from typing import BinaryIO, List, Optional, Tuple, Union, cast
 
+from bs4 import BeautifulSoup, XMLParsedAsHTMLWarning
 from PIL import Image, UnidentifiedImageError
+from rlottie_python.rlottie_wrapper import LottieAnimation
 
+from sticker_convert.definitions import SVG_DEFAULT_HEIGHT, SVG_DEFAULT_WIDTH, SVG_SAMPLE_FPS
 
-def lcm(a: int, b: int):
+warnings.filterwarnings("ignore", category=XMLParsedAsHTMLWarning)
+
+
+def lcm(a: int, b: int) -> int:
     return abs(a * b) // gcd(a, b)
 
 
@@ -61,6 +69,24 @@ def durations_gcd(*durations: Union[int, float]) -> Union[float, Fraction]:
         return Fraction(gcd(*durations), 1)  # type: ignore
 
 
+def open_lottie(file: Union[Path, bytes]) -> LottieAnimation:
+    if isinstance(file, Path):
+        if file.suffix == ".tgs":
+            return LottieAnimation.from_tgs(file.as_posix())
+        else:
+            return LottieAnimation.from_file(file.as_posix())
+    else:
+        import gzip
+
+        try:
+            with gzip.open(BytesIO(file)) as f:
+                data = f.read().decode(encoding="utf-8")
+        except gzip.BadGzipFile:
+            data = json.loads(file.decode())
+
+        return LottieAnimation.from_data(data)
+
+
 class CodecInfo:
     def __init__(
         self, file: Union[Path, bytes], file_ext: Optional[str] = None
@@ -70,11 +96,17 @@ class CodecInfo:
             self.file_ext = CodecInfo.get_file_ext(file)
         else:
             self.file_ext = file_ext
-        self.fps, self.frames, self.duration = CodecInfo.get_file_fps_frames_duration(
-            file
-        )
-        self.codec = CodecInfo.get_file_codec(file)
-        self.res = CodecInfo.get_file_res(file)
+        if self.file_ext == ".svg":
+            self.fps, self.frames, self.duration, self.res = CodecInfo.get_svg_info(
+                file
+            )
+            self.codec = "svg"
+        else:
+            self.fps, self.frames, self.duration = (
+                CodecInfo.get_file_fps_frames_duration(file)
+            )
+            self.codec = CodecInfo.get_file_codec(file)
+            self.res = CodecInfo.get_file_res(file)
         self.is_animated = self.fps > 1
 
     @staticmethod
@@ -87,8 +119,8 @@ class CodecInfo:
         if not file_ext and isinstance(file, Path):
             file_ext = CodecInfo.get_file_ext(file)
 
-        if file_ext == ".tgs":
-            fps, frames = CodecInfo._get_file_fps_frames_tgs(file)
+        if file_ext in (".tgs", ".json", ".lottie"):
+            fps, frames = CodecInfo._get_file_fps_frames_lottie(file)
             if fps > 0:
                 duration = int(frames / fps * 1000)
             else:
@@ -114,8 +146,8 @@ class CodecInfo:
         if not file_ext and isinstance(file, Path):
             file_ext = CodecInfo.get_file_ext(file)
 
-        if file_ext == ".tgs":
-            return CodecInfo._get_file_fps_tgs(file)
+        if file_ext in (".tgs", ".json", ".lottie"):
+            return CodecInfo._get_file_fps_lottie(file)
         elif file_ext == ".webp":
             fps, _, _, _ = CodecInfo._get_file_fps_frames_duration_webp(file)
             return fps
@@ -141,8 +173,8 @@ class CodecInfo:
         if not file_ext and isinstance(file, Path):
             file_ext = CodecInfo.get_file_ext(file)
 
-        if file_ext == ".tgs":
-            return CodecInfo._get_file_frames_tgs(file)
+        if file_ext in (".tgs", ".json", ".lottie"):
+            return CodecInfo._get_file_frames_lottie(file)
         if file_ext in (".gif", ".webp", ".png", ".apng"):
             _, frames, _ = CodecInfo._get_file_fps_frames_duration_pillow(
                 file, frames_only=True
@@ -168,8 +200,8 @@ class CodecInfo:
         if not file_ext and isinstance(file, Path):
             file_ext = CodecInfo.get_file_ext(file)
 
-        if file_ext == ".tgs":
-            fps, frames = CodecInfo._get_file_fps_frames_tgs(file)
+        if file_ext in (".tgs", ".json", ".lottie"):
+            fps, frames = CodecInfo._get_file_fps_frames_lottie(file)
             if fps > 0:
                 duration = int(frames / fps * 1000)
             else:
@@ -184,51 +216,25 @@ class CodecInfo:
         return duration
 
     @staticmethod
-    def _get_file_fps_tgs(file: Union[Path, bytes]) -> int:
-        from rlottie_python.rlottie_wrapper import LottieAnimation
+    def _get_file_fps_lottie(file: Union[Path, bytes]) -> int:
+        anim = open_lottie(file)
+        fps = anim.lottie_animation_get_framerate()
 
-        if isinstance(file, Path):
-            with LottieAnimation.from_tgs(file.as_posix()) as anim:
-                return anim.lottie_animation_get_framerate()
-        else:
-            import gzip
-
-            with gzip.open(BytesIO(file)) as f:
-                data = f.read().decode(encoding="utf-8")
-            with LottieAnimation.from_data(data) as anim:
-                return anim.lottie_animation_get_framerate()
+        return fps
 
     @staticmethod
-    def _get_file_frames_tgs(file: Union[Path, bytes]) -> int:
-        from rlottie_python.rlottie_wrapper import LottieAnimation
-
-        if isinstance(file, Path):
-            with LottieAnimation.from_tgs(file.as_posix()) as anim:
-                return anim.lottie_animation_get_totalframe()
-        else:
-            import gzip
+    def _get_file_frames_lottie(file: Union[Path, bytes]) -> int:
+        anim = open_lottie(file)
+        frames = anim.lottie_animation_get_totalframe()
 
-            with gzip.open(BytesIO(file)) as f:
-                data = f.read().decode(encoding="utf-8")
-            with LottieAnimation.from_data(data) as anim:
-                return anim.lottie_animation_get_totalframe()
+        return frames
 
     @staticmethod
-    def _get_file_fps_frames_tgs(file: Union[Path, bytes]) -> Tuple[int, int]:
-        from rlottie_python.rlottie_wrapper import LottieAnimation
-
-        if isinstance(file, Path):
-            with LottieAnimation.from_tgs(file.as_posix()) as anim:
-                fps = anim.lottie_animation_get_framerate()
-                frames = anim.lottie_animation_get_totalframe()
-        else:
-            import gzip
-
-            with gzip.open(BytesIO(file)) as f:
-                data = f.read().decode(encoding="utf-8")
-            with LottieAnimation.from_data(data) as anim:
-                fps = anim.lottie_animation_get_framerate()
-                frames = anim.lottie_animation_get_totalframe()
+    def _get_file_fps_frames_lottie(file: Union[Path, bytes]) -> Tuple[int, int]:
+        anim = open_lottie(file)
+        fps = anim.lottie_animation_get_framerate()
+        frames = anim.lottie_animation_get_totalframe()
+        anim.lottie_animation_destroy()
 
         return fps, frames
 
@@ -408,19 +414,10 @@ class CodecInfo:
         if not file_ext and isinstance(file, Path):
             file_ext = CodecInfo.get_file_ext(file)
 
-        if file_ext == ".tgs":
-            from rlottie_python.rlottie_wrapper import LottieAnimation
-
-            if isinstance(file, Path):
-                with LottieAnimation.from_tgs(file.as_posix()) as anim:
-                    width, height = anim.lottie_animation_get_size()
-            else:
-                import gzip
-
-                with gzip.open(BytesIO(file)) as f:
-                    data = f.read().decode(encoding="utf-8")
-                with LottieAnimation.from_data(data) as anim:
-                    width, height = anim.lottie_animation_get_size()
+        if file_ext in (".tgs", ".json", ".lottie"):
+            anim = open_lottie(file)
+            width, height = anim.lottie_animation_get_size()
+            anim.lottie_animation_destroy()
         elif file_ext in (".webp", ".png", ".apng"):
             with Image.open(file) as im:
                 width = im.width
@@ -450,3 +447,38 @@ class CodecInfo:
         if CodecInfo.get_file_frames(file, check_anim=True) > 1:
             return True
         return False
+
+    @staticmethod
+    def get_svg_info(
+        file: Union[Path, bytes],
+    ) -> Tuple[float, int, int, Tuple[int, int]]:
+        if isinstance(file, Path):
+            with open(file) as f:
+                svg = f.read()
+        else:
+            svg = file.decode()
+
+        soup = BeautifulSoup(svg, "html.parser")
+        svg_tag = soup.find_all("svg")[0]
+        width = int(svg_tag.get("width", SVG_DEFAULT_WIDTH))
+        height = int(svg_tag.get("height", SVG_DEFAULT_HEIGHT))
+
+        animate_elements = [*soup.find_all("animate")] + [
+            *soup.find_all("animateTransform")
+        ]
+        duration = 0
+        for element in animate_elements:
+            dur = cast(str, element.get("dur"))
+            if dur.endswith("s"):
+                duration = int(max(duration, float(dur[:-1]) * 1000))
+            elif dur.endswith("ms"):
+                duration = int(max(duration, float(dur[:-2])))
+
+        if duration != 0:
+            fps = SVG_SAMPLE_FPS
+            frames = ceil(fps * duration / 1000)
+        else:
+            fps = 0
+            frames = 1
+
+        return fps, frames, duration, (width, height)

sticker_convert/utils/media/format_verify.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+from fractions import Fraction
 from pathlib import Path
 from typing import Optional, Tuple, Union
 
@@ -16,9 +17,7 @@ class FormatVerify:
         file_info = CodecInfo(file)
 
         return (
-            FormatVerify.check_file_res(
-                file, res=spec.get_res(), square=spec.square, file_info=file_info
-            )
+            FormatVerify.check_file_res(file, res=spec.get_res(), file_info=file_info)
             and FormatVerify.check_file_fps(
                 file, fps=spec.get_fps(), file_info=file_info
             )
@@ -48,7 +47,6 @@ class FormatVerify:
         res: Tuple[
             Tuple[Optional[int], Optional[int]], Tuple[Optional[int], Optional[int]]
         ],
-        square: Optional[bool] = None,
         file_info: Optional[CodecInfo] = None,
     ) -> bool:
         if file_info:
@@ -65,8 +63,27 @@ class FormatVerify:
                 return False
             if res[1][1] and file_height > res[1][1]:
                 return False
-        if square and file_height != file_width:
-            return False
+
+        min_ratio = None
+        if res[0][0] and res[1][0]:
+            min_ratio = Fraction(res[0][0], res[1][0])
+
+        max_ratio = None
+        if res[0][1] and res[1][1]:
+            max_ratio = Fraction(res[0][1], res[1][1])
+
+        file_ratio = Fraction(file_width, file_height)
+
+        if min_ratio is not None and max_ratio is not None:
+            if min_ratio == max_ratio:
+                return True if file_ratio == min_ratio else False
+            else:
+                return True
+
+        if min_ratio is not None:
+            return True if file_ratio == min_ratio else False
+        if max_ratio is not None:
+            return True if file_ratio == max_ratio else False
 
         return True
 
@@ -124,20 +141,16 @@ class FormatVerify:
         else:
             file_animated = CodecInfo.is_anim(file)
 
-        if (
-            file_animated is True
-            and size
-            and size[1] is not None
-            and file_size > size[1]
-        ):
-            return False
-        if (
-            file_animated is False
-            and size
-            and size[0] is not None
-            and file_size > size[0]
-        ):
-            return False
+        if file_animated is True:
+            if not size[1]:
+                return True
+            elif file_size > size[1]:
+                return False
+        else:
+            if not size[0]:
+                return True
+            elif file_size > size[0]:
+                return False
 
         return True