muxtools 0.2.0__tar.gz → 0.2.2__tar.gz

{muxtools-0.2.0 → muxtools-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muxtools
-Version: 0.2.0
+Version: 0.2.2
 Summary: A library for various muxing and automation tools for anything and everything fansubbing related
 Author-email: Vodes <vodes.imp@gmail.com>
 License: MPL 2.0

{muxtools-0.2.0 → muxtools-0.2.2}/muxtools/audio/encoders.py

@@ -206,7 +206,7 @@ class Opus(Encoder):
 
         if not run_cmd_pb(args, quiet, config, shell=False, stdin=stdin):
             tags = version_settings_dict(
-                self.get_mediainfo_settings(args), exe, r"opusenc (opus-tools .+?\(using libopus \d+\.\d+(?:\.\d)?.+?\)?)", ["-V"], prepend="opusenc"
+                self.get_mediainfo_settings(args), exe, r"opusenc (opus-tools .+?\(using libopus \d+\.\d+(?:\.\d)?.+\)?)", ["-V"], prepend="opusenc"
             )
             clean_temp_files()
             return AudioFile(output, fileIn.container_delay, fileIn.source, tags=tags)

{muxtools-0.2.0 → muxtools-0.2.2}/muxtools/muxing/mux.py

@@ -131,7 +131,7 @@ def clean_name(name: str) -> str:
     stripped = name.strip()
 
     dont_match = [R"$show$", R"$ep$", "$crc32$"]
-    for match in re.findall(r"\$[^ ]+\$", name):
+    for match in re.findall(r"\$[^ ]+?\$", name):
         if match not in dont_match:
             stripped = stripped.replace(match, "").strip()
             warn(f"Unknown token '{match}' was removed.", "Mux")

{muxtools-0.2.0 → muxtools-0.2.2}/muxtools/muxing/tmdb.py

@@ -85,6 +85,7 @@ class TmdbConfig:
     :param write_cover:     Download episode thumbnail from TMDB to use as cover art attachment for the MKV.
     :param write_summary:   Writes the series summary/synopsis to the `SUMMARY` mkv tag if True
     :param write_synopsis:  Writes the individual episode synopsis to the `SYNOPSIS` mkv tag if True
+    :param replace_spaces:  Replaces spaces in titles with dots if True and with whatever string you passed if a string.
     """
 
     id: int
@@ -100,6 +101,7 @@ class TmdbConfig:
     write_cover: bool = False
     write_summary: bool = False
     write_synopsis: bool = False
+    replace_spaces: str | bool = False
 
     def needs_xml(self) -> bool:
         return self.write_ids or self.write_date or self.write_title or self.write_summary or self.write_synopsis
@@ -172,12 +174,18 @@ class TmdbConfig:
                 self.episodes = json_resp["episodes"]
 
         try:
-            episode = self.episodes[(num + self.offset) - 1]
+            episode: dict = self.episodes[(num + self.offset) - 1]
         except:
             raise error(f"Failed to find or parse episode {num:02}!", self)
 
+        title: str = episode.get("name", "")
+        if self.replace_spaces is True:
+            title = title.replace(" ", ".")
+        elif isinstance(self.replace_spaces, str):
+            title = title.replace(" ", self.replace_spaces)
+
         return EpisodeMetadata(
-            episode.get("name", ""),
+            title,
             episode.get("air_date", ""),
             episode.get("overview", ""),
             f"https://image.tmdb.org/t/p/w780{episode.get('still_path')}" if self.write_cover else "",

{muxtools-0.2.0 → muxtools-0.2.2}/muxtools/subtitle/sub.py

@@ -16,7 +16,7 @@ from .subutils import create_document, dummy_video, has_arch_resampler
 from ..utils.glob import GlobSearch
 from ..utils.download import get_executable
 from ..utils.types import PathLike, TrackType
-from ..utils.log import debug, error, info, warn
+from ..utils.log import debug, error, info, warn, log_escape
 from ..utils.convert import frame_to_timedelta, timedelta_to_frame
 from ..utils.env import get_temp_workdir, get_workdir, run_commandline
 from ..utils.files import ensure_path_exists, get_absolute_track, make_output, clean_temp_files, uniquify_path
@@ -131,7 +131,7 @@ class SubFile(BaseSubFile):
         """
         doc = self._read_doc()
         used_styles = {line.style for line in doc.events if line.TYPE == "Dialogue"}
-        regex = re.compile(r"\{.*?\\r([^\\]+)\}")
+        regex = re.compile(r"\{[^}]*\\r([^\\}]+)[^}]*\}")
         for line in [line for line in doc.events if line.TYPE == "Dialogue"]:
             for match in regex.finditer(line.text):
                 used_styles.add(match.group(1))
@@ -169,19 +169,43 @@ class SubFile(BaseSubFile):
         print_swaps: bool = False,
         inline_marker: str = "*",
         line_marker: str = "***",
+        inline_tag_markers: str | None = None,
     ) -> SubFileSelf:
-        """
-        autoswapper does the swapping.
-        Too lazy to explain
+        r"""
+        autoswapper allows replacing text in the script with a different text.
+        Useful for creating honorific tracks.
+
+        Assuming the markers are as default:
+
+        - `{*}abc{*def}` becomes `{*}def{*abc}` (AB Swap)
+        - `abc{**def}` becomes `abc{*}def{*}` (Show Word)
+        - `abc{*}def{*}` becomes `abc{**def}` (Hide Word)
+
+        Note: AB Swap and Hide Word will remove `{}` from the swapped text, to ensure the comment isn't broken.
+
+        You can also comment in or out entire lines by using the line marker in either the `effect` or `name` field.
+        - A dialogue line with effect or name set to `***` will be commented.
+        - A comment line with effect or name set to `***` will be set to a dialogue.
+
 
-        :param allowed_styles:      List of allowed styles to do the swapping on
-                                    Will run on every line if passed `None`
-        :param print_swaps:         Prints the swaps
-        :param inline_marker:       Marker to use for inline swaps.
-                                    Should be one character. Default `*`
-        :param line_marker:         Marker to use for full-line swaps. Default `***`
+        `inline_tag_markers` can be used to swap ASS tags as well. Keep in mind that "\" and "/" will be swapped, so override tags aren't applied.
 
