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

sticker_convert/job.py

@@ -7,15 +7,14 @@ import shutil
 import traceback
 from datetime import datetime
 from multiprocessing import Process, Value
-from multiprocessing.managers import SyncManager
+from multiprocessing.managers import ListProxy, SyncManager
 from pathlib import Path
 from queue import Queue
 from threading import Thread
-from typing import Any, Callable, Dict, Generator, Iterator, List, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, Generator, Iterator, List, Optional, Tuple
 from urllib.parse import urlparse
 
 from sticker_convert.converter import StickerConvert
-from sticker_convert.definitions import ROOT_DIR
 from sticker_convert.downloaders.download_kakao import DownloadKakao
 from sticker_convert.downloaders.download_line import DownloadLine
 from sticker_convert.downloaders.download_signal import DownloadSignal
@@ -25,11 +24,19 @@ from sticker_convert.uploaders.compress_wastickers import CompressWastickers
 from sticker_convert.uploaders.upload_signal import UploadSignal
 from sticker_convert.uploaders.upload_telegram import UploadTelegram
 from sticker_convert.uploaders.xcode_imessage import XcodeImessage
-from sticker_convert.utils.callback import CallbackReturn
-from sticker_convert.utils.files.json_manager import JsonManager
+from sticker_convert.utils.callback import CallbackReturn, CbQueueItemType
+from sticker_convert.utils.files.json_resources_loader import OUTPUT_JSON
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
 
+CbQueueType = Queue[CbQueueItemType]
+WorkListItemType = Optional[Tuple[Callable[..., Any], Tuple[Any, ...]]]
+if TYPE_CHECKING:
+    # mypy complains about this
+    WorkListType = ListProxy[WorkListItemType]  # type: ignore
+else:
+    WorkListType = List[WorkListItemType]
+
 
 class Executor:
     def __init__(
@@ -39,7 +46,7 @@ class Executor:
         cb_bar: Callable[..., None],
         cb_ask_bool: Callable[..., bool],
         cb_ask_str: Callable[..., str],
-    ):
+    ) -> None:
         self.cb_msg = cb_msg
         self.cb_msg_block = cb_msg_block
         self.cb_bar = cb_bar
@@ -48,19 +55,11 @@ class Executor:
 
         self.manager = SyncManager()
         self.manager.start()
-        self.work_queue: Queue[Optional[Tuple[Callable[..., Any], Tuple[Any, ...]]]] = (
-            self.manager.Queue()
-        )
+        # Using list instead of queue for work_list as it can cause random deadlocks
+        # Especially when using scale_filter=nearest
+        self.work_list: WorkListType = self.manager.list()
         self.results_queue: Queue[Any] = self.manager.Queue()
-        self.cb_queue: Queue[
-            Union[
-                Tuple[
-                    Optional[str], Optional[Tuple[Any, ...]], Optional[Dict[str, str]]
-                ],
-                str,
-                None,
-            ]
-        ] = self.manager.Queue()
+        self.cb_queue: CbQueueType = self.manager.Queue()
         self.cb_return = CallbackReturn()
         self.processes: List[Process] = []
 
@@ -77,16 +76,9 @@ class Executor:
 
     def cb_thread(
         self,
-        cb_queue: Queue[
-            Union[
-                Tuple[
-                    Optional[str], Optional[Tuple[Any, ...]], Optional[Dict[str, str]]
-                ],
-                str,
-            ]
-        ],
+        cb_queue: CbQueueType,
         cb_return: CallbackReturn,
-    ):
+    ) -> None:
         for i in iter(cb_queue.get, None):
             if isinstance(i, tuple):
                 action = i[0]
@@ -95,13 +87,13 @@ class Executor:
                 else:
                     args = tuple()
                 if len(i) >= 3:
-                    kwargs: Dict[str, str] = i[2] if i[2] else dict()
+                    kwargs: Dict[str, str] = i[2] if i[2] else {}
                 else:
-                    kwargs = dict()
+                    kwargs = {}
             else:
                 action = i
                 args = tuple()
