vcs_ruby 1.0.0 → 1.0.1

data/bin/vcs.rb

@@ -79,14 +79,14 @@ optparse = OptionParser.new do|opts|
   end
   opts.on( '-o [FILE]', '--output [FILE]', 'File name of output. When ommited will be derived from the input filename. Can be repeated for multiple files.') do |file|
     options[:output] << file
-  end
+  end	
   opts.on( '-s [SIGNATURE]', '--signature [SIGNATURE]', 'Change the image signature to your preference.') do |signature|
     options[:signature] = signature
   end
   opts.on( '--no-signature', 'Remove footer with signature') do
     options[:no_signature] = true
   end
-  opts.on( '-l [HIGHLIGHT]', '--highlight [HIGHLIGHT]' 'Add the frame found at timestamp [HIGHLIGHT] as a highlight.') do |highlight|
+  opts.on( '-l [HIGHLIGHT]', '--highlight [HIGHLIGHT]', 'Add the frame found at timestamp [HIGHLIGHT] as a highlight.') do |highlight|
     options[:highlight] = TimeIndex.new highlight
   end
   opts.on("--[no-]timestamp", "Add timestamp to thumbnails. Default: true") do |timestamp|
@@ -95,19 +95,22 @@ optparse = OptionParser.new do|opts|
   opts.on("--[no-]shadow", "Add shadow to thumbnails. Default: true") do |shadow|
     options[:shadow] = shadow
   end
-  opts.on("--[no-]polaroid", "Thumbnails look as polaroid frames. Default: false") do |polaroid|
+  opts.on("--[no-]polaroid", "Add  polaroid frame to thumbnail. Default: false") do |polaroid|
     options[:polaroid] = polaroid
   end
-  opts.on( '-p [PROFILE]', '--profile [PROFILE]' 'Loads additional setting from profile.yml.') do |profile|
+  opts.on( '-p [PROFILE]', '--profile [PROFILE]', 'Loads additional setting from profile.yml.') do |profile|
     options[:profile] = profile
   end
-  opts.on( '-q', '--quiet', 'Don\'t print progress messages just errors. Repeat to mute completely, even on error.') do |file|
+  opts.on( '-q', '--quiet', 'Don\'t print progress messages just errors.') do |file|
     options[:quiet] = true
   end
+  opts.on('--continue', 'Prints Error message and continues with next file (if any left)') do |file|
+    options[:continue] = true
+  end
   opts.on("-V", "--verbose", "More verbose Output.") do
     options[:verbose] = true
   end
-  opts.on( '-v', '--version', 'Version' ) do
+  opts.on( '-v', '--version', 'Current Version' ) do
     puts $vcs_ruby_name + ' ' + $vcs_ruby_version.to_s
     exit 0
   end
@@ -143,14 +146,24 @@ Tools::quiet = options[:quiet]
 
 # Invoke ContactSheet
 
-begin
-  ARGV.each_with_index do |video, index|
+errors = {}
+ARGV.each_with_index do |video, index|
+  begin
     sheet = Tools::contact_sheet_with_options video, options
     sheet.initialize_filename(options[:output][index]) if options[:output][index]
     sheet.build
+  rescue Exception => e
+    errors[video] = e
+    STDERR.puts "ERROR: #{e.message}"
+    STDERR.puts "#{e.backtrace.join("\n")}" if options[:verbose]
+    break unless options[:continue]
   end
-rescue Exception => e
-  STDERR.puts "ERROR: #{e.message}"
-  STDERR.puts "#{e.backtrace.join("\n")}" if options[:verbose]
 end
 
+if options[:continue] && errors.length > 0
+  errors.each do |video, e|
+    STDERR.puts "File: #{video}"
+    STDERR.puts "ERROR: #{e.message}"
+ end
+ STDERR.puts "Total: #{errors.length} Errors"
+end

data/lib/libav.rb

@@ -104,10 +104,14 @@ module VCSRuby
     end
 
     def format_split line
-      e = line[ENCODING_SUPPORT] == 'E'
-      v = line[VIDEO_CODEC] == 'V'
+      correction = 0
+      unless line[0] == ' '
+        correction = 1
+      end
+      e = line[ENCODING_SUPPORT - correction] == 'E'
+      v = line[VIDEO_CODEC - correction] == 'V'
 
-      name = line[NAME..-1].split(' ', 2).first
+      name = line[NAME-correction..-1].split(' ', 2).first
       return name, e, v
     rescue
       return nil, false, false
@@ -166,6 +170,7 @@ private
     end
 
     def split_stream_line line
+      return [nil, nil, 'none'] unless line
       parts = line.split(',')
       stream = parts.shift
       result = stream.split(':')

data/lib/oldstyle.yml

@@ -1,12 +1,22 @@
 style:
   header:
-    color: Black
-    background: YellowGreen
+    font: Nimbus-Mono-L-Bold
+    size: 18
+    color: Green
+    background: Black
   title:
+    font: Nimbus-Mono-L-Bold
+    size: 40
+    color: Green
+    background: Black
     color: White
     background: Black
   contact:
-    background: White
+    background: Black
   signature:
-    color: Black
-    background: SandyBrown
+    font: Nimbus-Mono-L-Bold
+    size: 18
+    color: Green
+    background: Black
+filter:
+  softshadow: false

data/lib/tools.rb

@@ -58,7 +58,7 @@ module VCSRuby
       sheet.to = options[:to] if options[:to]
       sheet.highlight = options[:highlight] if options[:highlight]
 
-      sheet.timestamps = options[:timestamps] if options[:timestamps] != nil
+      sheet.timestamp = options[:timestamp] if options[:timestamp] != nil
       sheet.softshadow = options[:softshadow] if options[:softshadow] != nil
       sheet.polaroid = options[:polaroid] if options[:polaroid] != nil
 

data/lib/version.rb

@@ -16,7 +16,7 @@ module VCSRuby
     parts[2] = (parts[2].to_i + 1).to_s
     File.open(version_path, 'w') {|f| f.write(parts.join('.')) }
 
-    $vcs_ruby_version
+    read_version
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcs_ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick