video_screenshoter 0.2.1 → 0.2.2

data/lib/video_screenshoter.rb

@@ -3,6 +3,8 @@ require "fileutils"
 require "video_screenshoter/abstract"
 require "video_screenshoter/video"
 require "video_screenshoter/hls"
+require "video_screenshoter/image"
+require "shellwords"
 
 module VideoScreenshoter
   class << self
@@ -16,8 +18,13 @@ module VideoScreenshoter
 
   def self.new params
     raise ArgumentError.new('Input is needed') unless params[:input]
-    raise ArgumentError.new('Incorrect type param') unless [nil, 'hls', 'video'].include? params[:type]
-    params[:type] ||= File.extname(params[:input]) == '.m3u8' ? 'hls' : 'video'
-    params[:type] == 'hls' ? VideoScreenshoter::Hls.new(params) : VideoScreenshoter::Video.new(params)
+    raise ArgumentError.new('Incorrect type param') unless [nil, 'hls', 'video', 'image'].include? params[:type]
+    if params[:type] == 'hls' || File.extname(params[:input]).downcase == '.m3u8'
+      VideoScreenshoter::Hls.new(params)
+    elsif params[:type] == 'image' || ['.gif','.png','.jpg','.jpeg', '.png'].include?(File.extname(params[:input]).downcase)
+      VideoScreenshoter::Image.new(params)
+    else
+      VideoScreenshoter::Video.new(params)
+    end
   end
 end

data/lib/video_screenshoter/abstract.rb

@@ -2,9 +2,12 @@
 
 module VideoScreenshoter
   class Abstract
-    attr_accessor :ffmpeg, :imagemagick, :output_dir, :output_file, :input, :times, :duration, :verbose, :size, :presets
+    attr_accessor :ffmpeg, :imagemagick, :output_dir, :output_file, :input, :exact, :times, :offset_start, :offset_end, :duration, :verbose, :size, :presets
 
     def initialize params
+      params.each_with_index do |param, index|
+        params[index] = Shellwords.escape(param) if param.is_a?(String)
+      end
       [:ffmpeg, :imagemagick, :output_dir, :output_file, :verbose].each do |attr|
         self.send("#{attr}=".to_sym, params[attr].nil? ? VideoScreenshoter.send(attr) : params[attr])
       end
@@ -12,15 +15,36 @@ module VideoScreenshoter
       self.input = params[:input]
       self.duration = input_duration
       raise ArgumentError.new('Incorrect or empty m3u8 playlist') if duration.to_i == 0
-      self.times = params[:times].to_a.map do |time|
-        if time.is_a?(String) && matches = time.match(/(.*)%$/)
-          time = matches[1].to_f / 100 * duration
+      
+      # if false ffmpeg uses fast seek by keyframes like: ffmpeg -ss ... -i
+      self.exact = params[:exact]
+      
+      if params[:times]
+        self.exact = true if exact.nil?
+        self.times = params[:times].to_a.map do |time|
+          if time.is_a?(String) && matches = time.match(/(.*)%$/)
+            time = matches[1].to_f / 100 * duration
+          end
+          time = duration + time if time < 0
+          time = time.to_i
+          time
+        end.uniq
+      elsif (number = params[:number].to_i) > 0
+        [:offset_start, :offset_end].each do |attr|
+          if percent = params[attr].to_s.match(/^(\d+)%$/).to_a[1]
+            self.send("#{attr}=", duration * percent.to_i / 100.0)
+          else
+            self.send("#{attr}=", params[attr].to_f)
+          end
         end
-        time = duration + time if time < 0
-        time = time.to_i
-        time
-      end.uniq
+        self.times = number.times.to_a.map { |time| ((offset_start + (duration - offset_start - offset_end) / number * time) * 100).round / 100.0 }.uniq
+      else
+        raise ArgumentError.new('times or number required') if times.empty?
+      end
+      
       self.size = params[:size] ? "-s #{params[:size]}" : ''
+
+      # TODO possibility to replace original image by presetted image
       if params[:presets] && params[:presets].is_a?(Hash)
         self.presets = {}
         params[:presets].each do |name, preset|
@@ -36,15 +60,26 @@ module VideoScreenshoter
     end
 
     def ffmpeg_command input, output, time
-      "#{ffmpeg} -i #{input} -acodec -an -ss #{time} #{size} -f image2 -vframes 1 -y #{output} 2>/dev/null 1>&2"
+      is = exact ? "-i #{input} -ss #{time}" : "-ss #{time} -i #{input}"
+      "#{ffmpeg} #{is} -acodec -an #{size} -f image2 -vframes 1 -y #{output} 1>/dev/null 2>&1"
+    end
+
+    def ffmpeg_run time = nil
+      cmd = ffmpeg_command(input, output_fullpath(time), time)
+      puts cmd if verbose
+      system cmd
+    end
+
+    def output_with_preset input, preset_name
+      File.join(output_dir, File.basename(input, File.extname(input)) + '_' + preset_name.to_s + File.extname(input))
     end
 
     def imagemagick_command input, preset_name
       preset = presets[preset_name.to_sym]
       if !preset || preset.empty?
-        "cp #{input} #{File.join(File.dirname(input), File.basename(input, File.extname(input)) + '_' + preset_name.to_s + File.extname(input))}"
+        "cp #{input} #{output_with_preset(input, preset_name)}"
       else
-        "#{imagemagick} #{input} #{preset} #{File.join(File.dirname(input), File.basename(input, File.extname(input)) + '_' + preset_name.to_s + File.extname(input))}"
+        "#{imagemagick} #{input} #{preset} #{output_with_preset(input, preset_name)}"
       end
     end
 
@@ -53,7 +88,7 @@ module VideoScreenshoter
         presets.each do |preset_name, preset|
           cmd = imagemagick_command(scr, preset_name)
           puts cmd if verbose
-          `#{cmd}`
+          system cmd
         end
       end
     end

data/lib/video_screenshoter/image.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+module VideoScreenshoter
+  class Image < Abstract
+
+    def initialize params
+      params.each_with_index do |param, index|
+        params[index] = Shellwords.escape(param) if param.is_a?(String)
+      end
+      [:ffmpeg, :imagemagick, :output_dir, :output_file, :verbose].each do |attr|
+        self.send("#{attr}=".to_sym, params[attr].nil? ? VideoScreenshoter.send(attr) : params[attr])
+      end
+      FileUtils.mkdir_p self.output_dir
+      self.input = params[:input]
+      if params[:presets] && params[:presets].is_a?(Hash)
+        self.presets = {}
+        params[:presets].each do |name, preset|
+          self.presets[name.to_sym] = !preset || preset.empty? || preset.index('-') == 0 ? preset : "-resize #{preset}"
+        end
+      end
+      raise ArgumentError.new('Presets are needed') if presets.nil? || presets.empty?
+    end
+
+    def run
+      imagemagick_run input
+      Hash[*presets.keys.map { |p| [p, output_with_preset(input, p)] }.flatten]
+    end
+
+    alias :make_screenshots :run
+    alias :make_thumbnails :run
+  end
+end

data/lib/video_screenshoter/version.rb

@@ -1,3 +1,3 @@
 module VideoScreenshoter
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/video_screenshoter/video.rb

@@ -8,12 +8,7 @@ module VideoScreenshoter
     end
 
     def run
-      times.each do |time|
-        cmd = ffmpeg_command(input, output_fullpath(time), time)
-        puts cmd if verbose
-        `#{cmd}`
-        imagemagick_run output_fullpath(time)
-      end
+      times.each { |time| ffmpeg_run(time) and imagemagick_run(output_fullpath(time)) }
     end
 
     alias :make_screenshots :run

data/test/video_screenshoter_test.rb

@@ -81,4 +81,22 @@ class VideoScreenshoterTest < Test::Unit::TestCase
       end
     end
   end
+
+  context 'image' do
+    setup do
+      @input = 'test/fixtures/test.jpg'
+      @output_dir = '/tmp/image_screenshots_test'
+      @presets = {:big=>"1280x720", :small=>"144x81", :big43=>"-resize 1280x960^ -gravity center -crop 1280x960+0+0", :small43=>"-resize 144x108^ -gravity center -crop 144x108+0+0"}
+      `rm -r #{@output_dir}` if File.exists? @output_dir
+      @res = VideoScreenshoter.new(:input => @input, :output_dir => @output_dir, :presets => @presets, :type => 'image').run
+    end
+    should 'create screenshots' do
+      assert_equal @presets.count, @res.count
+      @res.values.each do |res|
+        assert File.exists?(res)
+        assert File.size(res) > 0
+      end
+      assert File.size(@res.values.first) != File.size(@res.values.last)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_screenshoter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,8 +90,10 @@ files:
 - lib/video_screenshoter.rb
 - lib/video_screenshoter/abstract.rb
 - lib/video_screenshoter/hls.rb
+- lib/video_screenshoter/image.rb
 - lib/video_screenshoter/version.rb
 - lib/video_screenshoter/video.rb
+- test/fixtures/test.jpg
 - test/test_helper.rb
 - test/video_screenshoter_test.rb
 - video_screenshoter.gemspec
@@ -110,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1646458223958900487
+      hash: -2212613341637156165
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1646458223958900487
+      hash: -2212613341637156165
 requirements:
 - ffmpeg
 - imagemagick
@@ -129,5 +131,6 @@ signing_key:
 specification_version: 3
 summary: Make screenshots from video or m3u8 files using ffmpeg
 test_files:
+- test/fixtures/test.jpg
 - test/test_helper.rb
 - test/video_screenshoter_test.rb