ffmpeg-normalize 1.31.1__py2.py3-none-any.whl → 1.31.3__py2.py3-none-any.whl

ffmpeg_normalize/__main__.py

@@ -559,6 +559,7 @@ def main() -> None:
         extra_input_options=extra_input_options,
         extra_output_options=extra_output_options,
         output_format=cli_args.output_format,
+        extension=cli_args.extension,
         dry_run=cli_args.dry_run,
         progress=cli_args.progress,
     )

ffmpeg_normalize/_cmd_utils.py

@@ -5,9 +5,8 @@ import os
 import re
 import shlex
 import subprocess
-from platform import system
 from shutil import which
-from typing import Iterator, Any
+from typing import Any, Iterator
 
 from ffmpeg_progress_yield import FfmpegProgress
 
@@ -15,7 +14,6 @@ from ._errors import FFmpegNormalizeError
 
 _logger = logging.getLogger(__name__)
 
-NUL = "NUL" if system() in ("Windows", "cli") else "/dev/null"
 DUR_REGEX = re.compile(
     r"Duration: (?P<hour>\d{2}):(?P<min>\d{2}):(?P<sec>\d{2})\.(?P<ms>\d{2})"
 )

ffmpeg_normalize/_ffmpeg_normalize.py

@@ -79,6 +79,7 @@ class FFmpegNormalize:
         extra_input_options (list, optional): Extra input options. Defaults to None.
         extra_output_options (list, optional): Extra output options. Defaults to None.
         output_format (str, optional): Output format. Defaults to None.
+        extension (str, optional): Output file extension to use for output files that were not explicitly specified. Defaults to "mkv".
         dry_run (bool, optional): Dry run. Defaults to False.
         debug (bool, optional): Debug. Defaults to False.
         progress (bool, optional): Progress. Defaults to False.
@@ -117,6 +118,7 @@ class FFmpegNormalize:
         extra_input_options: list[str] | None = None,
         extra_output_options: list[str] | None = None,
         output_format: str | None = None,
+        extension: str = "mkv",
         dry_run: bool = False,
         debug: bool = False,
         progress: bool = False,
@@ -197,6 +199,7 @@ class FFmpegNormalize:
         self.post_filter = post_filter
 
         self.output_format = output_format
+        self.extension = extension
         self.dry_run = dry_run
         self.debug = debug
         self.progress = progress

ffmpeg_normalize/_media_file.py

@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Iterable, Iterator, Literal, TypedDict
 
 from tqdm import tqdm
 
-from ._cmd_utils import DUR_REGEX, NUL, CommandRunner
+from ._cmd_utils import DUR_REGEX, CommandRunner
 from ._errors import FFmpegNormalizeError
 from ._streams import (
     AudioStream,
@@ -67,7 +67,12 @@ class MediaFile:
         self.skip = False
         self.input_file = input_file
         self.output_file = output_file
-        self.output_ext = os.path.splitext(output_file)[1][1:]
+        current_ext = os.path.splitext(output_file)[1][1:]
+        # we need to check if it's empty, e.g. /dev/null or NUL
+        if current_ext == "" or self.output_file == os.devnull:
+            self.output_ext = self.ffmpeg_normalize.extension
+        else:
+            self.output_ext = current_ext
         self.streams: StreamDict = {"audio": {}, "video": {}, "subtitle": {}}
 
         self.parse_streams()
@@ -109,7 +114,7 @@ class MediaFile:
             "0",
             "-f",
             "null",
-            NUL,
+            os.devnull,
         ]
 
         output = CommandRunner().run_command(cmd).get_output()
@@ -424,13 +429,18 @@ class MediaFile:
         # if dry run, only show sample command
         if self.ffmpeg_normalize.dry_run:
             cmd.append(self.output_file)
+            _logger.warning("Dry run used, not actually running second-pass command")
             CommandRunner(dry=True).run_command(cmd)
             yield 100
             return
 
-        temp_dir = mkdtemp()
-        temp_file = os.path.join(temp_dir, f"out.{self.output_ext}")
-        cmd.append(temp_file)
+        # special case: if output is a null device, write directly to it
+        if self.output_file == os.devnull:
+            cmd.append(self.output_file)
+        else:
+            temp_dir = mkdtemp()
+            temp_file = os.path.join(temp_dir, f"out.{self.output_ext}")
+            cmd.append(temp_file)
 
         cmd_runner = CommandRunner()
         try:
@@ -442,13 +452,15 @@ class MediaFile:
                 )
                 raise e
             else:
-                _logger.debug(
-                    f"Moving temporary file from {temp_file} to {self.output_file}"
-                )
-                move(temp_file, self.output_file)
-                rmtree(temp_dir, ignore_errors=True)
+                if self.output_file != os.devnull:
+                    _logger.debug(
+                        f"Moving temporary file from {temp_file} to {self.output_file}"
+                    )
+                    move(temp_file, self.output_file)
+                    rmtree(temp_dir, ignore_errors=True)
         except Exception as e:
-            rmtree(temp_dir, ignore_errors=True)
+            if self.output_file != os.devnull:
+                rmtree(temp_dir, ignore_errors=True)
             raise e
 
         output = cmd_runner.get_output()

ffmpeg_normalize/_streams.py

@@ -4,9 +4,9 @@ import json
 import logging
 import os
 import re
-from typing import TYPE_CHECKING, Iterator, List, Literal, Optional, TypedDict, cast
+from typing import TYPE_CHECKING, Iterator, Literal, TypedDict, cast
 
-from ._cmd_utils import NUL, CommandRunner, dict_to_filter_opts
+from ._cmd_utils import CommandRunner, dict_to_filter_opts
 from ._errors import FFmpegNormalizeError
 
 if TYPE_CHECKING:
@@ -17,6 +17,7 @@ _logger = logging.getLogger(__name__)
 
 _loudnorm_pattern = re.compile(r"\[Parsed_loudnorm_(\d+)")
 
+
 class EbuLoudnessStatistics(TypedDict):
     input_i: float
     input_tp: float
@@ -239,7 +240,7 @@ class AudioStream(MediaStream):
             "-sn",
             "-f",
             "null",
-            NUL,
+            os.devnull,
         ]
 
         cmd_runner = CommandRunner()
@@ -310,7 +311,7 @@ class AudioStream(MediaStream):
             "-sn",
             "-f",
             "null",
-            NUL,
+            os.devnull,
         ]
 
         cmd_runner = CommandRunner()
@@ -322,11 +323,13 @@ class AudioStream(MediaStream):
         )
 
         # only one stream
-        self.loudness_statistics["ebu_pass1"] = next(iter(AudioStream.prune_and_parse_loudnorm_output(output).values()))
+        self.loudness_statistics["ebu_pass1"] = next(
+            iter(AudioStream.prune_and_parse_loudnorm_output(output).values())
+        )
 
     @staticmethod
     def prune_and_parse_loudnorm_output(
-        output: str
+        output: str,
     ) -> dict[int, EbuLoudnessStatistics]:
         """
         Prune ffmpeg progress lines from output and parse the loudnorm filter output.
@@ -344,7 +347,7 @@ class AudioStream(MediaStream):
 
     @staticmethod
     def _parse_loudnorm_output(
-        output_lines: list[str]
+        output_lines: list[str],
     ) -> dict[int, EbuLoudnessStatistics]:
         """
         Parse the output of a loudnorm filter to get the EBU loudness statistics.
@@ -403,7 +406,9 @@ class AudioStream(MediaStream):
                                 # convert to floats
                                 loudnorm_stats[key] = float(loudnorm_stats[key])
 