-                kwargs = dict()
+                kwargs = {}
             if action == "msg":
                 self.cb_msg(*args, **kwargs)
             elif action == "bar":
@@ -119,19 +111,22 @@ class Executor:
 
     @staticmethod
     def worker(
-        work_queue: Queue[Optional[Tuple[Callable[..., Any], Tuple[Any, ...]]]],
+        work_list: WorkListType,
         results_queue: Queue[Any],
-        cb_queue: Queue[
-            Union[
-                Tuple[
-                    Optional[str], Optional[Tuple[Any, ...]], Optional[Dict[str, str]]
-                ],
-                str,
-            ]
-        ],
+        cb_queue: CbQueueType,
         cb_return: CallbackReturn,
-    ):
-        for work_func, work_args in iter(work_queue.get, None):
+    ) -> None:
+        while True:
+            try:
+                work = work_list.pop(0)
+            except IndexError:
+                break
+
+            if work is None:
+                break
+            else:
+                work_func, work_args = work
+
             try:
                 results = work_func(*work_args, cb_queue, cb_return)
                 results_queue.put(results)
@@ -148,18 +143,14 @@ class Executor:
                 e += traceback.format_exc()
                 e += "#####################"
                 cb_queue.put(e)
-        work_queue.put(None)
+        work_list.append(None)
 
     def start_workers(self, processes: int = 1) -> None:
-        # Would contain None from previous run
-        while not self.work_queue.empty():
-            self.work_queue.get()
-
         for _ in range(processes):
             process = Process(
                 target=Executor.worker,
                 args=(
-                    self.work_queue,
+                    self.work_list,
                     self.results_queue,
                     self.cb_queue,
                     self.cb_return,
@@ -173,10 +164,10 @@ class Executor:
     def add_work(
         self, work_func: Callable[..., Any], work_args: Tuple[Any, ...]
     ) -> None:
-        self.work_queue.put((work_func, work_args))
+        self.work_list.append((work_func, work_args))
 
     def join_workers(self) -> None:
-        self.work_queue.put(None)
+        self.work_list.append(None)
         try:
             for process in self.processes:
                 process.join()
@@ -184,13 +175,12 @@ class Executor:
             pass
 
         self.results_queue.put(None)
-
+        self.work_list = self.manager.list()
         self.processes.clear()
 
-    def kill_workers(self, *args: Any, **kwargs: Any) -> None:
+    def kill_workers(self, *_: Any, **__: Any) -> None:
         self.is_cancel_job.value = 1  # type: ignore
-        while not self.work_queue.empty():
-            self.work_queue.get()
+        self.work_list = self.manager.list()
 
         for process in self.processes:
             if platform.system() == "Windows":
@@ -204,18 +194,18 @@ class Executor:
     def cleanup(self) -> None:
         self.cb_queue.put(None)
         self.cb_thread_instance.join()
+        self.work_list = self.manager.list()
 
     def get_result(self) -> Generator[Any, None, None]:
         gen: Iterator[Any] = iter(self.results_queue.get, None)
-        for result in gen:
-            yield result
+        yield from gen
 
     def cb(
         self,
         action: Optional[str],
         args: Optional[Tuple[str, ...]] = None,
         kwargs: Optional[Dict[str, Any]] = None,
-    ):
+    ) -> None:
         self.cb_queue.put((action, args, kwargs))
 
 
@@ -231,7 +221,7 @@ class Job:
         cb_bar: Callable[..., None],
         cb_ask_bool: Callable[..., bool],
         cb_ask_str: Callable[..., str],
-    ):
+    ) -> None:
         self.opt_input = opt_input
         self.opt_comp = opt_comp
         self.opt_output = opt_output
@@ -280,7 +270,7 @@ class Job:
                 code = 2
                 self.executor.cb("Job cancelled.")
                 break
-            elif not success:
+            if not success:
                 code = 1
                 self.executor.cb("An error occured during this run.")
                 break
@@ -290,7 +280,7 @@ class Job:
 
         return code
 
-    def cancel(self, *args: Any, **kwargs: Any) -> None:
+    def cancel(self, *_: Any, **_kwargs: Any) -> None:
         self.executor.kill_workers()
 
     def verify_input(self) -> bool:
@@ -335,7 +325,7 @@ class Job:
             error_msg += "[X] Uploading to signal requires uuid and password.\n"
             error_msg += save_to_local_tip
 
-        output_presets = JsonManager.load_json(ROOT_DIR / "resources/output.json")
+        output_presets = OUTPUT_JSON
 
         input_option = self.opt_input.option
         output_option = self.opt_output.option
@@ -404,7 +394,9 @@ class Job:
 
         if self.opt_comp.scale_filter not in (
             "nearest",
+            "box",
             "bilinear",
+            "hamming",
             "bicubic",
             "lanczos",
         ):
@@ -412,7 +404,9 @@ class Job:
             error_msg += (
                 f"[X] scale_filter {self.opt_comp.scale_filter} is not valid option"
             )
-            error_msg += "    Valid options: nearest, bilinear, bicubic, lanczos"
+            error_msg += (
+                "    Valid options: nearest, box, bilinear, hamming, bicubic, lanczos"
+            )
 
         if self.opt_comp.quantize_method not in ("imagequant", "fastoctree", "none"):
             error_msg += "\n"
@@ -451,7 +445,7 @@ class Job:
                 or not any(path.iterdir())
             ):
                 continue
-            elif path_type == "Output" and (
+            if path_type == "Output" and (
                 path.name == "stickers_output"
                 or self.opt_comp.no_compress
                 or not any(path.iterdir())
@@ -459,7 +453,7 @@ class Job:
                 continue
 
             related_files = MetadataHandler.get_files_related_to_sticker_convert(path)
-            if any([i for i in path.iterdir() if i not in related_files]):
+            if any(i for i in path.iterdir() if i not in related_files):
                 msg = "WARNING: {} directory is set to {}.\n"
                 msg += 'It does not have default name of "{}",\n'
                 msg += "and It seems like it contains PERSONAL DATA.\n"
@@ -551,14 +545,13 @@ class Job:
             self.executor.cb("Nothing to download")
             return True
 
-        self.executor.start_workers(processes=1)
-
         for downloader in downloaders:
             self.executor.add_work(
                 work_func=downloader,
                 work_args=(self.opt_input.url, self.opt_input.dir, self.opt_cred),
             )
 
+        self.executor.start_workers(processes=1)
         self.executor.join_workers()
 
         # Return False if any of the job returns failure
@@ -612,9 +605,7 @@ class Job:
 
             if not in_f.is_file():
                 continue
-            elif (
-                CodecInfo.get_file_ext(i) in (".txt", ".m4a") or Path(i).stem == "cover"
-            ):
+            if CodecInfo.get_file_ext(i) in (".txt", ".m4a") or Path(i).stem == "cover":
                 shutil.copy(in_f, output_dir / i.name)
             else:
                 in_fs.append(i)
@@ -626,8 +617,6 @@ class Job:
             "bar", kwargs={"set_progress_mode": "determinate", "steps": in_fs_count}
         )
 
-        self.executor.start_workers(processes=min(self.opt_comp.processes, in_fs_count))
-
         for i in in_fs:
             in_f = input_dir / i.name
             out_f = output_dir / Path(i).stem
@@ -636,6 +625,7 @@ class Job:
                 work_func=StickerConvert.convert, work_args=(in_f, out_f, self.opt_comp)
             )
 
+        self.executor.start_workers(processes=min(self.opt_comp.processes, in_fs_count))
         self.executor.join_workers()
 
         # Return False if any of the job returns failure
@@ -669,21 +659,22 @@ class Job:
         if self.opt_output.option == "imessage":
             exporters.append(XcodeImessage.start)
 
