vcs_ruby 1.1.8 → 1.1.9

data/lib/time_index.rb

@@ -1,121 +1,121 @@
-#
-# Time interval
-#
-
-module VCSRuby
-  class TimeIndex
-    include Comparable
-    attr_reader :total_seconds
-
-    def initialize time_index = ''
-      if time_index.instance_of? Float or time_index.instance_of? Fixnum
-        @total_seconds = time_index
-      else
-        @total_seconds = 0.0
-        @to_parse = time_index.strip
-
-        unless @to_parse.empty?
-          try_parse_ffmpeg_index
-          try_parse_vcs_index
-          try_parse_as_number
-        end
-      end
-    end
-
-    def try_parse_ffmpeg_index
-      parts = @to_parse.split(':')
-      if parts.count == 3
-        @total_seconds += parts[0].to_i * 60 * 60
-        @total_seconds += parts[1].to_i * 60
-        @total_seconds += parts[2].to_f
-      end
-    end
-
-    def try_parse_vcs_index
-      if @to_parse =~ /\d*m|\d*h|\d*s/
-        parts = @to_parse.split(/(\d*h)|(\d*m)|(\d*s)/).select{|e| !e.empty?}
-        parts.each do |part|
-          add_vcs_part part
-        end
-      end
-    end
-
-    def add_vcs_part part
-      return @total_seconds += part.to_i * 60 * 60 if part.end_with? 'h'
-      return @total_seconds += part.to_i * 60 if part.end_with? 'm'
-      @total_seconds += part.to_i
-    end
-
-    def try_parse_as_number
-      temp = @to_parse.to_i
-      if temp.to_s == @to_parse
-        @total_seconds += temp
-      end
-    end
-
-    def total_seconds
-      @total_seconds
-    end
-
-    def hours
-      (@total_seconds.abs / 3600).to_i
-    end
-
-    def minutes
-      ((@total_seconds.abs / 60) % 60).to_i
-    end
-
-    def seconds
-      @total_seconds.abs % 60
-    end
-
-    def + operand
-      if operand.instance_of? Fixnum
-        TimeIndex.new @total_seconds + operand
-      else
-        TimeIndex.new @total_seconds + operand.total_seconds
-      end
-    end
-
-    def - operand
-      if operand.instance_of? Fixnum
-        TimeIndex.new @total_seconds - operand
-      else
-        TimeIndex.new @total_seconds - operand.total_seconds
-      end
-    end
-
-    def * operand
-      TimeIndex.new total_seconds * operand
-    end
-
-    def / operand
-      if operand.instance_of? Fixnum
-        TimeIndex.new @total_seconds / operand
-      else
-        @total_seconds / operand.total_seconds
-      end
-    end
-
-    def <=> operand
-      @total_seconds <=> operand.total_seconds
-    end
-
-    def sign
-      return '-' if @total_seconds < 0
-      ''
-    end
-
-    def to_s
-      "#{sign}#{hours}h#{"%02d" % minutes}m#{"%02d" % seconds}s"
-    end
-
-    def to_timestamp
-      if hours == 0
-        "#{sign}#{"%02d" % minutes}:#{"%02d" % seconds}"
-      else
-        "#{sign}#{hours}:#{"%02d" % minutes}:#{"%02d" % seconds}"
-      end
-    end
-  end
-end
+#
+# Time interval
+#
+
+module VCSRuby
+  class TimeIndex
+    include Comparable
+    attr_reader :total_seconds
+
+    def initialize time_index = ''
+      if time_index.instance_of? Float or time_index.instance_of? Fixnum
+        @total_seconds = time_index
+      else
+        @total_seconds = 0.0
+        @to_parse = time_index.strip
+
+        unless @to_parse.empty?
+          try_parse_ffmpeg_index
+          try_parse_vcs_index
+          try_parse_as_number
+        end
+      end
+    end
+
+    def try_parse_ffmpeg_index
+      parts = @to_parse.split(':')
+      if parts.count == 3
+        @total_seconds += parts[0].to_i * 60 * 60
+        @total_seconds += parts[1].to_i * 60
+        @total_seconds += parts[2].to_f
+      end
+    end
+
+    def try_parse_vcs_index
+      if @to_parse =~ /\d*m|\d*h|\d*s/
+        parts = @to_parse.split(/(\d*h)|(\d*m)|(\d*s)/).select{|e| !e.empty?}
+        parts.each do |part|
+          add_vcs_part part
+        end
+      end
+    end
+
+    def add_vcs_part part
+      return @total_seconds += part.to_i * 60 * 60 if part.end_with? 'h'
+      return @total_seconds += part.to_i * 60 if part.end_with? 'm'
+      @total_seconds += part.to_i
+    end
+
+    def try_parse_as_number
+      temp = @to_parse.to_i
+      if temp.to_s == @to_parse
+        @total_seconds += temp
+      end
+    end
+
+    def total_seconds
+      @total_seconds
+    end
+
+    def hours
+      (@total_seconds.abs / 3600).to_i
+    end
+
+    def minutes
+      ((@total_seconds.abs / 60) % 60).to_i
+    end
+
+    def seconds
+      @total_seconds.abs % 60
+    end
+
+    def + operand
+      if operand.instance_of? Fixnum
+        TimeIndex.new @total_seconds + operand
+      else
+        TimeIndex.new @total_seconds + operand.total_seconds
+      end
+    end
+
+    def - operand
+      if operand.instance_of? Fixnum
+        TimeIndex.new @total_seconds - operand
+      else
+        TimeIndex.new @total_seconds - operand.total_seconds
+      end
+    end
+
+    def * operand
+      TimeIndex.new total_seconds * operand
+    end
+
+    def / operand
+      if operand.instance_of? Fixnum
+        TimeIndex.new @total_seconds / operand
+      else
+        @total_seconds / operand.total_seconds
+      end
+    end
+
+    def <=> operand
+      @total_seconds <=> operand.total_seconds
+    end
+
+    def sign
+      return '-' if @total_seconds < 0
+      ''
+    end
+
+    def to_s
+      "#{sign}#{hours}h#{"%02d" % minutes}m#{"%02d" % seconds}s"
+    end
+
+    def to_timestamp
+      if hours == 0
+        "#{sign}#{"%02d" % minutes}:#{"%02d" % seconds}"
+      else
+        "#{sign}#{hours}:#{"%02d" % minutes}:#{"%02d" % seconds}"
+      end
+    end
+  end
+end

data/lib/tools.rb

@@ -1,70 +1,81 @@
-#
-# Dependencies
-#
-
-module VCSRuby
-
-  class Tools
-    def self.windows?
-      return ((RUBY_PLATFORM =~ /win32/ or RUBY_PLATFORM =~ /mingw32/) or (RbConfig::CONFIG['host_os'] =~ /mswin|windows/i))
-    end
-
-    def self.linux?
-      return ((RUBY_PLATFORM =~ /linux/) or (RbConfig::CONFIG['host_os'] =~ /linux/i))
-    end
-
-    def self.list_arguments arguments
-      arguments.map{ |argument| argument.to_s }.join(', ')
-    end
-
-    def self.print_help optparse
-      puts optparse.summarize
-      exit 0
-    end
-
-    MagickVersion = Struct.new(:major, :minor, :revision)
-    def self.magick_version
-      output = %x[convert -version]
-      m = output.match /(\d+)\.(\d+)\.(\d+)(-(\d+))?/
-      MagickVersion.new(m[1].to_i, m[2].to_i, m[3].to_i)
-    end
-
-    def self.contact_sheet_with_options video, options
-      Configuration.instance.load_profile options[:profile] if options[:profile]
-      Configuration.instance.capturer = options[:capturer]
-
-      video = VCSRuby::Video.new video
-      sheet = video.contact_sheet
-
-      sheet.format = options[:format] if options[:format]
-      sheet.title = options[:title] if options[:title]
-      sheet.signature = options[:signature] if options[:signature]
-      sheet.signature = nil if options[:no_signature]
-
-      if options[:rows] || options[:columns] || options[:interval]
-        sheet.initialize_geometry(options[:rows], options[:columns], options[:interval])
-      end
-
-      sheet.thumbnail_width = options[:width] if options[:width]
-      sheet.thumbnail_height = options[:height] if options[:height]
-      sheet.from = options[:from] if options[:from]
-      sheet.to = options[:to] if options[:to]
-      sheet.highlight = options[:highlight] if options[:highlight]
-
-      sheet.timestamp = options[:timestamp] if options[:timestamp] != nil
-      sheet.softshadow = options[:softshadow] if options[:softshadow] != nil
-      sheet.polaroid = options[:polaroid] if options[:polaroid] != nil
-
-      return sheet
-    end
-
-    def self.to_human_size size
-      powers = { 'B'  => 1 << 10, 'KiB' => 1 << 20, 'MiB' => 1 << 30, 'GiB' => 1 << 40, 'TiB' => 1 << 50 }
-      powers.each_pair do |prefix, power|
-        if size < power
-          return format('%.2f',size.to_f / (power >> 10)) + ' ' + prefix
-        end
-      end
-    end
-  end
-end
+#
+# Dependencies
+#
+
+module VCSRuby
+
+  class Tools
+    def self.windows?
+      return ((RUBY_PLATFORM =~ /win32/ or RUBY_PLATFORM =~ /mingw32/) or (RbConfig::CONFIG['host_os'] =~ /mswin|windows/i))
+    end
+
+    def self.linux?
+      return ((RUBY_PLATFORM =~ /linux/) or (RbConfig::CONFIG['host_os'] =~ /linux/i))
+    end
+
+    def self.list_arguments arguments
+      arguments.map{ |argument| argument.to_s }.join(', ')
+    end
+
+    def self.print_help optparse
+      puts optparse.summarize
+      exit 0
+    end
+
+    MagickVersion = Struct.new(:major, :minor, :revision)
+    def self.magick_version
+      output = %x[convert -version]
+      m = output.match /(\d+)\.(\d+)\.(\d+)(-(\d+))?/
+      MagickVersion.new(m[1].to_i, m[2].to_i, m[3].to_i)
+    end
+
+    def self.contact_sheet_with_options video, options
+      Configuration.instance.load_profile options[:profile] if options[:profile]
+      Configuration.instance.capturer = options[:capturer]
+
+      video = VCSRuby::Video.new video
+      
+      unless video.valid?
+        puts "Video '#{video.full_path}' cannot be read by Capturer '#{video.capturer_name}'"
+        return nil
+      end
+      
+      sheet = video.contact_sheet
+
+      sheet.format = options[:format] if options[:format]
+      sheet.title = options[:title] if options[:title]
+      sheet.signature = options[:signature] if options[:signature]
+      sheet.signature = nil if options[:no_signature]
+
+      if options[:rows] || options[:columns] || options[:interval]
+        sheet.initialize_geometry(options[:rows], options[:columns], options[:interval])
+      end
+
+      if options[:width] && options[:height]
+        sheet.aspect_ratio = Rational(options[:width], options[:height])
+      else
+        sheet.aspect_ratio = options[:aspect_ratio] if options[:aspect_ratio]      
+      end
+      sheet.thumbnail_width = options[:width] if options[:width]
+      sheet.thumbnail_height = options[:height] if options[:height]
+      sheet.from = options[:from] if options[:from]
+      sheet.to = options[:to] if options[:to]
+      sheet.highlight = options[:highlight] if options[:highlight]
+
+      sheet.timestamp = options[:timestamp] if options[:timestamp] != nil
+      sheet.softshadow = options[:softshadow] if options[:softshadow] != nil
+      sheet.polaroid = options[:polaroid] if options[:polaroid] != nil
+
+      return sheet
+    end
+
+    def self.to_human_size size
+      powers = { 'B'  => 1 << 10, 'KiB' => 1 << 20, 'MiB' => 1 << 30, 'GiB' => 1 << 40, 'TiB' => 1 << 50 }
+      powers.each_pair do |prefix, power|
+        if size < power
+          return format('%.2f',size.to_f / (power >> 10)) + ' ' + prefix
+        end
+      end
+    end
+  end
+end

