version bump =>0.0.3

tikuma-lsuhsc · tikuma-lsuhsc · commit feaf606a210d · 2021-04-12T11:04:05.000-05:00
renamed transcode_sync() to transcode()
added force option to transcode()
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 numpy
 matplotlib
 pytest
-PyQt5
+PyQt5
+wheel
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ffmpegio
-version = 0.0.2
+version = 0.0.3
 description = Read/write media files with FFmpeg
 long_description = Read/write media files with FFmpeg; file: LICENSE
 keywords = multimedia
diff --git a/src/ffmpegio/__init__.py b/src/ffmpegio/__init__.py
@@ -12,7 +12,7 @@
 underlying 
 """
 
-from .transcode import transcode_sync
+from .transcode import transcode
 from . import caps
 from . import probe
 from . import audio
@@ -21,4 +21,4 @@
 
 set_path = _ffmpeg.find
 
-__all__ = ["transcode_sync", "caps", "probe", "set_path", "audio", "image"]
+__all__ = ["transcode", "caps", "probe", "set_path", "audio", "image"]
diff --git a/src/ffmpegio/ffmpeg.py b/src/ffmpegio/ffmpeg.py
@@ -286,8 +286,7 @@ def run_sync(
         args.insert(1, "-hide_banner")
 
     ret = sp.run(args, *sp_arg, stdout=stdout, stderr=stderr, **sp_kwargs)
-    if ret.returncode != 0:
-        print(ret.stderr)
+    if ret.returncode != 0 and ret.stderr is not None:
         raise Exception(f"execution failed\n   {shlex.join(args)}\n\n{ret.stderr.decode('utf-8')}")
     return ret.stdout
 
@@ -302,8 +301,7 @@ def run(args, *sp_arg, hide_banner=True, stdout=sp.PIPE, stderr=sp.PIPE, **sp_kw
         args.insert(1, "-hide_banner")
 
     ret = sp.run(args, *sp_arg, stdout=stdout, stderr=stderr, **sp_kwargs)
-    if ret.returncode != 0:
-        print(ret.stderr)
+    if ret.returncode != 0 and ret.stderr is not None:
         raise Exception(f"execution failed\n   {shlex.join(args)}\n\n{ret.stderr.decode('utf-8')}")
     return ret.stdout
 
diff --git a/src/ffmpegio/transcode.py b/src/ffmpegio/transcode.py
@@ -1,8 +1,10 @@
+from os import path
+
 from . import ffmpeg
 from . import probe
 
 
-def transcode_sync(
+def transcode(
     input_url,
     output_url,
     start=None,
@@ -18,6 +20,7 @@ def transcode_sync(
     video_crf=None,
     video_pix_fmt=None,
     video_filter=None,
+    force=None,
     input_options=None,
     output_options=None,
     global_options=None,
@@ -26,7 +29,7 @@ def transcode_sync(
 
     https://ffmpeg.org/ffmpeg.html
 
-    :param input_url: url/path of the input media file 
+    :param input_url: url/path of the input media file
     :type input_url: str
     :param output_url: url/path of the output media file
     :type output_url: str
@@ -57,6 +60,8 @@ def transcode_sync(
     :param video_filter: filtergraph definition for filtering video streams, defaults to None
     :type video_filter: str, optional
     :param input_options: dict of user-defined input options, defaults to None. each key is FFmpeg option argument without leading '-' with trailing stream specifier if needed. For flag options, set their values to None.
+    :param force: True to overwrite if file exists or False to skip. If None or
+                  unspecified, FFmpeg will ask for resolution.
     :type input_options: dict, optional
     :param output_options: dict of user-defined output options, defaults to None. each key is FFmpeg option argument without leading '-' with trailing stream specifier if needed. For flag options, set their values to None.
     :type output_options: dict, optional
@@ -66,15 +71,15 @@ def transcode_sync(
     :rtype: int
 
     notes:
-    
+
     `start` vs `end` vs `duration` - Only 2 out of 3 are honored.
 
         =======  =====  ==========  ======================================================================
         `start`  `end`  `duration`  FFmpeg config
         =======  =====  ==========  ======================================================================
            X                        start time specified, transcode till the end of input
                    X                transcode from the beginning of the input till `end` time is hit
-                            X       transcode from the beginning of the input till encoded `duration` long 
+                            X       transcode from the beginning of the input till encoded `duration` long
            X       X                start and end time specified
            X                X       start and duration specified
                    X        X       end and duration nspecified (start = end - duration)
@@ -166,13 +171,36 @@ def transcode_sync(
             ),
         }
 
-    if global_options and isinstance(global_options, str):
-        global_options = ffmpeg.parse_options(global_options)
+    gopts = {}
+    if force is not None:
+        if force:
+            gopts["y"] = None
+        else:
+            gopts["n"] = None
+
+    if global_options:
+        gopts = {
+            **gopts,
+            **(
+                ffmpeg.parse_options(global_options)
+                if isinstance(global_options, str)
+                else global_options
+            ),
+        }
 
     args = dict(
-        global_options=global_options,
+        global_options=gopts,
         inputs=[(input_url, inopts)],
         outputs=[(output_url, outopts)],
     )
 
-    ffmpeg.run_sync(args, stdout=None, stderr=None,)
+    #TODO run async and monitor stderr for better error handling
+    try:
+        ffmpeg.run_sync(
+            args,
+            stdout=None,
+            stderr=None,
+        )
+    except Exception as e:
+        if not (gopts.get("n", True) and path.isfile(output_url)):
+            raise e
diff --git a/tests/test_transcode.py b/tests/test_transcode.py
@@ -15,17 +15,22 @@
 # url = "tests/assets/testaudio-two.wav"
 url = "tests/assets/testaudio-three.wav"
 # url = "tests/assets/testvideo-5m.mpg"
+outext = ".flac"
+
 # url = "tests/assets/testvideo-43.avi"
 # url = "tests/assets/testvideo-169.avi"
-url = r"C:\Users\tikum\Music\(アルバム) [Jazz Fusion] T-SQUARE - T-Square Live featuring F-1 Grand Prix Theme [EAC] (flac+cue).mka"
-outext = ".flac"
+# url = r"C:\Users\tikum\Music\(アルバム) [Jazz Fusion] T-SQUARE - T-Square Live featuring F-1 Grand Prix Theme [EAC] (flac+cue).mka"
+# outext = ".mp4"
 
 with tempfile.TemporaryDirectory() as tmpdirname:
     print(probe.audio_streams_basic(url))
     out_url = path.join(tmpdirname, re.sub(r"\..*?$", outext, path.basename(url)))
     print(out_url)
-    transcode.transcode_sync(url, out_url)
+    transcode(url, out_url, force=True)
     print(probe.audio_streams_basic(out_url))
-
-    with open(path.join(tmpdirname, "progress.txt")) as f:
-        print(f.read())
+    transcode(url, out_url)
+    transcode(url, out_url, force=False)
+    transcode(url, out_url, force=True)
+    
+    # with open(path.join(tmpdirname, "progress.txt")) as f:
+    #     print(f.read())

-Original file line number
+Diff line change
@@ @@ -1,4 +1,5 @@ @@
 numpy
 matplotlib
 pytest
 -PyQt5
 +PyQt5
 +wheel