-                        result[stream_index] = cast(EbuLoudnessStatistics, loudnorm_stats)
+                        result[stream_index] = cast(
+                            EbuLoudnessStatistics, loudnorm_stats
+                        )
                         stream_index = -1
                     except Exception as e:
                         raise FFmpegNormalizeError(
@@ -504,15 +509,11 @@ class AudioStream(MediaStream):
             "offset": self._constrain(
                 stats["target_offset"], -99, 99, name="target_offset"
             ),
-            "measured_i": self._constrain(
-                stats["input_i"], -99, 0, name="input_i"
-            ),
+            "measured_i": self._constrain(stats["input_i"], -99, 0, name="input_i"),
             "measured_lra": self._constrain(
                 stats["input_lra"], 0, 99, name="input_lra"
             ),
-            "measured_tp": self._constrain(
-                stats["input_tp"], -99, 99, name="input_tp"
-            ),
+            "measured_tp": self._constrain(stats["input_tp"], -99, 99, name="input_tp"),
             "measured_thresh": self._constrain(
                 stats["input_thresh"], -99, 0, name="input_thresh"
             ),

ffmpeg_normalize/_version.py

@@ -1 +1 @@
-__version__ = "1.31.1"
+__version__ = "1.31.3"

{ffmpeg_normalize-1.31.1.dist-info → ffmpeg_normalize-1.31.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ffmpeg-normalize
-Version: 1.31.1
+Version: 1.31.3
 Summary: Normalize audio via ffmpeg
 Home-page: https://github.com/slhck/ffmpeg-normalize
 Author: Werner Robitza
@@ -671,6 +671,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # Changelog
 
 
+## v1.31.3 (2025-04-14)
+
+* Swap NUL to os.devnull.
+
+
+## v1.31.2 (2025-03-19)
+
+* Fix: special handling of /dev/null.
+
+
 ## v1.31.1 (2025-02-19)
 
 * Fix bitrate setting for libvorbis, fixes #277.

ffmpeg_normalize-1.31.3.dist-info/RECORD

@@ -0,0 +1,16 @@
+ffmpeg_normalize/__init__.py,sha256=aAhlk93ZE6SQcWUDzZQcw9vJh0bJcKEUNFGhVc5ZIto,453
+ffmpeg_normalize/__main__.py,sha256=qOiycud87-wBceNLujaPZgWCTwJr7kaJM-IBvz4D7f4,19431
+ffmpeg_normalize/_cmd_utils.py,sha256=iGzO3iOylDUOnx-FCKd84BMxiIhmIthxU1tg7kvf4Ss,5269
+ffmpeg_normalize/_errors.py,sha256=brTQ4osJ4fTA8wnyMPVVYfGwJ0wqeShRFydTEwi_VEY,48
+ffmpeg_normalize/_ffmpeg_normalize.py,sha256=JIVE03ZJi-jOvnc7OuftQEqloQwwyO7ZD3PIMFmIvbo,11283
+ffmpeg_normalize/_logger.py,sha256=3Ap4Fxg7xGrzz7h4IGuNEf0KKstx0Rq_eLbHPrHzcrI,1841
+ffmpeg_normalize/_media_file.py,sha256=c_u-f1XXLg26RkN825-YmleSZLVqLu42EBxybiyhdqU,18893
+ffmpeg_normalize/_streams.py,sha256=C0b8GT4EK0W02x8pM99H1-BjjO-pLxYFNvZ4R7gu4CM,20223
+ffmpeg_normalize/_version.py,sha256=TITwbgAbYbb0TTsjNH09bidAABZM-hqec2XVSZ9BDPY,23
+ffmpeg_normalize/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ffmpeg_normalize-1.31.3.dist-info/LICENSE,sha256=zeqAHGWrSIwdPHsZMZv1_N0gGFO1xxjcZEz9CplR4EM,1086
+ffmpeg_normalize-1.31.3.dist-info/METADATA,sha256=9QkgKN6BohVDpX0ot_EZdUwRz8zLiHPN7FY2rks9s2k,60327
+ffmpeg_normalize-1.31.3.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+ffmpeg_normalize-1.31.3.dist-info/entry_points.txt,sha256=X0EC5ptb0iGOxrk3Aa65dVQtvUixngLd_2-iAtSixdc,68
+ffmpeg_normalize-1.31.3.dist-info/top_level.txt,sha256=wnUkr17ckPrrU1JsxZQiXbEBUnHKsC64yck-MemEBuI,17
+ffmpeg_normalize-1.31.3.dist-info/RECORD,,

ffmpeg_normalize-1.31.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-ffmpeg_normalize/__init__.py,sha256=aAhlk93ZE6SQcWUDzZQcw9vJh0bJcKEUNFGhVc5ZIto,453
-ffmpeg_normalize/__main__.py,sha256=AuyIcMU1WxGamczZtZyISfgMsEIt3Y1kSJ87dCoH9J4,19393
-ffmpeg_normalize/_cmd_utils.py,sha256=S7PLXQAZHmJ30RM9K6b--vXuxMf-cQHtaFOPtILxz-4,5360
-ffmpeg_normalize/_errors.py,sha256=brTQ4osJ4fTA8wnyMPVVYfGwJ0wqeShRFydTEwi_VEY,48
-ffmpeg_normalize/_ffmpeg_normalize.py,sha256=VoxhER57Ew0RKC_WcGpoCmyKKoqsHYuqNFMm7z4BPM4,11080
-ffmpeg_normalize/_logger.py,sha256=3Ap4Fxg7xGrzz7h4IGuNEf0KKstx0Rq_eLbHPrHzcrI,1841
-ffmpeg_normalize/_media_file.py,sha256=BnFTOGOAxzofGS5k7ueG3k6LsUxro_VM6qWCQH5o81A,18258
-ffmpeg_normalize/_streams.py,sha256=LIllXl4SKLxlyPVjD3ieHqc_byF2eUTjnK-clh2g_CY,20211
-ffmpeg_normalize/_version.py,sha256=VFBXpgylen4bFLDe4KfNX1OmaXu_M6UnJYtTvQRQz4c,23
-ffmpeg_normalize/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ffmpeg_normalize-1.31.1.dist-info/LICENSE,sha256=zeqAHGWrSIwdPHsZMZv1_N0gGFO1xxjcZEz9CplR4EM,1086
-ffmpeg_normalize-1.31.1.dist-info/METADATA,sha256=Trwdo0wpKwL38BgLgBLXzAWhqyMjhEnKDgL2jFHtMXU,60209
-ffmpeg_normalize-1.31.1.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-ffmpeg_normalize-1.31.1.dist-info/entry_points.txt,sha256=X0EC5ptb0iGOxrk3Aa65dVQtvUixngLd_2-iAtSixdc,68
-ffmpeg_normalize-1.31.1.dist-info/top_level.txt,sha256=wnUkr17ckPrrU1JsxZQiXbEBUnHKsC64yck-MemEBuI,17
-ffmpeg_normalize-1.31.1.dist-info/RECORD,,