sticker-convert 2.7.13__tar.gz → 2.8.1__tar.gz

{sticker-convert-2.7.13/src/sticker_convert.egg-info → sticker-convert-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sticker-convert
-Version: 2.7.13
+Version: 2.8.1
 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>

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/pyproject.toml

@@ -40,7 +40,7 @@ Repository = "https://github.com/laggykiller/sticker-convert"
 sticker-convert = "sticker_convert.__main__:main"
 
 [build-system]
-requires = ["setuptools>=61.0.0", "wheel"]
+requires = ["setuptools>=61.0.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/converter.py

@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 import os
-from decimal import ROUND_HALF_UP, Decimal
 from fractions import Fraction
 from io import BytesIO
 from math import ceil, floor
 from pathlib import Path
-from queue import Queue
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, cast
 
 import numpy as np
@@ -13,9 +11,9 @@ from PIL import Image
 from PIL import __version__ as PillowVersion
 
 from sticker_convert.job_option import CompOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.cache_store import CacheStore
-from sticker_convert.utils.media.codec_info import CodecInfo
+from sticker_convert.utils.media.codec_info import CodecInfo, rounding
 from sticker_convert.utils.media.format_verify import FormatVerify
 
 if TYPE_CHECKING:
@@ -44,10 +42,6 @@ YUV_RGB_MATRIX = np.array(
 )
 
 
-def rounding(value: float) -> Decimal:
-    return Decimal(value).quantize(0, ROUND_HALF_UP)
-
-
 def get_step_value(
     max_step: Optional[int],
     min_step: Optional[int],
@@ -125,7 +119,7 @@ class StickerConvert:
         in_f: Union[Path, Tuple[Path, bytes]],
         out_f: Path,
         opt_comp: CompOption,
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         #  cb_return: CallbackReturn
     ) -> None:
         self.in_f: Union[bytes, Path]
@@ -191,7 +185,7 @@ class StickerConvert:
         in_f: Union[Path, Tuple[Path, bytes]],
         out_f: Path,
         opt_comp: CompOption,
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         _cb_return: CallbackReturn,
     ) -> Tuple[bool, Path, Union[None, bytes, Path], int]:
         sticker = StickerConvert(in_f, out_f, opt_comp, cb)
@@ -426,10 +420,24 @@ class StickerConvert:
     def _frames_import_pillow(self) -> None:
         with Image.open(self.in_f) as im:
             # Note: im.convert("RGBA") would return rgba image of current frame only
-            if "n_frames" in dir(im):
-                for i in range(im.n_frames):
-                    im.seek(i)
+            if (
+                "n_frames" in dir(im)
+                and im.n_frames != 0
+                and self.codec_info_orig.fps != 0.0
+            ):
+                duration_ptr = 0.0
+                duration_inc = 1 / self.codec_info_orig.fps * 1000
+                next_frame_start_duration = im.info.get("duration", 1000)
+                frame = 0
+                while True:
                     self.frames_raw.append(np.asarray(im.convert("RGBA")))
+                    duration_ptr += duration_inc
+                    if duration_ptr >= next_frame_start_duration:
+                        if frame == im.n_frames:
+                            break
+                        im.seek(frame)
+                        next_frame_start_duration += im.info.get("duration", 1000)
+                        frame += 1
             else:
                 self.frames_raw.append(np.asarray(im.convert("RGBA")))
 
@@ -480,10 +488,12 @@ class StickerConvert:
                         graph.configure()
 
                         graph.push(frame)
-                        frame = cast(VideoFrame, graph.pull())
+                        frame_resized = cast(VideoFrame, graph.pull())
+                    else:
+                        frame_resized = frame
 
-                    if frame.format.name == "yuv420p":
-                        rgb_array = frame.to_ndarray(format="rgb24")
+                    if frame_resized.format.name == "yuv420p":
+                        rgb_array = frame_resized.to_ndarray(format="rgb24")
                         rgba_array = np.dstack(
                             (
                                 rgb_array,
@@ -494,11 +504,11 @@ class StickerConvert:
                         # yuva420p may cause crash
                         # Not safe to directly call frame.to_ndarray(format="rgba")
                         # https://github.com/laggykiller/sticker-convert/issues/114
-                        frame = frame.reformat(
+                        frame_resized = frame_resized.reformat(
                             format="yuva420p",
                             dst_colorspace=1,
                         )
-                        rgba_array = yuva_to_rgba(frame)
+                        rgba_array = yuva_to_rgba(frame_resized)
 
                     # Remove pixels that was added to make dimensions even
                     rgba_array = rgba_array[0:width_orig, 0:height_orig]
@@ -534,25 +544,25 @@ class StickerConvert:
         anim.lottie_animation_destroy()
 
     def determine_bg_color(self) -> Tuple[int, int, int, int]:
+        mean_total = 0.0
         # 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:
-            return (0, 0, 0, 0)
+        for frame in self.frames_raw:
+            s = frame.shape
+            colors = frame.reshape((-1, s[2]))  # 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:
+                alphas = colors[:, 3] / 255
+                r_mean = np.mean(colors[:, 0] * alphas)
+                g_mean = np.mean(colors[:, 1] * alphas)
+                b_mean = np.mean(colors[:, 2] * alphas)
+                mean_total += (r_mean + g_mean + b_mean) / 3
+
+        if mean_total / len(self.frames_raw) < 128:
+            return (255, 255, 255, 0)
         else:
-            alphas = colors[:, 3] / 255
-            r_mean = np.mean(colors[:, 0] * alphas)
-            g_mean = np.mean(colors[:, 1] * alphas)
-            b_mean = np.mean(colors[:, 2] * alphas)
-            mean = (r_mean + g_mean + b_mean) / 3
-            if mean < 128:
-                return (255, 255, 255, 0)
-            else:
-                return (0, 0, 0, 0)
+            return (0, 0, 0, 0)
 
     def frames_resize(
         self, frames_in: "List[np.ndarray[Any, Any]]"
@@ -647,8 +657,6 @@ class StickerConvert:
         frame_current = 0
         frame_current_float = 0.0
         while True:
-            frame_current_float += frame_increment
-            frame_current = int(rounding(frame_current_float))
             if frame_current <= len(frames_in) - 1 and not (
                 frames_out_max and len(frames_out) == frames_out_max
             ):
@@ -659,6 +667,8 @@ class StickerConvert:
                 ):
                     frames_out.append(frames_in[-1])
                 return frames_out
+            frame_current_float += frame_increment
+            frame_current = int(rounding(frame_current_float))
 
     def frames_export(self) -> None:
         is_animated = len(self.frames_processed) > 1 and self.fps
@@ -775,10 +785,25 @@ class StickerConvert:
         config = webp.WebPConfig.new(quality=self.quality)  # type: ignore
         enc = webp.WebPAnimEncoder.new(self.res_w, self.res_h)  # type: ignore
         timestamp_ms = 0
-        for frame in self.frames_processed:
-            pic = webp.WebPPicture.from_numpy(frame)  # type: ignore
+        timestamp_inc = int(1000 / self.fps)
+
+        pic = webp.WebPPicture.from_numpy(self.frames_processed[0])  # type: ignore
+        enc.encode_frame(pic, 0, config=config)  # type: ignore
+
+        frame_num = 1
+        frame_num_prev = 1
+        frame_total = len(self.frames_processed)
+        while frame_num < frame_total - 1:
+            while frame_num < frame_total - 1 and np.array_equal(
+                self.frames_processed[frame_num_prev],
+                self.frames_processed[frame_num],
+            ):
+                timestamp_ms += timestamp_inc
+                frame_num += 1
+            pic = webp.WebPPicture.from_numpy(self.frames_processed[frame_num])  # type: ignore
             enc.encode_frame(pic, timestamp_ms, config=config)  # type: ignore
-            timestamp_ms += int(1000 / self.fps)
+            frame_num_prev = frame_num
+
         anim_data = enc.assemble(timestamp_ms)  # type: ignore
         self.tmp_f.write(anim_data.buffer())  # type: ignore
 

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/downloaders/download_base.py

@@ -2,13 +2,12 @@
 from __future__ import annotations
 
 from pathlib import Path
-from queue import Queue
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any, List, Optional, Tuple
 
 import requests
 
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 
 
 class DownloadBase:
@@ -17,10 +16,7 @@ class DownloadBase:
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: Union[
-            Queue[CbQueueItemType],
-            Callback,
-        ],
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> None:
         self.url = url

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/downloaders/download_kakao.py

@@ -5,8 +5,7 @@ import json
 import zipfile
 from io import BytesIO
 from pathlib import Path
-from queue import Queue
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any, List, Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
@@ -15,7 +14,7 @@ from bs4.element import Tag
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.decrypt_kakao import DecryptKakao
 
@@ -249,7 +248,7 @@ class DownloadKakao(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadKakao(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/downloaders/download_line.py

@@ -7,8 +7,7 @@ import string
 import zipfile
 from io import BytesIO
 from pathlib import Path
-from queue import Queue
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple
 from urllib import parse
 
 import requests
@@ -18,7 +17,7 @@ from PIL import Image
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
 from sticker_convert.utils.auth.get_line_auth import GetLineAuth
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.apple_png_normalize import ApplePngNormalize
 
@@ -466,7 +465,7 @@ class DownloadLine(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadLine(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/downloaders/download_signal.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 from pathlib import Path
-from queue import Queue
-from typing import Dict, Optional, Union
+from typing import Dict, Optional
 
 import anyio
 from signalstickers_client import StickersClient  # type: ignore
@@ -10,7 +9,7 @@ from signalstickers_client.models import StickerPack  # type: ignore
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 from sticker_convert.utils.media.codec_info import CodecInfo
 
@@ -86,7 +85,7 @@ class DownloadSignal(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadSignal(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/downloaders/download_telegram.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 from pathlib import Path
-from queue import Queue
 from typing import Dict, Optional, Union
 from urllib.parse import urlparse
 
@@ -11,7 +10,7 @@ from telegram.ext import AIORateLimiter, ApplicationBuilder
 
 from sticker_convert.downloaders.download_base import DownloadBase
 from sticker_convert.job_option import CredOption
-from sticker_convert.utils.callback import Callback, CallbackReturn, CbQueueItemType
+from sticker_convert.utils.callback import CallbackProtocol, CallbackReturn
 from sticker_convert.utils.files.metadata_handler import MetadataHandler
 
 
@@ -124,7 +123,7 @@ class DownloadTelegram(DownloadBase):
         url: str,
         out_dir: Path,
         opt_cred: Optional[CredOption],
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> bool:
         downloader = DownloadTelegram(url, out_dir, opt_cred, cb, cb_return)

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/job.py

@@ -5,12 +5,10 @@ import os
 import shutil
 import traceback
 from datetime import datetime
-from multiprocessing import Process, Value
-from multiprocessing.managers import ListProxy, SyncManager
+from multiprocessing import Manager, Process, Value
 from pathlib import Path
-from queue import Queue
 from threading import Thread
-from typing import TYPE_CHECKING, Any, Callable, Dict, Generator, List, Optional, Tuple
+from typing import Any, Callable, Dict, List, Optional, Tuple
 from urllib.parse import urlparse
 
 from sticker_convert.converter import StickerConvert
@@ -23,18 +21,11 @@ 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, CbQueueItemType
+from sticker_convert.utils.callback import CallbackReturn, CbQueueType, ResultsListType, WorkQueueType
 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
 
-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__(
@@ -51,33 +42,29 @@ class Executor:
         self.cb_ask_bool = cb_ask_bool
         self.cb_ask_str = cb_ask_str
 
-        self.manager = SyncManager()
-        self.manager.start()
-        # 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[CbQueueItemType] = self.manager.Queue()
-        self.cb_return = CallbackReturn()
+        self.manager = Manager()
+        self.work_queue: WorkQueueType = self.manager.Queue()
+        self.cb_queue: CbQueueType = self.manager.Queue()
+        self.results_list: ResultsListType = self.manager.list()
+        self.cb_return = CallbackReturn(self.manager)
         self.processes: List[Process] = []
 
         self.is_cancel_job = Value("i", 0)
 
-        self.cb_thread_instance = Thread(
-            target=self.cb_thread,
-            args=(
-                self.cb_queue,
-                self.cb_return,
-            ),
-        )
-        self.cb_thread_instance.start()
+        self.cb_thread_instance: Optional[Thread] = None
 
     def cb_thread(
         self,
-        cb_queue: Queue[CbQueueItemType],
-        cb_return: CallbackReturn,
+        cb_queue: CbQueueType,
+        processes: int,
     ) -> None:
+        processes_done = 0
         for i in iter(cb_queue.get, None):
+            if i == "__PROCESS_DONE__":
+                processes_done += 1
+                if processes_done == processes:
+                    cb_queue.put(None)
+                continue
             if isinstance(i, tuple):
                 action = i[0]
                 if len(i) >= 2:
@@ -92,42 +79,44 @@ class Executor:
                 action = i
                 args = tuple()
                 kwargs = {}
-            if action == "msg":
-                self.cb_msg(*args, **kwargs)
-            elif action == "bar":
-                self.cb_bar(*args, **kwargs)
-            elif action == "update_bar":
-                self.cb_bar(update_bar=1)
-            elif action == "msg_block":
-                cb_return.set_response(self.cb_msg_block(*args, **kwargs))
-            elif action == "ask_bool":
-                cb_return.set_response(self.cb_ask_bool(*args, **kwargs))
-            elif action == "ask_str":
-                cb_return.set_response(self.cb_ask_str(*args, **kwargs))
-            else:
-                self.cb_msg(action)
+            self.cb(action, args, kwargs)
+
+    def cb(
+        self,
+        action: Optional[str],
+        args: Optional[Tuple[str, ...]] = None,
+        kwargs: Optional[Dict[str, Any]] = None,
+    ) -> None:
+        if args is None:
+            args = tuple()
+        if kwargs is None:
+            kwargs = {}
+        if action == "msg":
+            self.cb_msg(*args, **kwargs)
+        elif action == "bar":
+            self.cb_bar(*args, **kwargs)
+        elif action == "update_bar":
+            self.cb_bar(update_bar=1)
+        elif action == "msg_block":
+            self.cb_return.set_response(self.cb_msg_block(*args, **kwargs))
+        elif action == "ask_bool":
+            self.cb_return.set_response(self.cb_ask_bool(*args, **kwargs))
+        elif action == "ask_str":
+            self.cb_return.set_response(self.cb_ask_str(*args, **kwargs))
+        else:
+            self.cb_msg(action)
 
     @staticmethod
     def worker(
-        work_list: WorkListType,
-        results_queue: Queue[Any],
-        cb_queue: Queue[CbQueueItemType],
+        work_queue: WorkQueueType,
+        results_list: ResultsListType,
+        cb_queue: CbQueueType,
         cb_return: CallbackReturn,
     ) -> None:
-        while True:
-            try:
-                work = work_list.pop(0)
-            except IndexError:
-                break
-
-            if work is None:
-                break
-            else:
-                work_func, work_args = work
-
+        for work_func, work_args in iter(work_queue.get, None):
             try:
                 results = work_func(*work_args, cb_queue, cb_return)
-                results_queue.put(results)
+                results_list.append(results)
             except Exception:
                 arg_dump: List[Any] = []
                 for i in work_args:
@@ -142,15 +131,25 @@ class Executor:
                 e += "#####################"
                 cb_queue.put(e)
 
-        work_list.append(None)
+        work_queue.put(None)
+        cb_queue.put("__PROCESS_DONE__")
 
     def start_workers(self, processes: int = 1) -> None:
+        self.cb_thread_instance = Thread(
+            target=self.cb_thread,
+            args=(self.cb_queue, processes),
+        )
+        self.cb_thread_instance.start()
+
+        self.results_list[:] = []
+        while not self.work_queue.empty():
+            self.work_queue.get()
         for _ in range(processes):
             process = Process(
                 target=Executor.worker,
                 args=(
-                    self.work_list,
-                    self.results_queue,
+                    self.work_queue,
+                    self.results_list,
                     self.cb_queue,
                     self.cb_return,
                 ),
@@ -163,18 +162,18 @@ class Executor:
     def add_work(
         self, work_func: Callable[..., Any], work_args: Tuple[Any, ...]
     ) -> None:
-        self.work_list.append((work_func, work_args))
+        self.work_queue.put((work_func, work_args))
 
     def join_workers(self) -> None:
-        self.work_list.append(None)
+        self.work_queue.put(None)
         try:
             for process in self.processes:
                 process.join()
         except KeyboardInterrupt:
             pass
 
-        self.results_queue.put(None)
-        self.work_list[:] = []
+        if self.cb_thread_instance:
+            self.cb_thread_instance.join()
         self.processes.clear()
 
     def kill_workers(self, *_: Any, **__: Any) -> None:
@@ -187,21 +186,10 @@ class Executor:
 
     def cleanup(self, killed: bool = False) -> None:
         if killed:
-            self.cb_queue.put("Job cancelled.")
-        self.cb_queue.put(("bar", None, {"set_progress_mode": "clear"}))
-        self.cb_queue.put(None)
-        self.cb_thread_instance.join()
-
-    def get_result(self) -> Generator[Any, None, None]:
-        yield from iter(self.results_queue.get, None)
-
-    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))
+            self.cb_msg("Job cancelled.")
+        self.cb_bar("clear")
+        # self.cb_queue.put(None)
+        self.manager.shutdown()
 
 
 class Job:
@@ -547,17 +535,18 @@ 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
-        for result in self.executor.get_result():
+        for result in self.executor.results_list:
             if result is False:
                 return False
 
@@ -619,6 +608,8 @@ 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
@@ -627,11 +618,10 @@ 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
-        for result in self.executor.get_result():
+        for result in self.executor.results_list:
             if result[0] is False:
                 return False
 
@@ -661,16 +651,17 @@ 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():
+        for result in self.executor.results_list:
             self.out_urls.extend(result)
 
         if self.out_urls:

{sticker-convert-2.7.13 → sticker-convert-2.8.1}/src/sticker_convert/uploaders/compress_wastickers.py

@@ -3,13 +3,12 @@ import copy
 import shutil
 import zipfile
 from pathlib import Path
-from queue import Queue
-from typing import Any, List, Union
+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 Callback, CallbackReturn, CbQueueItemType
+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
@@ -150,7 +149,7 @@ class CompressWastickers(UploadBase):
         opt_output: OutputOption,
         opt_comp: CompOption,
         opt_cred: CredOption,
-        cb: "Union[Queue[CbQueueItemType], Callback]",
+        cb: CallbackProtocol,
         cb_return: CallbackReturn,
     ) -> List[str]:
         exporter = CompressWastickers(opt_output, opt_comp, opt_cred, cb, cb_return)