Moved _exec() from ffmpegprocess to path

tikuma-lsuhsc · tikuma-lsuhsc · commit 1f453308b57c · 2022-03-13T16:43:46.000-05:00
diff --git a/src/ffmpegio/__init__.py b/src/ffmpegio/__init__.py
@@ -57,7 +57,7 @@
 
 __version__ = "0.4.3"
 
-ffmpeg_info = ffmpegprocess.versions
+ffmpeg_info = path.versions
 set_path = path.find
 get_path = path.where
 is_ready = path.found
diff --git a/src/ffmpegio/devices.py b/src/ffmpegio/devices.py
@@ -1,5 +1,6 @@
 import logging
-from ffmpegio.ffmpegprocess import _exec, PIPE, DEVNULL
+from ffmpegio.path import _exec
+from subprocess import PIPE, DEVNULL
 from . import plugins
 import re
 
diff --git a/src/ffmpegio/ffmpegprocess.py b/src/ffmpegio/ffmpegprocess.py
@@ -19,7 +19,7 @@
 
 """
 
-import logging, re, shlex
+import logging, re
 from os import path, devnull
 from threading import Thread
 import subprocess as sp
@@ -182,52 +182,6 @@ def iswritable(f):
     return sp_run(args, stdin=inpipe, stdout=outpipe, stderr=errpipe, **sp_kwargs)
 
 
-def _exec(args, **other_run_args):
-    '''just run ffmpeg without bells-n-whistles
-    
-    :param args: FFmpeg command arguments without `ffmpeg`
-    :type args: str or Sequence[str]
-    :param **other_run_args: subprocess.run() options
-    :type **other_run_args: dict
-    '''
-    if isinstance(args, str):
-        args = shlex.split(args)
-    return sp.run((get_ffmpeg(), *args), **other_run_args)
-
-
-def versions():
-    """Get FFmpeg version and configuration information
-
-    :return: versions of ffmpeg and its av libraries as well as build configuration
-    :rtype: dict
-
-    ==================  ====  =========================================
-    key                 type  description
-    ==================  ====  =========================================
-    'version'           str   FFmpeg version
-    'configuration'     list  list of build configuration options
-    'library_versions'  dict  version numbers of dependent av libraries
-    ==================  ====  =========================================
-
-    """
-    s = _exec(
-        ["-version"], stdout=PIPE, universal_newlines=True, encoding="utf-8"
-    ).stdout.splitlines()
-    v = dict(version=re.match(r"ffmpeg version (\S+)", s[0])[1])
-    i = 2 if s[1].startswith("built with") else 1
-    if s[i].startswith("configuration:"):
-        v["configuration"] = sorted([m[1] for m in re.finditer(r"\s--(\S+)", s[i])])
-        i += 1
-    lv = None
-    for l in s[i:]:
-        m = re.match(r"(\S+)\s+(.+?) /", l)
-        if m:
-            if lv is None:
-                lv = v["library_versions"] = {}
-            lv[m[1]] = m[2].replace(" ", "")
-    return v
-
-
 def monitor_process(proc, on_exit=None):
     """thread function to monitor subprocess termination
 
diff --git a/src/ffmpegio/path.py b/src/ffmpegio/path.py
@@ -1,7 +1,7 @@
 from os import path as _path, name as _os_name
 from shutil import which
 from subprocess import run, PIPE
-import re
+import re, shlex, subprocess as sp
 from packaging.version import Version
 
 from . import plugins
@@ -107,3 +107,49 @@ def find(ffmpeg_path=None, ffprobe_path=None):
         if res is None:
             raise RuntimeError("Failed to auto-detect ffmpeg and ffprobe executable.")
         FFMPEG_BIN, FFPROBE_BIN = res
+
+
+def _exec(args, **other_run_args):
+    """just run ffmpeg without bells-n-whistles
+
+    :param args: FFmpeg command arguments without `ffmpeg`
+    :type args: str or Sequence[str]
+    :param **other_run_args: subprocess.run() options
+    :type **other_run_args: dict
+    """
+    if isinstance(args, str):
+        args = shlex.split(args)
+    return sp.run((where(), *args), **other_run_args)
+
+
+def versions():
+    """Get FFmpeg version and configuration information
+
+    :return: versions of ffmpeg and its av libraries as well as build configuration
+    :rtype: dict
+
+    ==================  ====  =========================================
+    key                 type  description
+    ==================  ====  =========================================
+    'version'           str   FFmpeg version
+    'configuration'     list  list of build configuration options
+    'library_versions'  dict  version numbers of dependent av libraries
+    ==================  ====  =========================================
+
+    """
+    s = _exec(
+        ["-version"], stdout=PIPE, universal_newlines=True, encoding="utf-8"
+    ).stdout.splitlines()
+    v = dict(version=re.match(r"ffmpeg version (\S+)", s[0])[1])
+    i = 2 if s[1].startswith("built with") else 1
+    if s[i].startswith("configuration:"):
+        v["configuration"] = sorted([m[1] for m in re.finditer(r"\s--(\S+)", s[i])])
+        i += 1
+    lv = None
+    for l in s[i:]:
+        m = re.match(r"(\S+)\s+(.+?) /", l)
+        if m:
+            if lv is None:
+                lv = v["library_versions"] = {}
+            lv[m[1]] = m[2].replace(" ", "")
+    return v
diff --git a/src/ffmpegio/plugins/devices/dshow.py b/src/ffmpegio/plugins/devices/dshow.py
@@ -1,8 +1,8 @@
 """ DirectShow device"""
 
 from copy import deepcopy
+from subprocess import PIPE
 from ffmpegio import path
-from ffmpegio.ffmpegprocess import run
 import re, logging
 from packaging.version import Version
 
@@ -21,12 +21,18 @@ def _rescan():
 
     global DSHOW_DEVICES
 
-    logs = run(
-        {
-            "inputs": [("dummy", {"f": "dshow", "list_devices": True})],
-            "global_options": {"loglevel": "repeat+info"},
-        },
-        capture_log=True,
+    logs = path._exec(
+        [
+            "-f",
+            "dshow",
+            "-list_devices",
+            "true",
+            "-i",
+            "dummy",
+            "-loglevel",
+            "repeat+info",
+        ],
+        stderr=PIPE,
         universal_newlines=True,
     ).stderr
 
@@ -149,12 +155,9 @@ def _list_options(dev_type, spec):
     is_video = dev["media_type"] == "video"
 
     url = f'{dev["media_type"]}={dev["name"]}'
-    logs = run(
-        {
-            "inputs": [(url, {"f": "dshow", "list_options": True})],
-            "global_options": {"loglevel": "repeat+info"},
-        },
-        capture_log=True,
+    logs = path._exec(
+        ["-f", "dshow", "-list_options", "true", "-i", url, "-loglevel", "repeat+info"],
+        stderr=PIPE,
         universal_newlines=True,
     ).stderr
 
diff --git a/tests/test_ffmpegprocess.py b/tests/test_ffmpegprocess.py
@@ -4,10 +4,6 @@
 # logging.basicConfig(level=logging.DEBUG)
 
 
-def test_versions():
-    assert "version" in ffmpegprocess.versions()
-
-
 def test_run_help():
     ffmpegprocess.run({"global_options": {"help": None}})
 
diff --git a/tests/test_path.py b/tests/test_path.py
@@ -31,6 +31,9 @@ def test_found():
 def test_where():
     assert path.where() is not None  # assuming ffmpeg is found
 
+def test_versions():
+    assert "version" in path.versions()
+
 
 if __name__ == "__main__":
     test_find()
