vcs_ruby 0.8.4 → 0.8.5

data/bin/vcs.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-# Video Contact Sheet Ruby: 
+# Video Contact Sheet Ruby:
 # ----------------------
 #
 # Generates contact sheets of videos
@@ -19,10 +19,10 @@ include VCSRuby
 
 
 # Configuration can Override options
-options = 
-{ 
-             quiet: false, 
-           verbose: false, 
+options =
+{
+             quiet: false,
+           verbose: false,
           capturer: :any,
             format: nil,
             output: []
@@ -35,10 +35,10 @@ arguments =
     '--capturer' => [:ffmpeg, :libav, :mplayer, :any],
     '--format' => [:png, :jpg, :jpeg, :tiff],
     '--funky' =>  [:polaroid, :photos, :overlap, :rotate, :photoframe, :polaroidframe, :film, :random]
-}  
+}
 
 # Command Line Parameters
-optparse = OptionParser.new do|opts| 
+optparse = OptionParser.new do|opts|
   opts.separator $vcs_ruby_name + ' ' + $vcs_ruby_version.to_s
   opts.separator ''
   opts.on( '-i [INTERVAL]', '--interval [INTERVAL]', 'Set the interval [INTERVAL]') do |interval|
@@ -83,7 +83,7 @@ optparse = OptionParser.new do|opts|
   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 
+  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|
@@ -95,14 +95,14 @@ optparse = OptionParser.new do|opts|
   opts.on("-V", "--verbose", "More verbose Output.") do
     options[:verbose] = true
   end
-  opts.on( '-v', '--version', 'Version' ) do 
+  opts.on( '-v', '--version', 'Version' ) do
     puts $vcs_ruby_name + ' ' + $vcs_ruby_version.to_s
-    exit 0 
-  end 
-  
-  opts.on( '-h', '--help', 'Prints help' ) do 
+    exit 0
+  end
+
+  opts.on( '-h', '--help', 'Prints help' ) do
     options[:help] = true
-  end 
+  end
 
   opts.separator ''
   opts.separator 'Examples:'
@@ -121,7 +121,7 @@ optparse = OptionParser.new do|opts|
 end
 
 Tools::print_help optparse if ARGV.empty?
-  
+
 optparse.parse!
 
 Tools::print_help optparse if options[:help] || ARGV.empty?
@@ -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/capturer.rb

@@ -19,11 +19,11 @@ module VCSRuby
     def length
       raise "NotImplmentedException"
     end
-  
+
     def width
       raise "NotImplmentedException"
     end
-  
+
     def height
       raise "NotImplmentedException"
     end

data/lib/command.rb

@@ -20,11 +20,11 @@ module VCSRuby
       result = nil
       if Tools::windows?
         streams = '2> nul' if streams === 0
-        
+
         result = `cmd /C #{@command} #{parameter} #{streams}`
       else
         streams = "2> /dev/null" if streams === 0
-        
+
         result =`#{@command} #{parameter} #{streams}`
       end
 

data/lib/contact_sheet.rb

@@ -9,11 +9,11 @@ require 'yaml'
 require 'vcs'
 
 module VCSRuby
-  class ContactSheet 
+  class ContactSheet
     attr_accessor :capturer, :format, :signature, :title, :highlight
     attr_reader :thumbnail_width, :thumbnail_height
     attr_reader :length, :from, :to
-      
+
     def initialize video, capturer = :any
       @capturer = capturer
       @configuration = Configuration.new
@@ -22,7 +22,7 @@ module VCSRuby
       initialize_filename(File.basename(@video, '.*'))
       puts "Processing #{File.basename(video)}..." unless Tools.quiet?
       detect_video_properties
-      
+
       @thumbnails = []
 
       @tempdir = Dir.mktmpdir
@@ -56,7 +56,7 @@ module VCSRuby
       @interval = interval
     end
 
-    def rows 
+    def rows
       @rows
     end
 
@@ -105,7 +105,7 @@ module VCSRuby
         raise "Invalid To Time"
       end
     end
- 
+
 
     def self.finalize(tempdir)
       proc do
@@ -117,7 +117,7 @@ module VCSRuby
     def build
       initialize_thumbnails
       capture_thumbnails
-      
+
       puts "Composing standard contact sheet..." unless Tools.quiet?
       s = splice_montage(montage_thumbs)
 
