video_converter 0.1.0 → 0.1.1

data/lib/video_converter/ffmpeg.rb

@@ -3,7 +3,7 @@
 module VideoConverter
   class Ffmpeg
     class << self
-      attr_accessor :bin, :one_pass, :one_pass_command, :first_pass_command, :second_pass_command, :metadata_command
+      attr_accessor :bin, :one_pass, :one_pass_command, :first_pass_command, :second_pass_command
     end
 
     self.bin = '/usr/local/bin/ffmpeg'
@@ -16,8 +16,6 @@ module VideoConverter
 
     self.second_pass_command = "%{bin} -i %{input} -y -aspect %{aspect} -acodec copy -vcodec libx264 -g 100 -keyint_min 50 -pass 2 -passlogfile %{input}.log -b:v %{bitrate}k -bt %{bitrate}k -threads %{threads} -f mp4 %{file} 1>%{log} 2>&1 || exit 1"
 
-    self.metadata_command = "%{bin} -i %{input} 2>&1"
-
     attr_accessor :input, :profile, :one_pass, :paral, :log
 
     def initialize params
@@ -51,56 +49,10 @@ module VideoConverter
       res
     end
 
-    def metadata
-      metadata = {}
-      s = `#{Command.new self.class.metadata_command, common_params}`
-      if (m = s.match(/Stream.*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s$/).to_a).any?
-        metadata[:audio_codec] = m[1]
-        metadata[:audio_sample_rate] = m[2].to_i
-        metadata[:audio_bitrate_in_kbps] = m[3].to_i
-      end
-      if (m = s.scan(/Stream #\d+:\d+/)).any?
-        metadata[:channels] = m.count
-      end
-      if (m = s.match(/Duration:\s+(\d+):(\d+):([\d.]+).*?bitrate:\s*(\d+)\s*kb\/s/).to_a).any?
-        metadata[:duration_in_ms] = ((m[1].to_i * 3600 + m[2].to_i * 60 + m[3].to_f) * 1000).to_i
-        metadata[:total_bitrate_in_kbps] = m[4].to_i
-      end
-      if (m = s.match(/Stream.*?Video:\s(\S+).*?,\s*((\d+)x(\d+)).*?(\d+)\s*kb\/s.*?([\d.]+)\s*fps/).to_a).any?
-        metadata[:video_codec] = m[1]
-        metadata[:width] = m[3].to_i
-        metadata[:height] = m[4].to_i
-        metadata[:video_bitrate_in_kbps] = m[5].to_i
-        metadata[:frame_rate] = m[6].to_f
-      end
-      if metadata.any?
-        if is_url?
-          url = URI.parse(input)
-          Net::HTTP.start(url.host) do |http|
-            response = http.request_head url.path
-            metadata[:file_size_in_bytes] = response['content-length'].to_i
-            puts response['content-type']
-          end
-        elsif is_local?
-          metadata[:file_size_in_bytes] = File.size(input)
-        end
-        metadata[:format] = File.extname(input).sub('.', '')
-      end
-      metadata
-    end
-
     private 
 
     def common_params
       { :bin => self.class.bin, :input => input, :log => log }
     end
-
-    def is_url?
-      !!input.match(/^http:\/\//)
-    end
-
-    def is_local?
-      File.file?(input)
-    end
   end
 end

data/lib/video_converter/input.rb

@@ -0,0 +1,82 @@
+# encoding: utf-8
+
+module VideoConverter
+  class Input
+    class << self
+      attr_accessor :metadata_command
+    end
+
+    self.metadata_command = "%{bin} -i %{input} 2>&1"
+
+    attr_accessor :input
+
+    def initialize input
+      self.input = input
+    end
+
+    def exists?
+      if is_http?
+        url = URI.parse(input)
+        Net::HTTP.start(url.host) do |http|
+          response = http.request_head url.path
+          Net::HTTPSuccess === response && response['content-type'].include?('video')
+        end
+      elsif is_local?
+        File.file? input
+      else
+        false
+      end
+    end
+
+    def metadata
+      metadata = {}
+      s = `#{Command.new self.class.metadata_command, common_params}`
+      if (m = s.match(/Stream.*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s$/).to_a).any?
+        metadata[:audio_codec] = m[1]
+        metadata[:audio_sample_rate] = m[2].to_i
+        metadata[:audio_bitrate_in_kbps] = m[3].to_i
+      end
+      if (m = s.scan(/Stream #\d+:\d+/)).any?
+        metadata[:channels] = m.count
+      end
+      if (m = s.match(/Duration:\s+(\d+):(\d+):([\d.]+).*?bitrate:\s*(\d+)\s*kb\/s/).to_a).any?
+        metadata[:duration_in_ms] = ((m[1].to_i * 3600 + m[2].to_i * 60 + m[3].to_f) * 1000).to_i
+        metadata[:total_bitrate_in_kbps] = m[4].to_i
+      end
+      if (m = s.match(/Stream.*?Video:\s(\S+).*?,\s*((\d+)x(\d+)).*?(\d+)\s*kb\/s.*?([\d.]+)\s*fps/).to_a).any?
+        metadata[:video_codec] = m[1]
+        metadata[:width] = m[3].to_i
+        metadata[:height] = m[4].to_i
+        metadata[:video_bitrate_in_kbps] = m[5].to_i
+        metadata[:frame_rate] = m[6].to_f
+      end
+      if metadata.any?
+        if is_http?
+          url = URI.parse(input)
+          Net::HTTP.start(url.host) do |http|
+            response = http.request_head url.path
+            metadata[:file_size_in_bytes] = response['content-length'].to_i
+          end
+        elsif is_local?
+          metadata[:file_size_in_bytes] = File.size(input)
+        end
+        metadata[:format] = File.extname(input).sub('.', '')
+      end
+      metadata
+    end
+
+    private
+
+    def is_http?
+      !!input.match(/^http:\/\//)
+    end
+
+    def is_local?
+      File.file?(input)
+    end
+
+    def common_params
+      { :bin => VideoConverter::Ffmpeg.bin, :input => input }
+    end
+  end
+end

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/video_converter.rb

@@ -5,6 +5,7 @@ require "video_converter/command"
 require "video_converter/process"
 require "video_converter/ffmpeg"
 require "video_converter/live_segmenter"
+require "video_converter/input"
 require "fileutils"
 require "net/http"
 
@@ -24,8 +25,4 @@ module VideoConverter
   def self.find id
     VideoConverter::Process.new id
   end
-
-  def self.metadata input
-    VideoConverter::Ffmpeg.new(:input => input).metadata
-  end
 end

data/test/input_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+class InputTest < Test::Unit::TestCase
+  setup do
+    @test_url = 'http://techslides.com/demos/sample-videos/small.mp4'
+  end
+
+  context 'exists' do
+    context 'when it is local' do
+      context 'and exists' do
+        should 'return true' do
+          assert VideoConverter::Input.new('test/fixtures/test.mp4').exists?
+        end
+      end
+
+      context 'and does not exist or is not file' do
+        should 'return false' do
+          assert !VideoConverter::Input.new('test/fixtures/not_existed_file').exists?
+          assert !VideoConverter::Input.new('test/fixtures').exists?
+        end
+      end
+    end
+
+    context 'when it is http' do
+      context 'and exists' do
+        should 'return true' do
+          assert VideoConverter::Input.new(@test_url)
+        end
+      end
+
+      context 'when does not exist or is not file' do
+        should 'return false' do
+          assert !VideoConverter::Input.new(@test_url + 'any').exists?
+          assert !VideoConverter::Input.new(URI.parse(@test_url).host).exists?
+        end
+      end
+    end
+  end
+          
+  context 'metadata' do
+    context 'when input does not exist' do
+      should 'be empty' do
+        assert VideoConverter::Input.new('test/fixtures/not_existed_file').metadata.empty?
+      end
+    end
+
+    context 'when input is dir' do
+      should 'be empty' do
+        assert VideoConverter::Input.new('tmp/fixtures').metadata.empty?
+      end
+    end
+
+    context 'when input is not video file' do
+      should 'be empty' do
+        assert VideoConverter::Input.new(__FILE__).metadata.empty?
+      end
+    end
+
+    context 'when input is video file' do
+      should 'not be empty' do
+        h = {:audio_bitrate_in_kbps=>97, :audio_codec=>"aac", :audio_sample_rate=>44100, :channels=>2, :duration_in_ms=>4019, :total_bitrate_in_kbps=>1123, :frame_rate=>29.97, :height=>360, :video_bitrate_in_kbps=>1020, :video_codec=>"h264", :width=>640, :file_size_in_bytes=>564356, :format=>"mp4"}
+        assert_equal h, VideoConverter::Input.new('test/fixtures/test.mp4').metadata
+      end
+    end
+
+    context 'when input is url' do
+      should 'not be empty' do
+        h = {:audio_codec=>"aac", :audio_sample_rate=>48000, :audio_bitrate_in_kbps=>83, :channels=>2, :duration_in_ms=>5570, :total_bitrate_in_kbps=>551, :video_codec=>"h264", :width=>560, :height=>320, :video_bitrate_in_kbps=>465, :frame_rate=>30.0, :file_size_in_bytes=>383631, :format=>"mp4"}
+        assert_equal h, VideoConverter::Input.new(@test_url).metadata
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -93,14 +93,15 @@ files:
 - lib/video_converter/base.rb
 - lib/video_converter/command.rb
 - lib/video_converter/ffmpeg.rb
+- lib/video_converter/input.rb
 - lib/video_converter/live_segmenter.rb
 - lib/video_converter/process.rb
 - lib/video_converter/profile.rb
 - lib/video_converter/version.rb
-- test/ffmpeg_test.rb
 - test/fixtures/test.mp4
 - test/fixtures/test.mp4.log-0.log
 - test/fixtures/test.mp4.log-0.log.mbtree
+- test/input_test.rb
 - test/test_helper.rb
 - test/video_converter_test.rb
 - video_converter.gemspec
@@ -119,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2129030905366019713
+      hash: -530549277502155145
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2129030905366019713
+      hash: -530549277502155145
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls
@@ -138,9 +139,9 @@ signing_key:
 specification_version: 3
 summary: Ffmpeg, mencoder based converter to mp4, m3u8
 test_files:
-- test/ffmpeg_test.rb
 - test/fixtures/test.mp4
 - test/fixtures/test.mp4.log-0.log
 - test/fixtures/test.mp4.log-0.log.mbtree
+- test/input_test.rb
 - test/test_helper.rb
 - test/video_converter_test.rb

data/test/ffmpeg_test.rb

@@ -1,37 +0,0 @@
-require 'test_helper'
-
-class FfmpegTest < Test::Unit::TestCase
-  context 'metadata' do
-    context 'when input does not exist' do
-      should 'be empty' do
-        assert VideoConverter::Ffmpeg.new(:input => 'tmp/fixtures/not_existed_file').metadata.empty?
-      end
-    end
-
-    context 'when input is dir' do
-      should 'be empty' do
-        assert VideoConverter::Ffmpeg.new(:input => 'tmp/fixtures').metadata.empty?
-      end
-    end
-
-    context 'when input is not video file' do
-      should 'be empty' do
-        assert VideoConverter::Ffmpeg.new(:input => __FILE__).metadata.empty?
-      end
-    end
-
-    context 'when input is video file' do
-      should 'not be empty' do
-        h = {:audio_bitrate_in_kbps=>97, :audio_codec=>"aac", :audio_sample_rate=>44100, :channels=>2, :duration_in_ms=>4019, :total_bitrate_in_kbps=>1123, :frame_rate=>29.97, :height=>360, :video_bitrate_in_kbps=>1020, :video_codec=>"h264", :width=>640, :file_size_in_bytes=>564356, :format=>"mp4"}
-        assert_equal h, VideoConverter::Ffmpeg.new(:input => 'test/fixtures/test.mp4').metadata
-      end
-    end
-
-    context 'when input is url' do
-      should 'not be empty' do
-        h = {:audio_codec=>"aac", :audio_sample_rate=>48000, :audio_bitrate_in_kbps=>83, :channels=>2, :duration_in_ms=>5570, :total_bitrate_in_kbps=>551, :video_codec=>"h264", :width=>560, :height=>320, :video_bitrate_in_kbps=>465, :frame_rate=>30.0, :file_size_in_bytes=>383631, :format=>"mp4"}
-        assert_equal h, VideoConverter::Ffmpeg.new(:input => 'http://techslides.com/demos/sample-videos/small.mp4').metadata
-      end
-    end
-  end
-end