data/lib/vcs.rb

@@ -1,26 +1,26 @@
-#
-# Video Contact Sheet Ruby
-#
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'command'
-require 'configuration'
-require 'contact_sheet'
-require 'video'
-require 'frame'
-require 'time_index'
-require 'tools'
-require 'version'
-require 'FFmpeg/ffmpeg'
-require 'FFmpeg/ffmpeg_audio_stream'
-require 'FFmpeg/ffmpeg_video_stream'
-require 'FFmpeg/ffmpeg_meta_info'
-require 'libAV/libav'
-require 'libAV/libav_audio_stream'
-require 'libAV/libav_video_stream'
-require 'libAV/libav_meta_info'
-require 'MPlayer/mplayer'
-require 'MPlayer/mplayer_audio_stream'
-require 'MPlayer/mplayer_video_stream'
-require 'MPlayer/mplayer_meta_info'
+#
+# Video Contact Sheet Ruby
+#
+
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'command'
+require 'configuration'
+require 'contact_sheet'
+require 'video'
+require 'frame'
+require 'time_index'
+require 'tools'
+require 'version'
+require 'FFmpeg/ffmpeg'
+require 'FFmpeg/ffmpeg_audio_stream'
+require 'FFmpeg/ffmpeg_video_stream'
+require 'FFmpeg/ffmpeg_meta_info'
+require 'libAV/libav'
+require 'libAV/libav_audio_stream'
+require 'libAV/libav_video_stream'
+require 'libAV/libav_meta_info'
+require 'MPlayer/mplayer'
+require 'MPlayer/mplayer_audio_stream'
+require 'MPlayer/mplayer_video_stream'
+require 'MPlayer/mplayer_meta_info'

data/lib/version.info

@@ -1 +1 @@
-1.1.8
+1.1.9

data/lib/version.rb

@@ -1,25 +1,25 @@
-#
-# Version of vcs.rb
-#
-
-module VCSRuby
-  def self.version_path
-    File.expand_path("version.info", File.dirname(__FILE__))
-  end
-
-  def self.read_version
-    File.open(version_path, &:readline)
-  end
-
-  def self.update_version
-    current_version = read_version
-    parts = File.open(version_path, &:readline).split('.').map(&:strip)
-    parts[2] = (parts[2].to_i + 1).to_s
-    File.open(version_path, 'w') {|f| f.write(parts.join('.')) }
-    current_version    
-  end
-end
-
-$vcs_ruby_version = Gem::Version.new(VCSRuby::read_version)
-$vcs_ruby_name = 'Video Contact Sheet Ruby'
-$vcs_ruby_short = 'vcr.rb'
+#
+# Version of vcs.rb
+#
+
+module VCSRuby
+  def self.version_path
+    File.expand_path("version.info", File.dirname(__FILE__))
+  end
+
+  def self.read_version
+    File.open(version_path, &:readline)
+  end
+
+  def self.update_version
+    current_version = read_version
+    parts = File.open(version_path, &:readline).split('.').map(&:strip)
+    parts[2] = (parts[2].to_i + 1).to_s
+    File.open(version_path, 'w') {|f| f.write(parts.join('.')) }
+    current_version    
+  end
+end
+
+$vcs_ruby_version = Gem::Version.new(VCSRuby::read_version)
+$vcs_ruby_name = 'Video Contact Sheet Ruby'
+$vcs_ruby_short = 'vcr.rb'