-        self.executor.start_workers(processes=1)
-
         for exporter in exporters:
             self.executor.add_work(
                 work_func=exporter,
                 work_args=(self.opt_output, self.opt_comp, self.opt_cred),
             )
 
+        self.executor.start_workers(processes=1)
         self.executor.join_workers()
 
         for result in self.executor.get_result():
             self.out_urls.extend(result)
 
         if self.out_urls:
-            with open(Path(self.opt_output.dir, "export-result.txt"), "w+") as f:
+            with open(
+                Path(self.opt_output.dir, "export-result.txt"), "w+", encoding="utf-8"
+            ) as f:
                 f.write("\n".join(self.out_urls))
         else:
             self.executor.cb("An error occured while exporting stickers")
@@ -697,14 +688,14 @@ class Job:
         msg += "##########\n"
         msg += "\n"
 
-        if self.compress_fails != []:
+        if self.compress_fails:
             msg += f'Warning: Could not compress the following {len(self.compress_fails)} file{"s" if len(self.compress_fails) > 1 else ""}:\n'
             msg += "\n".join(self.compress_fails)
             msg += "\n"
             msg += "\nConsider adjusting compression parameters"
             msg += "\n"
 
-        if self.out_urls != []:
+        if self.out_urls:
             msg += "Export results:\n"
             msg += "\n".join(self.out_urls)
         else:

sticker_convert/job_option.py

@@ -24,7 +24,7 @@ class BaseOption:
         return json.dumps(self.to_dict(), indent=2)
 
     def to_dict(self) -> Dict[str, str]:
-        return dict()
+        return {}
 
 
 @dataclass

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

@@ -6,10 +6,10 @@ from pathlib import Path
 from queue import Queue
 from typing import Any, List, Union
 
-from sticker_convert.converter import CbQueueItemType, StickerConvert
+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
@@ -19,7 +19,7 @@ from sticker_convert.utils.media.format_verify import FormatVerify
 
 class CompressWastickers(UploadBase):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super(CompressWastickers, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.base_spec.size_max_img = 100000
         self.base_spec.size_max_vid = 500000
         self.base_spec.duration_min = 8

sticker_convert/uploaders/upload_base.py

@@ -2,9 +2,8 @@
 from queue import Queue
 from typing import Union
 
-from sticker_convert.converter import CbQueueItemType
 from sticker_convert.job_option import CompOption, CredOption, OutputOption
-from sticker_convert.utils.callback import Callback, CallbackReturn
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
 
 
 class UploadBase:
@@ -15,7 +14,7 @@ class UploadBase:
         opt_cred: CredOption,
         cb: "Union[Queue[CbQueueItemType], Callback]",
         cb_return: CallbackReturn,
-    ):
+    ) -> None:
         if not cb:
             cb = Callback(silent=True)
             cb_return = CallbackReturn()

sticker_convert/uploaders/upload_signal.py

@@ -9,10 +9,10 @@ from signalstickers_client import StickersClient  # type: ignore
 from signalstickers_client.errors import SignalException  # type: ignore
 from signalstickers_client.models import LocalStickerPack, Sticker  # type: ignore
 
-from sticker_convert.converter import CbQueueItemType, StickerConvert
+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.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
 from sticker_convert.utils.media.format_verify import FormatVerify
@@ -20,7 +20,7 @@ from sticker_convert.utils.media.format_verify import FormatVerify
 
 class UploadSignal(UploadBase):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super(UploadSignal, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.base_spec.set_size_max(300000)
         self.base_spec.set_res_max(512)
@@ -49,7 +49,7 @@ class UploadSignal(UploadBase):
 
     def add_stickers_to_pack(
         self, pack: LocalStickerPack, stickers: List[Path], emoji_dict: Dict[str, str]
-    ):
+    ) -> None:
         for src in stickers:
             self.cb.put(f"Verifying {src} for uploading to signal")
 