@@ -135,24 +135,27 @@ private
     def selected_capturer
       result = nil
       if @capturer == nil || @capturer == :any
-        result = @capturers.first
+        result = available_capturers.first
       else
-        result =  @capturers.select{ |c| c.name == @capturer }.first
+        result =  available_capturers.select{ |c| c.name == @capturer }.first
       end
-      raise "Selected Capturer (#{@capturer.to_s}) not available" unless result
+      raise "Selected Capturer (#{@capturer.to_s}) not available. Install one of these: #{@capturers.map{ |c| c.name }.join(', ')}" unless result
       return result
     end
 
     def initialize_capturers video
-      capturers = []
-      capturers << LibAV.new(video)
-      capturers << MPlayer.new(video)
-      capturers << FFmpeg.new(video)
+      @capturers = []
+      @capturers << LibAV.new(video)
+      @capturers << MPlayer.new(video)
+      @capturers << FFmpeg.new(video)
 
       @video = video
-      @capturers = capturers.select{ |c| c.available? }
 
-      puts "Available capturers: #{@capturers.map{ |c| c.to_s }.join(', ')}" if Tools.verbose?
+      puts "Available capturers: #{available_capturers.map{ |c| c.to_s }.join(', ')}" if Tools.verbose?
+    end
+    
+    def available_capturers 
+      @capturers.select{ |c| c.available? }
     end
 
     def initialize_thumbnails
@@ -209,7 +212,7 @@ private
         end
         montage.geometry "+#{@configuration.padding}+#{@configuration.padding}"
         # rows or columns can be nil (auto fit)
-        montage.tile "#{@columns}x#{@rows}" 
+        montage.tile "#{@columns}x#{@rows}"
         montage << file_path
       end
       return file_path
@@ -220,9 +223,9 @@ private
       MiniMagick::Tool::Convert.new do |convert|
         convert << montage_path
         convert.background @configuration.contact_background
-        convert.splice '5x10'      
+        convert.splice '5x10'
         convert << file_path
-      end    
+      end
       file_path
      end
 
@@ -232,7 +235,9 @@ private
         convert.stack do |ul|
           ul.size "#{montage.width}x#{@configuration.title_font.line_height}"
           ul.xc @configuration.title_background
-          ul.font @configuration.title_font.path
+          if @configuration.title_font.exists?
+            ul.font @configuration.title_font.path
+          end
           ul.pointsize @configuration.title_font.size
           ul.background @configuration.title_background
           ul.fill @configuration.title_color
@@ -285,7 +290,9 @@ private
           a.size "#{montage.width - 18}x1"
           a.xc @configuration.header_background
           a.size.+
-          a.font @configuration.header_font.path
+          if @configuration.header_font.exists?
+            a.font @configuration.header_font.path
+          end
           a.pointsize @configuration.header_font.size
           a.background @configuration.header_background
           a.fill 'Black'
@@ -293,11 +300,15 @@ private
             b.gravity 'West'
             b.stack do |c|
               c.label 'Filename: '
-              c.font  @configuration.header_font.path
+              if @configuration.header_font.exists?
+                c.font  @configuration.header_font.path
+              end
               c.label File.basename(@video)
               c.append.+
             end
-            b.font @configuration.header_font.path
+            if @configuration.header_font.exists?            
+              b.font @configuration.header_font.path
+            end
             b.label "File size: #{Tools.to_human_size(File.size(@video))}"
             b.label "Length: #{@length.to_timestamp}"
             b.append
@@ -323,7 +334,9 @@ private
             a.size "#{montage.width}x#{signature_height}"
             a.gravity 'Center'
             a.xc @configuration.signature_background
-            a.font @configuration.signature_font.path
+            if @configuration.signature_font.exists?
+              a.font @configuration.signature_font.path
+            end
             a.pointsize @configuration.signature_font.size
             a.fill @configuration.signature_color
             a.annotate(0, @signature)

data/lib/ffmpeg.rb

@@ -17,7 +17,8 @@ module VCSRuby
       @video = video
       @ffmpeg = Command.new :ffmpeg, 'ffmpeg'
       @ffprobe = Command.new :ffmpeg, 'ffprobe'
-      detect_version
+      
+      detect_version if available?
     end
 
     def name
@@ -108,7 +109,7 @@ private
       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]

data/lib/font.rb

@@ -3,30 +3,74 @@
 #
 
 require 'mini_magick'
+require 'pp'
 
 module VCSRuby