-        :return:                    This SubTrack
+        Assuming the markers are as default, except inline_tag_markers = `[]`:
+        - `{*}{\i1}abc{*[/b1]def}` becomes `{*}{\b1}def{*[/i1]abc}` (AB Swap)
+        - `abc{**[/b1]def}` becomes `abc{*}{\b1}def{*}` (Show Word)
+        - `abc{*}{\b1}def{*}` becomes `abc{**[/b1]def}` (Hide Word)
+
+
+        :param allowed_styles:          List of allowed styles to do the swapping on
+                                        Will run on every line if passed `None`
+        :param print_swaps:             Prints the swaps
+        :param inline_marker:           Marker to use for inline swaps.
+                                        Should be one character. Default `*`
+        :param line_marker:             Marker to use for full-line swaps. Default `***`
+        :param inline_tag_markers:      Two characters that will be replaced with `{}` respectively in the inline swaps.
+                                        Defaults to `None`, which will just remove the `{}` from the swapped text.
+
+        :return:                        This SubTrack
         """
         if not isinstance(inline_marker, str) or not inline_marker.strip():
             warn("Given invalid inline marker. Using default '*'.", self)
@@ -191,11 +215,16 @@ class SubFile(BaseSubFile):
             warn("Given invalid line marker. Using default '***'.", self)
             line_marker = "***"
 
+        if inline_tag_markers:
+            if len(inline_tag_markers) != 2 or inline_tag_markers[0] == inline_tag_markers[1] or any([m in "{}" for m in inline_tag_markers]):
+                warn("Given invalid inline comment markers. Using default 'None'.", self)
+                inline_tag_markers = None
+
         marker = re.escape(inline_marker)
 
-        ab_swap_regex = re.compile(rf"{{{marker}}}([^{{]*){{{marker}([^}}*]+)}}")
+        ab_swap_regex = re.compile(rf"{{{marker}}}(.*?){{{marker}([^}}*]+)}}")
         show_word_regex = re.compile(rf"{{{marker}{marker}([^}}]+)}}")
-        hide_word_regex = re.compile(rf"{{{marker}}}([^{{]*){{{marker} *}}")
+        hide_word_regex = re.compile(rf"{{{marker}}}(.*?){{{marker} *}}")
 
         def _do_autoswap(lines: LINES):
             for i, line in enumerate(lines):
@@ -203,30 +232,55 @@ class SubFile(BaseSubFile):
                     to_swap: dict = {}
                     # {*}This will be replaced{*With this}
                     for match in re.finditer(ab_swap_regex, line.text):
-                        to_swap.update({f"{match.group(0)}": f"{{{inline_marker}}}{match.group(2)}{{{inline_marker}{match.group(1)}}}"})
+                        if inline_tag_markers:
+                            to_swap.update(
+                                {
+                                    f"{match.group(0)}": f"{{{inline_marker}}}{match.group(2).replace(inline_tag_markers[0], '{').replace(inline_tag_markers[1], '}').replace('/', '\\')}{{{inline_marker}{match.group(1).replace('{', inline_tag_markers[0]).replace('}', inline_tag_markers[1], ).replace('\\', '/')}}}"
+                                }
+                            )
+                        else:
+                            to_swap.update(
+                                {
+                                    f"{match.group(0)}": f"{{{inline_marker}}}{match.group(2)}{{{inline_marker}{match.group(1).replace('{', '').replace('}', '')}}}"
+                                }
+                            )
 
                     # This sentence is no longer{** incomplete}
                     for match in re.finditer(show_word_regex, line.text):
-                        to_swap.update({f"{match.group(0)}": f"{{{inline_marker}}}{match.group(1)}{{{inline_marker}}}"})
-
-                    # This sentence is no longer{*} incomplete{*}
+                        if inline_tag_markers:
+                            to_swap.update(
+                                {
+                                    f"{match.group(0)}": f"{{{inline_marker}}}{match.group(1).replace(inline_tag_markers[0], '{').replace(inline_tag_markers[1], '}').replace('/', '\\')}{{{inline_marker}}}"
+                                }
+                            )
+                        else:
+                            to_swap.update({f"{match.group(0)}": f"{{{inline_marker}}}{match.group(1)}{{{inline_marker}}}"})
+
+                    # This sentence is no longer{*} complete{*}
                     for match in re.finditer(hide_word_regex, line.text):
-                        to_swap.update({f"{match.group(0)}": f"{{{inline_marker*2}{match.group(1)}}}"})
-                    # print(to_swap)
+                        if inline_tag_markers:
+                            to_swap.update(
+                                {
+                                    f"{match.group(0)}": f"{{{inline_marker*2}{match.group(1).replace('{', inline_tag_markers[0]).replace('}', inline_tag_markers[1]).replace('\\', '/')}}}"
+                                }
+                            )
+                        else:
+                            to_swap.update({f"{match.group(0)}": f"{{{inline_marker*2}{match.group(1).replace('{', '').replace('}', '')}}}"})
+
                     for key, val in to_swap.items():
                         if print_swaps:
-                            info(f'autoswapper: Swapped "{key}" for "{val}" on line {i}', self)
+                            info(f'autoswapper: Swapped "{log_escape(key)}" for "{log_escape(val)}" on line {i}', self)
                         line.text = line.text.replace(key, val)
 
                     if line.effect.strip() == line_marker or line.name.strip() == line_marker:
                         if isinstance(line, Comment):
                             line.TYPE = "Dialogue"
                             if print_swaps:
-                                info(f'autoswapper: Uncommented Line {i} - "{line.text}"', self)
+                                info(f'autoswapper: Uncommented Line {i} - "{log_escape(line.text)}"', self)
                         elif isinstance(line, Dialogue):
                             line.TYPE = "Comment"
                             if print_swaps:
-                                info(f'autoswapper: Commented Line {i} - "{line.text}"', self)
+                                info(f'autoswapper: Commented Line {i} - "{log_escape(line.text)}"', self)
 
         self.manipulate_lines(_do_autoswap)
         return self
@@ -318,6 +372,7 @@ class SubFile(BaseSubFile):
         fps: Fraction | PathLike = Fraction(24000, 1001),
         use_actor_field: bool = False,
         no_error: bool = False,
+        sort_lines: bool = False,
     ) -> SubFileSelf:
         """
         Merge another subtitle file with syncing if needed.
@@ -329,6 +384,8 @@ class SubFile(BaseSubFile):
         :param fps:             The fps used for time calculations. Also accepts a timecode (v2) file.
         :param use_actor_field: Checks the actor field instead of effect for the names if True.
         :param no_error:        Don't error and warn instead if syncpoint not found.
+        :param sort_lines:      Sort the lines by the starting timestamp.
+                                This was done by default before but may cause issues with subtitles relying on implicit layering.
         """
 
         file = ensure_path_exists(file, self)
@@ -377,7 +434,7 @@ class SubFile(BaseSubFile):
                 break
 
         # Merge lines from file
-        for line in sorted_lines:
+        for line in sorted_lines if sort_lines else mergedoc.events:
             # Don't apply any offset if sync=None for plain merging or if target == source
             if target is None or target == second_sync:
                 tomerge.append(line)

{muxtools-0.2.0 → muxtools-0.2.2}/muxtools/utils/download.py

@@ -28,13 +28,13 @@ class Tool:
 tools = [
     Tool("CUETools.FLACCL.cmd", "https://github.com/gchudov/cuetools.net/releases/download/v2.2.6/CUETools_2.2.6.zip", ["flaccl"]),
     # non-free builds for libfdk_aac if one so desires
-    Tool("ffmpeg", "https://github.com/Vodes/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.0-latest-win64-nonfree-7.0.zip", ["ffprobe"]),
-    Tool("mkvmerge", "https://mkvtoolnix.download/windows/releases/87.0/mkvtoolnix-64-bit-87.0.7z", ['mkvextract', 'mkvinfo', 'mkvpropedit']), 
+    Tool("ffmpeg", "https://github.com/Vodes/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.1-latest-win64-nonfree-7.1.zip", ["ffprobe"]),
+    Tool("mkvmerge", "https://mkvtoolnix.download/windows/releases/89.0/mkvtoolnix-64-bit-89.0.7z", ['mkvextract', 'mkvinfo', 'mkvpropedit']), 
     Tool("eac3to", "https://files.catbox.moe/hn9oms.7z"), # Custom package because of removed sounds and updated libFlac
     Tool("x264", "https://github.com/DJATOM/x264-aMod/releases/download/r3101+20/x264-aMod-x64-core164-r3101+20.7z"),
     Tool("x265", "https://github.com/DJATOM/x265-aMod/releases/download/3.5+67/x265-x64-v3.5+67-aMod-gcc12.2.1+opt.7z"),
     Tool("qaac", "https://files.catbox.moe/z9q796.7z"), # 2.79 with flac, w64 and iTunes libraries included
-    Tool("opusenc", "https://www.rarewares.org/files/opus/opustools-0.2-20230419-x64.zip"),
+    Tool("opusenc", "https://www.rarewares.org/files/opus/opus-tools%200.2-34-g98f3ddc-x64.zip"),
     Tool("flac", "https://github.com/xiph/flac/releases/download/1.4.3/flac-1.4.3-win.zip"),
     Tool("wavpack", "https://github.com/dbry/WavPack/releases/download/5.7.0/wavpack-5.7.0-x64.zip")
 ]
@@ -46,9 +46,8 @@ tools = [
 def get_executable(type: str, can_download: bool | None = None, can_error: bool = True) -> str:
     if can_download is None:
         can_download = download_allowed()
-    type = type.lower()
     path = sh.which(type)
-    env = os.environ.get(f"vof_exe_{type}", None)
+    env = os.environ.get(f"vof_exe_{type.lower()}", None)
     if env:
         path = Path(env)
         if path.exists():
@@ -64,9 +63,9 @@ def get_executable(type: str, can_download: bool | None = None, can_error: bool
                 return None
             raise crit(f"{type.lower()} executable not found in path!", get_executable)
         else:
-            path = download_binary(type)
+            path = download_binary(type.lower())
 
-    return path
+    return str(path)
 
 
 def download_binary(type: str) -> str:

{muxtools-0.2.0 → muxtools-0.2.2}/muxtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muxtools
-Version: 0.2.0
+Version: 0.2.2
 Summary: A library for various muxing and automation tools for anything and everything fansubbing related
 Author-email: Vodes <vodes.imp@gmail.com>
 License: MPL 2.0

{muxtools-0.2.0 → muxtools-0.2.2}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "muxtools"
-version = "0.2.0"
+version = "0.2.2"
 description = "A library for various muxing and automation tools for anything and everything fansubbing related"
 authors = [{ name = "Vodes", email = "vodes.imp@gmail.com" }]
 dependencies = [