@@ -117,7 +117,7 @@ class UploadSignal(UploadBase):
             msg_block += f"Default emoji is set to {self.opt_comp.default_emoji}.\n"
             msg_block += "Please edit emoji.txt now, then continue"
             MetadataHandler.generate_emoji_file(
-                dir=self.opt_output.dir, default_emoji=self.opt_comp.default_emoji
+                directory=self.opt_output.dir, default_emoji=self.opt_comp.default_emoji
             )
 
             self.cb.put(("msg_block", (msg_block,), None))

sticker_convert/uploaders/upload_telegram.py

@@ -9,17 +9,17 @@ import anyio
 from telegram import Bot, InputSticker, Sticker
 from telegram.error import TelegramError
 
-from sticker_convert.converter import CbQueueItemType, StickerConvert
+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.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.format_verify import FormatVerify
 
 
 class UploadTelegram(UploadBase):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super(UploadTelegram, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.base_spec.size_max_img = 512000
         self.base_spec.size_max_vid = 256000
@@ -209,6 +209,7 @@ class UploadTelegram(UploadBase):
                         Path(f"bytes{ext}"),  # type: ignore
                         self.opt_comp_cover_merged,
                         self.cb,
+                        self.cb_return,
                     )
 
                 try:
@@ -248,7 +249,7 @@ class UploadTelegram(UploadBase):
             msg_block += f"Default emoji is set to {self.opt_comp.default_emoji}.\n"
             msg_block += "Please edit emoji.txt now, then continue"
             MetadataHandler.generate_emoji_file(
-                dir=self.opt_output.dir, default_emoji=self.opt_comp.default_emoji
+                directory=self.opt_output.dir, default_emoji=self.opt_comp.default_emoji
             )
 
             self.cb.put(("msg_block", (msg_block,), None))

sticker_convert/uploaders/xcode_imessage.py

@@ -7,77 +7,22 @@ import shutil
 import zipfile
 from pathlib import Path
 from queue import Queue
-from typing import Any, Dict, List, Tuple, Union
+from typing import Any, Dict, List, Union
 
-from sticker_convert.converter import CbQueueItemType, StickerConvert
+from sticker_convert.converter import StickerConvert
 from sticker_convert.definitions import ROOT_DIR
 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.files.metadata_handler import MetadataHandler
+from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.files.metadata_handler import XCODE_IMESSAGE_ICONSET, 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 XcodeImessageIconset:
-    iconset: Dict[str, Tuple[int, int]] = {}
-
-    def __init__(self) -> None:
-        if self.iconset != {}:
-            return
-
-        if (ROOT_DIR / "ios-message-stickers-template").is_dir():
-            with open(
-                ROOT_DIR
-                / "ios-message-stickers-template/stickers StickerPackExtension/Stickers.xcstickers/iMessage App Icon.stickersiconset/Contents.json"
-            ) as f:
-                dict = json.load(f)
-        elif (ROOT_DIR / "ios-message-stickers-template.zip").is_file():
-            with zipfile.ZipFile(
-                (ROOT_DIR / "ios-message-stickers-template.zip"), "r"
-            ) as f:
-                dict = json.loads(
-                    f.read(
-                        "stickers StickerPackExtension/Stickers.xcstickers/iMessage App Icon.stickersiconset/Contents.json"
-                    ).decode()
-                )
-        else:
-            raise FileNotFoundError("ios-message-stickers-template not found")
-
-        for i in dict["images"]:
-            filename = i["filename"]
-            size = i["size"]
-            size_w = int(size.split("x")[0])
-            size_h = int(size.split("x")[1])
-            scale = int(i["scale"].replace("x", ""))
-            size_w_scaled = size_w * scale
-            size_h_scaled = size_h * scale
-
-            self.iconset[filename] = (size_w_scaled, size_h_scaled)
-
-        # self.iconset = {
-        #     'App-Store-1024x1024pt.png': (1024, 1024),
-        #     'iPad-Settings-29pt@2x.png': (58, 58),
-        #     'iPhone-settings-29pt@2x.png': (58, 58),
-        #     'iPhone-settings-29pt@3x.png': (87, 87),
-        #     'Messages27x20pt@2x.png': (54, 40),
-        #     'Messages27x20pt@3x.png': (81, 60),
-        #     'Messages32x24pt@2x.png': (64, 48),
-        #     'Messages32x24pt@3x.png': (96, 72),
-        #     'Messages-App-Store-1024x768pt.png': (1024, 768),
-        #     'Messages-iPad-67x50pt@2x.png': (134, 100),
-        #     'Messages-iPad-Pro-74x55pt@2x.png': (148, 110),
-        #     'Messages-iPhone-60x45pt@2x.png': (120, 90),
-        #     'Messages-iPhone-60x45pt@3x.png': (180, 135)
-        # }
-
-
 class XcodeImessage(UploadBase):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super(XcodeImessage, self).__init__(*args, **kwargs)
