vcs_ruby 0.8.2 → 0.8.4

data/bin/vcs.rb

@@ -137,7 +137,7 @@ begin
     sheet.initialize_filename(options[:output][index]) if options[:output][index]
     sheet.build
   end
-rescue Exception => e
-  STDERR.puts "ERROR: #{e.message}"
+#rescue Exception => e
+#  STDERR.puts "ERROR: #{e.message}"
 end
 

data/lib/command.rb

@@ -4,23 +4,33 @@
 
 module VCSRuby
   class Command
-    attr_reader :name, :available
+    attr_reader :name
     def initialize name, command
       @name = name
       @command = which(command)
       @available = !!@command
     end
 
-    def execute parameter, streams = "2> /dev/null"
-      raise "Command '#{name}' not available" unless available
+    def available?
+      @available
+    end
 
+    def execute parameter, streams = 0
+      raise "Command '#{name}' not available" unless available?
+      result = nil
       if Tools::windows?
-        `cmd /C #{@command} #{parameter}`
+        streams = '2> nul' if streams === 0
+        
+        result = `cmd /C #{@command} #{parameter} #{streams}`
       else
-        `#{@command} #{parameter} #{streams}`
+        streams = "2> /dev/null" if streams === 0
+        
+        result =`#{@command} #{parameter} #{streams}`
       end
-    end
 
+      raise "#{@command} failed with return value '#{$?}'"unless $? == 0
+      return result
+    end
 private
     # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
     def which cmd

data/lib/ffmpeg.rb

@@ -2,24 +2,151 @@
 # FFmpeg Abstraction
 #
 
-require 'command'
 require 'capturer'
+require 'command'
+require 'time_index'
 
 module VCSRuby
   class FFmpeg < Capturer
+
+    CODEC = 3
+    DIMENSION = 5
+    FPS = 7
+
     def initialize video
       @video = video
-      @command = Command.new :ffmpeg, 'ffmpeg'
+      @ffmpeg = Command.new :ffmpeg, 'ffmpeg'
+      @ffprobe = Command.new :ffmpeg, 'ffprobe'
+      detect_version
     end
 
     def name
       :ffmpeg
     end
 
+    def available?
+      @ffmpeg.available? && !libav?
+    end
+
+    def libav?
+      @libav
+    end
+
+    def detect_version
+      info = @ffmpeg.execute('-version')
+      match = /avconv ([\d|.|-|:]*)/.match(info)
+      @libav = true if match
+      match = /ffmpeg version ([\d|.]*)/.match(info)
+      if match
+        @version = match[1]
+      end
+    end
+
     def length
-      info = @command.execute("-i #{@video} -dframes 0 -vframes 0 /dev/null", "2>&1")
-      match = /Duration: ([\d|:|.]*)/.match(info)
+      load_probe
+      match = /Duration: ([\d|:|.]*)/.match(@cache)
       return TimeIndex.new match[1]
     end
+
+    def width
+      load_probe
+      @width
+    end
+
+    def height
+      load_probe
+      @height
+    end
+
+    def par
+      load_probe
+      @par
+    end
+
+    def dar
+      load_probe
+      @dar
+    end
+
+    def fps
+      load_probe
+      @fps
+    end
+
+    def video_codec
+      load_probe
+
+      @video_codec
+    end
+
+    def audio_codec
+      load_probe
+
+      @audio_codec
+    end
+
+    def grab time, image_path
+      @ffmpeg.execute "-y -ss #{time.total_seconds} -i \"#{@video}\" -an -dframes 1 -vframes 1 -vcodec png -f rawvideo \"#{image_path}\""
+    end
+
+    def to_s
+      "FFmpeg #{@version}"
+    end
+
+private
+    def load_probe
+      return if @cache
+
+      @cache = @ffprobe.execute("\"#{@video}\"", "2>&1")
+      puts @cache if Tools.verbose?
+
+      parse_video_streams
+      parse_audio_streams
+    end
+
+    def parse_video_streams
+      video_stream = split_stream_line(is_stream?(@cache, /Video/).first)
+
+      dimensions = /(\d*)x(\d*) \[PAR (\d*:\d*) DAR (\d*:\d*)\]/.match(video_stream[DIMENSION])
+    
+      if dimensions
+        @par = dimensions[3]
+        @dar = dimensions[4]
+      else
+        dimensions = /(\d*)x(\d*)/.match(video_stream[DIMENSION])
+      end
+
+      if dimensions
+        @width = dimensions[1].to_i
+        @height = dimensions[2].to_i
+      end
+
+      fps = /([\d|.]+) fps/.match(video_stream[FPS])
+      @fps = fps ? fps[1].to_f : 0.0
+
+      @video_codec = video_stream[CODEC]
+    end
+
+    def parse_audio_streams
+      audio_stream = split_stream_line(is_stream?(@cache, /Audio/).first)
+
+      @audio_codec = audio_stream[CODEC]
+    end
+
+    def is_stream? probe, regex
+      streams(probe).select{ |s| s =~ regex }
+    end
+
+    def streams probe
+      @cache.split(/\r?\n/).map(&:strip).select{|l| l.start_with? 'Stream' }
+    end
+
+    def split_stream_line line
+      parts = line.split(',')
+      stream = parts.shift
+      result = stream.split(':')
+      result += parts
+      return result.map(&:strip)
+    end
   end
 end

