muxtools 0.2.2__tar.gz → 0.2.3__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: muxtools
-Version: 0.2.2
+Version: 0.2.3
 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.2 → muxtools-0.2.3}/muxtools/audio/encoders.py

@@ -304,7 +304,7 @@ class FDK_AAC(Encoder):
             exe = get_executable("ffmpeg") if not self.use_binary else get_executable("fdkaac")
 
         if os.name == "nt":
-            warn("It is strongly recommended to use qAAC on windows. See docs.", self, 5)
+            warn("It is strongly recommended to use qAAC on windows. See docs.", self, 1)
         info(f"Encoding '{fileIn.file.stem}' to AAC using libFDK...", self)
 
         tags = dict[str, str]()

{muxtools-0.2.2 → muxtools-0.2.3}/muxtools/functions.py

@@ -5,12 +5,13 @@ from collections.abc import Sequence
 from .utils.log import warn, error, info, danger
 from .muxing.muxfiles import AudioFile
 from .audio.audioutils import is_fancy_codec
-from .audio.encoders import Opus
+from .audio.encoders import Opus, qAAC, FDK_AAC
 from .utils.types import PathLike, Trim
 from .audio.extractors import FFMpeg, Sox
 from .utils.files import ensure_path, ensure_path_exists
 from .audio.tools import AutoEncoder, AutoTrimmer, Encoder, Trimmer, Extractor
 from .utils.convert import format_timedelta
+from .utils.download import get_executable
 
 __all__ = ["do_audio"]
 
@@ -21,7 +22,7 @@ def do_audio(
     trims: Trim | list[Trim] | None = None,
     fps: Fraction | PathLike | Sequence[int] = Fraction(24000, 1001),
     num_frames: int = 0,
-    extractor: Extractor = FFMpeg.Extractor(),
+    extractor: Extractor | None = FFMpeg.Extractor(),
     trimmer: Trimmer | None = AutoTrimmer(),
     encoder: Encoder | None = AutoEncoder(),
     quiet: bool = True,
@@ -40,7 +41,7 @@ def do_audio(
                             AutoTrimmer means it will choose ffmpeg for lossy and Sox for lossless
 
     :param encoder:         Tool used to encode the audio
-                            AutoEncoder means it won't reencode lossy and choose opus otherwise
+                            AutoEncoder means it won't reencode lossy and choose opus (for 2.0) or qAAC/FDKAAC (for >2.0) otherwise
 
     :param quiet:           Whether the tool output should be visible
     :param output:          Custom output file or directory, extensions will be automatically added
@@ -77,6 +78,8 @@ def do_audio(
             audio = FFMpeg.Concat(extracted).concat_audio()
         else:
             audio = extractor.extract_audio(fileIn, quiet)
+    else:
+        audio = ensure_path_exists(fileIn, do_audio)
 
     if not isinstance(audio, AudioFile):
         audio = AudioFile.from_file(audio, do_audio)
@@ -89,14 +92,25 @@ def do_audio(
         else:
             trimmer = Sox()
 
+    mediainfo = audio.get_mediainfo()
+
     if isinstance(encoder, AutoEncoder):
         if lossy:
             encoder = None
-        elif is_fancy_codec(audio.get_mediainfo()):
+        elif is_fancy_codec(mediainfo):
             encoder = None
             warn("Audio will not be reencoded due to having Atmos or special DTS features.", do_audio, 2)
         else:
-            encoder = Opus()
+            channels = getattr(mediainfo, "channel_s", None) or 2
+            if channels <= 2:
+                encoder = Opus()
+            else:
+                has_qaac = bool(get_executable("qaac", False, False))
+                if has_qaac:
+                    encoder = qAAC(100, lowpass=20000)
+                else:
+                    warn("Attempting to fall back to FDK_AAC because of a lack of qAAC in current PATH.", do_audio, 1)
+                    encoder = FDK_AAC()
 
     if trimmer and trims:
         if not isinstance(fps, str) and isinstance(fps, Sequence):

{muxtools-0.2.2 → muxtools-0.2.3}/muxtools/misc/chapters.py

@@ -21,7 +21,7 @@ __all__ = ["Chapters"]
 
 
 class Chapters:
-    chapters: list[Chapter] = []
+    chapters: list[Chapter]
     fps: Fraction | PathLike
 
     def __init__(
@@ -190,7 +190,7 @@ class Chapters:
         with open(out_file, "w", encoding="UTF-8") as f:
             f.writelines(
                 [
-                    f"CHAPTER{i:02d}={format_timedelta(chapter[0])}\nCHAPTER{i:02d}NAME=" f'{chapter[1] if chapter[1] else ""}\n'
+                    f"CHAPTER{i:02d}={format_timedelta(chapter[0])}\nCHAPTER{i:02d}NAME={chapter[1] if chapter[1] else ''}\n"
                     for i, chapter in enumerate(self.chapters)
                 ]
             )

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

@@ -222,10 +222,12 @@ class SubFile(BaseSubFile):
 
         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} *}}")
 
+        backslash = "\\" # This is to ensure support for previous python versions that don't allow backslashes in f-strings.
+
         def _do_autoswap(lines: LINES):
             for i, line in enumerate(lines):
                 if not allowed_styles or str(line.style).casefold() in {style.casefold() for style in allowed_styles}:
@@ -235,7 +237,7 @@ class SubFile(BaseSubFile):
                         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('\\', '/')}}}"
+                                    f"{match.group(0)}": f"{{{inline_marker}}}{match.group(2).replace(inline_tag_markers[0], '{').replace(inline_tag_markers[1], '}').replace('/', backslash)}{{{inline_marker}{match.group(1).replace('{', inline_tag_markers[0]).replace('}', inline_tag_markers[1], ).replace(backslash, '/')}}}"
                                 }
                             )
                         else:
@@ -250,7 +252,7 @@ class SubFile(BaseSubFile):
                         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}}}"
+                                    f"{match.group(0)}": f"{{{inline_marker}}}{match.group(1).replace(inline_tag_markers[0], '{').replace(inline_tag_markers[1], '}').replace('/', backslash)}{{{inline_marker}}}"
                                 }
                             )
                         else:
@@ -261,7 +263,7 @@ class SubFile(BaseSubFile):
                         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('\\', '/')}}}"
+                                    f"{match.group(0)}": f"{{{inline_marker*2}{match.group(1).replace('{', inline_tag_markers[0]).replace('}', inline_tag_markers[1]).replace(backslash, '/')}}}"
                                 }
                             )
                         else:

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

@@ -59,8 +59,12 @@ def get_executable(type: str, can_download: bool | None = None, can_error: bool
 
     if path is None:
         if not can_download or can_download is False:
+            if os.name == "nt" and (exe := _find_downloaded_binary(type)):
+                return str(exe)
+
             if not can_error:
                 return None
+
             raise crit(f"{type.lower()} executable not found in path!", get_executable)
         else:
             path = download_binary(type.lower())
@@ -68,21 +72,28 @@ def get_executable(type: str, can_download: bool | None = None, can_error: bool
     return str(path)
 
 
-def download_binary(type: str) -> str:
-    if os.name != "nt":
-        raise EnvironmentError("Of course only Windows is supported for downloading of binaries!")
-
+def _find_downloaded_binary(type: str) -> Path | None:
     binary_dir = Path(os.path.join(os.getcwd(), "_binaries"))
     binary_dir.mkdir(exist_ok=True)
 
     type = type.lower()
 
-    executable: Path = None
     executables = binary_dir.rglob(type + "*.exe")
 
     for exe in sorted(executables):
         if exe.is_file():
             return exe.resolve()
+    return None
+
+
+def download_binary(type: str) -> str:
+    if os.name != "nt":
+        raise EnvironmentError("Of course only Windows is supported for downloading of binaries!")
+
+    if exe := _find_downloaded_binary(type):
+        return str(exe)
+
+    binary_dir = Path(os.path.join(os.getcwd(), "_binaries"))
 
     info(f"Downloading {type} executables...", get_executable)
     url = None
@@ -103,11 +114,7 @@ def download_binary(type: str) -> str:
     info("Done.", get_executable)
     unpack_all(binary_dir)
 
-    executables = binary_dir.rglob(type.lower() + "*.exe")
-
-    for exe in sorted(executables):
-        if exe.is_file():
-            executable = exe
+    executable = _find_downloaded_binary(type)
 
     if executable is None:
         raise error(f"Binary for '{type}' could not have been found!", get_executable)

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: muxtools
-Version: 0.2.2
+Version: 0.2.3
 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.2 → muxtools-0.2.3}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "muxtools"
-version = "0.2.2"
+version = "0.2.3"
 description = "A library for various muxing and automation tools for anything and everything fansubbing related"
 authors = [{ name = "Vodes", email = "vodes.imp@gmail.com" }]
 dependencies = [
@@ -49,7 +49,8 @@ indent-width = 4
 target-version = "py310"
 
 [tool.ruff.lint]
-ignore = ["E722"]
+select = ["F", "E", "RUF012"]
+ignore = ["E722", "E501"]
 fixable = ["F541", "F401", "E712", "E711"]
 exclude = ["__init__.py"]