+  IMFont = Struct.new(:name, :family, :style, :stretch, :weight, :glyphs)
+
   class Font
     attr_reader :name, :path, :size
 
+    @@fonts = {}
+    
     def initialize name, size
       @name = name
       @path = find_path
       @size = size
     end
-
+    
+    def exists?
+      load_font_cache if @@fonts.length == 0
+      
+      !!font_by_name(@name)
+    end
+    
     def find_path
-      if Tools::windows?
-        Dir.entries File.join(ENV['windir'], 'fonts')
-        ''
-      else 
-        font = `fc-list | grep #{name}`
-        font.split(':').first.strip
+      load_font_cache if @@fonts.length == 0
+      
+      if exists?
+        font_by_name(@name).glyphs
+      else
+        nil
+      end
+    end
+    
+    def font_by_name name
+      if name =~ /\./
+        key, font = @@fonts.select{ |key, f| f.glyphs =~ /#{name}\z/ }.first
+        return font
+      else
+        @@fonts[name]
+      end
+    end
+    
+    def load_font_cache
+     
+      fonts = MiniMagick::Tool::Identify.new(whiny: false) do |identify|
+        identify.list 'font'
+      end
+
+      parse_fonts(fonts)
+    end
+    
+    def parse_fonts(fonts)
+      font = nil
+      fonts.lines.each do |line|
+        key, value = line.strip.split(':', 2).map(&:strip)
+        
+        next if ['Path'].include? key
+
+        if key == 'Font'
+          @@fonts[value] = font = IMFont.new(value) 
+        else           
+          font.send(key + '=', value)
+        end
       end
     end
 
     def line_height
       MiniMagick::Tool::Convert.new do |convert|
-        convert.font path
+        convert.font path if exists?
         convert.pointsize size
         convert << 'label:F'
         convert.format '%h'

data/lib/libav.rb

@@ -17,7 +17,8 @@ module VCSRuby
       @video = video
       @avconv = Command.new :libav, 'avconv'
       @avprobe = Command.new :libav, 'avprobe'
-      detect_version
+      
+      detect_version if available?
     end
 
     def name
@@ -100,7 +101,7 @@ private
       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]

data/lib/mplayer.rb

@@ -19,5 +19,10 @@ module VCSRuby
     def available?
       @mplayer.available? && false
     end
+    
+    def to_s
+      "MPlayer #{@version}"
+    end
+
   end
 end

data/lib/thumbnail.rb

@@ -17,7 +17,7 @@ module VCSRuby
       @filters = [ method(:resize_filter),  method(:timestamp_filter), method(:softshadow_filter) ]
     end
 
-    def capture 
+    def capture
       @capper.grab @time, @image_path
     end
 
@@ -65,7 +65,9 @@ private
         box.fill  @configuration.timestamp_color
         box.pointsize @configuration.timestamp_font.size
         box.gravity 'SouthEast'
-        box.font @configuration.timestamp_font.path
+        if @configuration.timestamp_font.exists?
+          box.font @configuration.timestamp_font.path 
+        end
         box.annotate('+10+10', " #{@time.to_timestamp} ")
       end
       convert.flatten

data/lib/time_index.rb

@@ -11,7 +11,7 @@ module VCSRuby
       if time_index.instance_of? Float or time_index.instance_of? Fixnum
         @total_seconds = time_index
       else
-        @total_seconds = 0.0 
+        @total_seconds = 0.0
         @to_parse = time_index.strip
 
         unless @to_parse.empty?

data/lib/tools.rb

@@ -61,7 +61,7 @@ module VCSRuby
 
     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| 
+      powers.each_pair do |prefix, power|
         if size < power
           return format('%.2f',size.to_f / (power >> 10)) + ' ' + prefix
         end

data/lib/vcs.rb

@@ -5,8 +5,8 @@
 require 'command'
 require 'configuration'
 require 'contact_sheet'
-require 'ffmpeg'	
-require 'libav'	
+require 'ffmpeg'
+require 'libav'
 require 'mplayer'
 require 'thumbnail'
 require 'time_index'

data/lib/version.info

@@ -1 +1 @@
-0.8.5
+0.8.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcs_ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.0.0
 description: Creates a contact sheet, a preview, of a video, usable as library or
   as a script. Based on VCS *NIX. Creating Thumbnails with libav, ffmpeg or mplayer
   and compose it with ImageMagick into nice looking sheets.