-        self.iconset = XcodeImessageIconset().iconset
-
+        super().__init__(*args, **kwargs)
         self.base_spec.set_size_max(500000)
         self.base_spec.set_res(300)
         self.base_spec.set_format(("png", ".apng", ".gif", ".jpeg", "jpg"))
@@ -169,16 +114,16 @@ class XcodeImessage(UploadBase):
         else:
             icon_source = first_image_path
 
-        for icon, res in self.iconset.items():
+        for icon, res in XCODE_IMESSAGE_ICONSET.items():
             spec_cover = CompOption()
             spec_cover.set_res_w(res[0])
             spec_cover.set_res_h(res[1])
             spec_cover.set_fps(0)
 
             icon_path = self.opt_output.dir / icon
-            if Path(icon) in [
-                i for i in self.opt_output.dir.iterdir()
-            ] and not FormatVerify.check_file(icon_path, spec=spec_cover):
+            if Path(icon) in list(
+                self.opt_output.dir.iterdir()
+            ) and not FormatVerify.check_file(icon_path, spec=spec_cover):
                 StickerConvert.convert(
                     icon_path, icon_path, spec_cover, self.cb, self.cb_return
                 )
@@ -264,7 +209,7 @@ class XcodeImessage(UploadBase):
             if (
                 CodecInfo.get_file_ext(i) == ".png"
                 and i.stem != "cover"
-                and i.name not in self.iconset
+                and i.name not in XCODE_IMESSAGE_ICONSET
             ):
                 sticker_dir = f"{i.stem}.sticker"  # 0.sticker
                 stickers_lst.append(sticker_dir)
@@ -283,18 +228,18 @@ class XcodeImessage(UploadBase):
                 }
 
                 # packname StickerPackExtension/Stickers.xcstickers/Sticker Pack.stickerpack/0.sticker/Contents.json
-                with open(sticker_path / "Contents.json", "w+") as f:
+                with open(sticker_path / "Contents.json", "w+", encoding="utf-8") as f:
                     json.dump(sticker_json_content, f, indent=2)
 
         # packname StickerPackExtension/Stickers.xcstickers/Sticker Pack.stickerpack/Contents.json
-        with open(stickers_path / "Contents.json") as f:
+        with open(stickers_path / "Contents.json", encoding="utf-8") as f:
             stickerpack_json_content: Dict[str, List[Dict[str, str]]] = json.load(f)
 
         stickerpack_json_content["stickers"] = []
         for sticker in stickers_lst:
             stickerpack_json_content["stickers"].append({"filename": sticker})
 
-        with open(stickers_path / "Contents.json", "w+") as f:
+        with open(stickers_path / "Contents.json", "w+", encoding="utf-8") as f:
             json.dump(stickerpack_json_content, f, indent=2)
 
         # packname StickerPackExtension/Stickers.xcstickers/iMessage App Icon.stickersiconset
@@ -308,7 +253,7 @@ class XcodeImessage(UploadBase):
                 os.remove(iconset_path / iconfile_name)
 
         icons_lst: List[str] = []
-        for icon in self.iconset:
+        for icon in XCODE_IMESSAGE_ICONSET:
             shutil.copy(self.opt_output.dir / icon, iconset_path / icon)
             icons_lst.append(icon)