data/lib/font.rb

@@ -15,8 +15,13 @@ module VCSRuby
     end
 
     def find_path
-      font = `fc-list | grep #{name}`
-      font.split(':').first.strip
+      if Tools::windows?
+        Dir.entries File.join(ENV['windir'], 'fonts')
+        ''
+      else 
+        font = `fc-list | grep #{name}`
+        font.split(':').first.strip
+      end
     end
 
     def line_height

data/lib/libav.rb

@@ -25,13 +25,13 @@ module VCSRuby
     end
 
     def available?
-      @avconv.available && @avprobe.available
+      @avconv.available? && @avprobe.available?
     end
 
     def detect_version
-      info = @avconv.execute("-version")
+      info = @avconv.execute('-version')
       match = /avconv ([\d|.|-|:]*)/.match(info)
-      @version = match[1]
+      @version = match[1] if match
     end
 
     def length
@@ -78,7 +78,7 @@ module VCSRuby
     end
 
     def grab time, image_path
-      @avconv.execute "-y -ss #{time.total_seconds} -i '#{@video}' -an -dframes 1 -vframes 1 -vcodec png -f rawvideo '#{image_path}'"
+      @avconv.execute "-y -ss #{time.total_seconds} -i \"#{@video}\" -an -dframes 1 -vframes 1 -vcodec png -f rawvideo \"#{image_path}\""
     end
 
     def to_s
@@ -89,7 +89,7 @@ private
     def load_probe
       return if @cache
 
-      @cache = @avprobe.execute("'#{@video}'", "2>&1")
+      @cache = @avprobe.execute("\"#{@video}\"", "2>&1")
       puts @cache if Tools.verbose?
 
       parse_video_streams

data/lib/mplayer.rb

@@ -9,11 +9,15 @@ module VCSRuby
   class MPlayer < Capturer
     def initialize video
       @video = video
-      @command = Command.new :mplayer, 'mplayer'
+      @mplayer = Command.new :mplayer, 'mplayer'
     end
 
     def name
       :mplayer
     end
+
+    def available?
+      @mplayer.available? && false
+    end
   end
 end

data/lib/thumbnail.rb

@@ -14,8 +14,7 @@ module VCSRuby
       @capper = capper
       @video = video
       @configuration = configuration
-
-      @filters = [method(:resize_filter), method(:timestamp_filter), method(:softshadow_filter)]
+      @filters = [ method(:resize_filter),  method(:timestamp_filter), method(:softshadow_filter) ]
     end
 
     def capture 
@@ -93,10 +92,29 @@ private
       convert.repage.+
     end
 
-    def polaroid_filter
+    def polaroid_filter convert
+      border = 8
+      convert.stack do |a|
+        a.fill 'White'
+        a.background 'White'
+        a.bordercolor 'White'
+        a.mattecolor 'White'
+        a.frame "#{border}x#{border}"
+        a.stack do |b|
+          b.flip
+          b.splice "0x#{border*5}"
+        end
+        a.flip
+        a.bordercolor 'Grey60'
+        a.border 1
+        a.repage.+
+      end
     end
 
-    def random_rotation_filter
+    def random_rotation_filter convert
+      angle = Random::rand(-18..18)
+      convert.background 'None'
+      convert.rotate angle
     end
 
     def film_filter

data/lib/tools.rb

@@ -5,7 +5,11 @@
 module VCSRuby
   class Tools
     def self.windows?
-      false
+      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.verbose= verbose

data/lib/version.info

@@ -1 +1 @@
-0.8.3
+0.8.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcs_ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick