Implement Cmd string macros (#3)

* Implement Cmd string macros

* reformat code

* Test the cmd macros

* add missing )'s

* interpolate args in command strings

README.md

@@ -14,6 +14,8 @@ FFMPEG.exe("-version")
 ffmpeg_exe("-version")
 ffmpeg_exe(`-version`)
 ffprobe_exe("-version") # we wrap FFPROBE too!
+ffmpeg`-version` # Cmd string macros too
+ffprobe`-version`
 # the AV libraries:
 FFMPEG.libavcodec
 FFMPEG.libavformat

src/FFMPEG.jl

@@ -5,7 +5,7 @@ using BinaryProvider
 const libpath = joinpath(@__DIR__, "..", "deps", "usr", "lib")
 
 if Sys.iswindows()
-    const execenv = ("PATH" => string(libpath,";", Sys.BINDIR))
+    const execenv = ("PATH" => string(libpath, ";", Sys.BINDIR))
 elseif Sys.isapple()
     const execenv = ("DYLD_LIBRARY_PATH" => libpath)
 else
@@ -23,7 +23,7 @@ end
 include(depsjl_path)
 
 
-av_version(v) = VersionNumber(v>>16,(v>>8)&0xff,v&0xff)
+av_version(v) = VersionNumber(v >> 16, (v >> 8) & 0xff, v & 0xff)
 
 have_avcodec()    = Libdl.dlopen_e(libavcodec)    != C_NULL
 have_avformat()   = Libdl.dlopen_e(libavformat)   != C_NULL
@@ -139,6 +139,24 @@ Execute the given arguments as arguments to the `ffprobe` executable.
 """
 ffprobe_exe(args...) = exe(args...; command = ffprobe)
 
-export ffmpeg_exe, @ffmpeg_env, ffprobe_exe, ffmpeg, ffprobe
+"""
+    ffmpeg\`<ARGS>\`
+
+Execute the given arguments as arguments to the `ffmpeg` executable.
+"""
+macro ffmpeg_cmd(arg)
+    esc(:(ffmpeg_exe($arg)))
+end
+
+"""
+    ffprobe\`<ARGS>\`
+
+Execute the given arguments as arguments to the `ffprobe` executable.
+"""
+macro ffprobe_cmd(arg)
+    esc(:(ffprobe_exe($arg)))
+end
+
+export ffmpeg_exe, @ffmpeg_env, ffprobe_exe, ffmpeg, ffprobe, @ffmpeg_cmd, @ffprobe_cmd
 
 end # module

test/runtests.jl

@@ -11,9 +11,11 @@ end
 
 @testset "FFMPEG.jl" begin
     @show FFMPEG.versioninfo()
-    @test text_execute(()-> FFMPEG.exe("-version"))
+    @test text_execute(() -> FFMPEG.exe("-version"))
     @test text_execute(() -> FFMPEG.exe(`-version`))
     @test text_execute(() -> FFMPEG.ffmpeg_exe(`-version`))
     @test text_execute(() -> FFMPEG.ffprobe_exe(`-version`))
+    @test text_execute(() -> ffmpeg`-version`)
+    @test text_execute(() -> ffprobe`-version`)
     @test text_execute(() -> @ffmpeg_env run(`$ffmpeg -version`))
 end