video_converter 0.2.4 → 0.2.5

data/lib/video_converter/base.rb

@@ -2,7 +2,7 @@
 
 module VideoConverter
   class Base
-    attr_accessor :input_array, :output_array, :log, :uid
+    attr_accessor :input_array, :output_array, :log, :uid, :clear_tmp
 
     def initialize params
       self.uid = params[:uid] || (Socket.gethostname + object_id.to_s)
@@ -15,6 +15,7 @@ module VideoConverter
         self.log = params[:log]
         FileUtils.mkdir_p File.dirname(log)
       end
+      self.clear_tmp = params[:clear_tmp].nil? ? true : params[:clear_tmp]
     end
 
     def run
@@ -23,6 +24,7 @@ module VideoConverter
       process.pid = `cat /proc/self/stat`.split[3]
       actions = []
       actions = [:convert, :segment]
+      actions << :clear if clear_tmp
       actions.each do |action|
         process.status = action.to_s
         process.progress = 0
@@ -55,5 +57,13 @@ module VideoConverter
       end
       LiveSegmenter.new(params).run
     end
+
+    def clear
+      output_array.outputs.each do |output|
+        FileUtils.rm(Dir.glob(File.join(output.work_dir, '*.log')))
+        FileUtils.rm(Dir.glob(File.join(output.work_dir, '*.log.mbtree')))
+        FileUtils.rm(File.join(output.work_dir, output.filename.sub(/\.m3u8$/, '.ts'))) if output.type == :segmented
+      end
+    end
   end
 end

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/test/video_converter_test.rb

@@ -62,6 +62,11 @@ class VideoConverterTest < Test::Unit::TestCase
         assert File.read(playlist).include?('r200.m3u8')
         assert File.read(playlist).include?('r300.m3u8')
       end
+      should 'clear tmp files' do
+        [200, 300, 500, 700].each do |q|
+          assert !File.exists?(File.join(@work_dir, "r#{q}.ts"))
+        end
+      end
     end
 
     context 'only segment some files' do
@@ -78,7 +83,7 @@ class VideoConverterTest < Test::Unit::TestCase
           {:path => @input4, :type => :segmented, :filename => '4.m3u8', :copy_video => true}, 
           {:type => :playlist, :streams => [{:path => '1.m3u8'}, {:path => '2.m3u8'}], :filename => 'playlist1.m3u8'}, 
           {:type => :playlist, :streams => [{:path => '3.m3u8'}, {:path => '4.m3u8'}], :filename => 'playlist2.m3u8'}
-        ])
+        ], :clear_tmp => false)
         @res = @c2.run
         @work_dir = File.join(VideoConverter::Output.work_dir, @c2.uid)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2760051856794272205
+      hash: -4434238993143068739
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2760051856794272205
+      hash: -4434238993143068739
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls