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

sticker_convert/uploaders/compress_wastickers.py

@@ -1,156 +1,186 @@
-#!/usr/bin/env python3
-import copy
-import shutil
-import zipfile
-from pathlib import Path
-from typing import Any, List
-
-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 CallbackProtocol, CallbackReturn
-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
-from sticker_convert.utils.media.codec_info import CodecInfo
-from sticker_convert.utils.media.format_verify import FormatVerify
-
-
-class CompressWastickers(UploadBase):
-    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,
-            size_max_vid=50000,
-            animated=False,
-        )
-        self.spec_cover.set_res(96)
-        self.spec_cover.set_res(96)
-        self.spec_cover.set_fps(0)
-        self.spec_cover.set_format((".png",))
-
-        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(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(self.base_spec)
-
-    def compress_wastickers(self) -> List[str]:
-        urls: List[str] = []
-        title, author, _ = MetadataHandler.get_metadata(
-            self.opt_output.dir,
-            title=self.opt_output.title,
-            author=self.opt_output.author,
-        )
-        if not title:
-            self.cb.put("Title is required for compressing .wastickers")
-            return urls
-        if not author:
-            self.cb.put("Author is required for compressing .wastickers")
-            return urls
-        packs = MetadataHandler.split_sticker_packs(
-            self.opt_output.dir,
-            title=title,
-            file_per_pack=30,
-            separate_image_anim=not self.opt_comp.fake_vid,
-        )
-
-        for pack_title, stickers in packs.items():
-            # Originally the Sticker Maker application name the files with int(time.time())
-            with CacheStore.get_cache_store(path=self.opt_comp.cache_dir) as tempdir:
-                for num, src in enumerate(stickers):
-                    self.cb.put(f"Verifying {src} for compressing into .wastickers")
-
-                    if self.opt_comp.fake_vid or CodecInfo.is_anim(src):
-                        ext = ".webp"
-                    else:
-                        ext = ".png"
-
-                    dst = Path(tempdir, f"sticker_{num+1}{ext}")
-
-                    if FormatVerify.check_file(
-                        src, spec=self.webp_spec
-                    ) or FormatVerify.check_file(src, spec=self.png_spec):
-                        shutil.copy(src, dst)
-                    else:
-                        StickerConvert.convert(
-                            Path(src),
-                            Path(dst),
-                            self.opt_comp_merged,
-                            self.cb,
-                            self.cb_return,
-                        )
-
-                out_f = Path(
-                    self.opt_output.dir, sanitize_filename(pack_title + ".wastickers")
-                ).as_posix()
-
-                self.add_metadata(Path(tempdir), pack_title, author)
-                with zipfile.ZipFile(out_f, "w", zipfile.ZIP_DEFLATED) as zipf:
-                    for file in Path(tempdir).iterdir():
-                        file_path = Path(tempdir, file.name)
-                        zipf.write(file_path, arcname=file_path.name)
-
-            self.cb.put((out_f))
-            urls.append(out_f)
-
-        return urls
-
-    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)
-
-        cover_path_old = MetadataHandler.get_cover(self.opt_output.dir)
-        cover_path_new = Path(pack_dir, "tray.png")
-        if cover_path_old:
-            if FormatVerify.check_file(cover_path_old, spec=self.spec_cover):
-                shutil.copy(cover_path_old, cover_path_new)
-            else:
-                StickerConvert.convert(
-                    cover_path_old,
-                    cover_path_new,
-                    opt_comp_merged,
-                    self.cb,
-                    self.cb_return,
-                )
-        else:
-            # First image in the directory, extracting first frame
-            first_image = [
-                i
-                for i in sorted(self.opt_output.dir.iterdir())
-                if Path(self.opt_output.dir, i.name).is_file()
-                and i.suffix not in (".txt", ".m4a", ".wastickers")
-            ][0]
-            StickerConvert.convert(
-                Path(self.opt_output.dir, first_image),
-                cover_path_new,
-                opt_comp_merged,
-                self.cb,
-                self.cb_return,
-            )
-
-        MetadataHandler.set_metadata(pack_dir, author=author, title=title, newline=True)
-
-    @staticmethod
-    def start(
-        opt_output: OutputOption,
-        opt_comp: CompOption,
-        opt_cred: CredOption,
-        cb: CallbackProtocol,
-        cb_return: CallbackReturn,
-    ) -> List[str]:
-        exporter = CompressWastickers(opt_output, opt_comp, opt_cred, cb, cb_return)
-        return exporter.compress_wastickers()
+#!/usr/bin/env python3
+import copy
+import zipfile
+from pathlib import Path
+from typing import Any, List, Tuple
+
+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 CallbackProtocol, CallbackReturn
+from sticker_convert.utils.files.metadata_handler import MetadataHandler
+from sticker_convert.utils.files.sanitize_filename import sanitize_filename
+from sticker_convert.utils.media.codec_info import CodecInfo
+from sticker_convert.utils.media.format_verify import FormatVerify
+from sticker_convert.utils.translate import I
+
+
+class CompressWastickers(UploadBase):
+    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.set_res(512)
+        self.base_spec.set_format((".webp",))
+
+        self.spec_cover = CompOption(
+            size_max_img=50000,
+            size_max_vid=50000,
+            animated=False,
+        )
+        self.spec_cover.set_res(96)
+        self.spec_cover.set_res(96)
+        self.spec_cover.set_fps(0)
+        self.spec_cover.set_format((".png",))
+
+        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(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(self.base_spec)
+
+    def compress_wastickers(self) -> Tuple[int, int, List[str]]:
+        urls: List[str] = []
+        title, author, _ = MetadataHandler.get_metadata(
+            self.opt_output.dir,
+            title=self.opt_output.title,
+            author=self.opt_output.author,
+        )
+        if not title:
+            self.cb.put(I("Title is required for compressing .wastickers"))
+            return 0, 0, urls
+        if not author:
+            self.cb.put(I("Author is required for compressing .wastickers"))
+            return 0, 0, urls
+        packs = MetadataHandler.split_sticker_packs(
+            self.opt_output.dir,
+            title=title,
+            file_per_pack=30,
+            separate_image_anim=not self.opt_comp.fake_vid,
+        )
+
+        stickers_total = 0
+        for pack_title, stickers in packs.items():
+            stickers_total += len(stickers)
+            out_f = Path(
+                self.opt_output.dir, sanitize_filename(pack_title + ".wastickers")
+            ).as_posix()
+
+            MetadataHandler.set_metadata(
+                self.opt_output.dir, author=author, title=title, newline=True
+            )
+            with zipfile.ZipFile(out_f, "w", zipfile.ZIP_DEFLATED) as zipf:
+                cover_opt_comp_merged = copy.deepcopy(self.opt_comp)
+                cover_opt_comp_merged.merge(self.spec_cover)
+
+                cover_path_old = MetadataHandler.get_cover(self.opt_output.dir)
+                cover_path_new = Path("bytes.png")
+                if cover_path_old is None:
+                    # First image in the directory, extracting first frame
+                    first_image = [
+                        i
+                        for i in sorted(self.opt_output.dir.iterdir())
+                        if Path(self.opt_output.dir, i.name).is_file()
+                        and i.suffix not in (".txt", ".m4a", ".wastickers")
+                    ][0]
+                    self.cb.put(I("Creating cover using {}").format(first_image.name))
+                    success, _, cover_data, _ = StickerConvert.convert(
+                        Path(self.opt_output.dir, first_image),
+                        cover_path_new,
+                        cover_opt_comp_merged,
+                        self.cb,
+                        self.cb_return,
+                    )
+                    if not success:
+                        self.cb.put(
+                            I(
+                                "Warning: Cannot compress cover {}, unable to create .wastickers"
+                            ).format(first_image.name)
+                        )
+                        continue
+                else:
+                    if not FormatVerify.check_file(
+                        cover_path_old, spec=self.spec_cover
+                    ):
+                        success, _, cover_data, _ = StickerConvert.convert(
+                            cover_path_old,
+                            cover_path_new,
+                            cover_opt_comp_merged,
+                            self.cb,
+                            self.cb_return,
+                        )
+                        if not success:
+                            self.cb.put(
+                                I(
+                                    "Warning: Cannot compress cover {}, unable to create .wastickers"
+                                ).format(cover_path_old.name)
+                            )
+                            continue
+                    else:
+                        with open(cover_path_old, "rb") as f:
+                            cover_data = f.read()
+
+                assert isinstance(cover_data, bytes)
+                zipf.writestr("tray.png", cover_data)
+                zipf.write(Path(self.opt_output.dir, "author.txt"), "author.txt")
+                zipf.write(Path(self.opt_output.dir, "title.txt"), "title.txt")
+
+                for num, src in enumerate(stickers):
+                    self.cb.put(
+                        I("Verifying {} for compressing into .wastickers").format(src)
+                    )
+
+                    if self.opt_comp.fake_vid or CodecInfo.is_anim(src):
+                        ext = ".webp"
+                    else:
+                        ext = ".png"
+                    dst = f"bytes{ext}"
+
+                    if not (
+                        FormatVerify.check_file(src, spec=self.webp_spec)
+                        or FormatVerify.check_file(src, spec=self.png_spec)
+                    ):
+                        success, _, image_data, _ = StickerConvert.convert(
+                            Path(src),
+                            Path(dst),
+                            self.opt_comp_merged,
+                            self.cb,
+                            self.cb_return,
+                        )
+                        assert isinstance(image_data, bytes)
+                        if not success:
+                            self.cb.put(
+                                I(
+                                    "Warning: Cannot compress file {}, skip this file..."
+                                ).format(Path(src).name)
+                            )
+                            continue
+                    else:
+                        with open(src, "rb") as f:
+                            image_data = f.read()
+
+                    # Originally the Sticker Maker application name the files with int(time.time())
+                    zipf.writestr(f"sticker_{num + 1}{ext}", image_data)
+
+            self.cb.put((out_f))
+            urls.append(out_f)
+
+        return stickers_total, stickers_total, urls
+
+    @staticmethod
+    def start(
+        opt_output: OutputOption,
+        opt_comp: CompOption,
+        opt_cred: CredOption,
+        cb: CallbackProtocol,
+        cb_return: CallbackReturn,
+    ) -> Tuple[int, int, List[str]]:
+        exporter = CompressWastickers(opt_output, opt_comp, opt_cred, cb, cb_return)
+        return exporter.compress_wastickers()

sticker_convert/uploaders/upload_base.py

@@ -1,35 +1,44 @@
-#!/usr/bin/env python3
-
-from sticker_convert.job_option import CompOption, CredOption, OutputOption
-from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
-
-
-class UploadBase:
-    def __init__(
-        self,
-        opt_output: OutputOption,
-        opt_comp: CompOption,
-        opt_cred: CredOption,
-        cb: CallbackProtocol,
-        cb_return: CallbackReturn,
-    ) -> None:
-        self.opt_output = opt_output
-        self.opt_comp = opt_comp
-        self.opt_cred = opt_cred
-        self.cb = cb
-        self.cb_return = cb_return
-
-        self.base_spec = CompOption(
-            fps_power=self.opt_comp.fps_power,
-            res_power=self.opt_comp.res_power,
-            quality_min=self.opt_comp.quality_min,
-            quality_max=self.opt_comp.quality_max,
-            quality_power=self.opt_comp.quality_power,
-            color_min=self.opt_comp.color_min,
-            color_max=self.opt_comp.color_max,
-            color_power=self.opt_comp.color_power,
-            quantize_method=self.opt_comp.quantize_method,
-            scale_filter=self.opt_comp.scale_filter,
-            steps=self.opt_comp.steps,
-            cache_dir=self.opt_comp.cache_dir,
-        )
+#!/usr/bin/env python3
+from sticker_convert.job_option import CompOption, CredOption, OutputOption
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
+from sticker_convert.utils.translate import I
+
+
+def get_msg_emoji_txt_required():
+    return I(
+        "emoji.txt is required for uploading signal stickers\n"
+        "emoji.txt generated for you in {}\n"
+        "Default emoji is set to {}.\n"
+        "Please edit emoji.txt now, then continue"
+    )
+
+
+class UploadBase:
+    def __init__(
+        self,
+        opt_output: OutputOption,
+        opt_comp: CompOption,
+        opt_cred: CredOption,
+        cb: CallbackProtocol,
+        cb_return: CallbackReturn,
+    ) -> None:
+        self.opt_output = opt_output
+        self.opt_comp = opt_comp
+        self.opt_cred = opt_cred
+        self.cb = cb
+        self.cb_return = cb_return
+
+        self.base_spec = CompOption(
+            fps_power=self.opt_comp.fps_power,
+            res_power=self.opt_comp.res_power,
+            quality_min=self.opt_comp.quality_min,
+            quality_max=self.opt_comp.quality_max,
+            quality_power=self.opt_comp.quality_power,
+            color_min=self.opt_comp.color_min,
+            color_max=self.opt_comp.color_max,
+            color_power=self.opt_comp.color_power,
+            quantize_method=self.opt_comp.quantize_method,
+            scale_filter=self.opt_comp.scale_filter,
+            steps=self.opt_comp.steps,
+            cache_dir=self.opt_comp.cache_dir,
+        )