Merge branch 'master' into add-exception

audioqc

@@ -44,7 +44,7 @@ end
 # If no extenstion is specified it will target the default 'wav' extension. (Not case sensitive)
 options = []
 ARGV.options do |opts|
-  opts.on('-a', '--all') { options += ['meta', 'bext', 'signal', 'dropouts', 'md5'] }
+  opts.on('-a', '--all') { options += ['meta', 'bext', 'signal', 'md5'] }
   opts.on('-b', '--bext-scan') { options << 'bext' }
   opts.on('-c', '--checksum') { options << 'md5' }
   opts.on('-d', '--dropout-scan') { options << 'dropouts' }
@@ -250,10 +250,10 @@ class QcTarget
       @qc_results = []
       policy_path = File.path(policy)
       command = 'mediaconch --Policy=' + '"' + policy_path + '" ' + '"' + @input_path + '"'
-      media_conch_out = `#{command}`
+      media_conch_out = `#{command}`.gsub(@input_path, "")
       media_conch_out.strip!
       media_conch_out.split('/n').each {|qcline| @qc_results << qcline}
-      @qc_results = @qc_results.to_s
+      @qc_results = @qc_results.to_s.gsub('\n   -- ', '; ')
       if File.exist?(policy)
         if @qc_results.include?('pass!')
           @qc_results = 'PASS'
@@ -349,6 +349,7 @@ end
 
 file_inputs.each do |fileinput|
   begin
+    puts "Scanning: #{fileinput}"
     targetPath = File.expand_path(fileinput)
     target = QcTarget.new(targetPath)
     target.get_mediainfo