From 6d67d9c2af57233743187a92b7e651174d6eb42b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 26 Aug 2013 00:35:03 +0000 Subject: process (qx): disambiguate err/err_str, add no_raise I forgot :err is already handled by Process.spawn, so split out the functionality into err_str where we want to use it. Also, add a :no_raise flag which will allow us to better handle avprobe/soxi calls which can fail and avoid needless exceptions. --- lib/dtas/source/sox.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/dtas/source/sox.rb') diff --git a/lib/dtas/source/sox.rb b/lib/dtas/source/sox.rb index 086b923..30e7f18 100644 --- a/lib/dtas/source/sox.rb +++ b/lib/dtas/source/sox.rb @@ -19,7 +19,7 @@ class DTAS::Source::Sox # :nodoc: def self.try(infile, offset = nil) err = "" - DTAS::Process.qx(%W(soxi #{infile}), err: err) + DTAS::Process.qx(%W(soxi #{infile}), err_str: err) return if err =~ /soxi FAIL formats:/ new(infile, offset) rescue @@ -69,7 +69,7 @@ class DTAS::Source::Sox # :nodoc: err = "" cmd = %W(soxi -a #@infile) begin - qx(cmd, err: err).split(/\n/).each do |line| + qx(cmd, err_str: err).split(/\n/).each do |line| key, value = line.split(/=/, 2) key && value or next # TODO: multi-line/multi-value/repeated tags -- cgit v1.2.3-24-ge0c7