rff 0.2.10 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 742f2175bc8672b43afb8af06a158005aca440be
-  data.tar.gz: 66adfeb340bdfdd663b84afee410dfddca3e3f0f
+  metadata.gz: b38d6c279ff97c480f6080521d8735c0b0b24920
+  data.tar.gz: a9a49f68e620cc49e1c7da8996b71cbba24147f9
 SHA512:
-  metadata.gz: d99daaefdc616c6617d02b5304fed33e029772e7f805389b4c2a04bab172a3c3ef0926b8f2375e4802b218b3caef4a727a75610c51fb6f4cf64b82d647b44c2e
-  data.tar.gz: 463e2ad21ecdc844b49628297e4341bf511c9111b36a938e160e0d87e7a8f0a0cdea143fe1fd8a4337697eeb0871a5fc1a9f9cea59e215a6d79a2cae6cf0116e
+  metadata.gz: 6211d05ec6fe7652482806841ab655705c05676b6e85a9a3cd40d44e3b633aec9489959ad1b4050e71f969739c8c2e5fb9c3cedfe33c4a6c733168ba16085ed2
+  data.tar.gz: 1447119e1dcc12b5b8d00fcbc4e8420d1c0bab41c0401dcd60f1a95b26ac985c16d7de0fb35ab849ebb5eaaf207427a3148a8ac6d5f670d037e2f0c680c8b00d

data/lib/audio_handler.rb

@@ -6,11 +6,11 @@ require 'fileutils'
 # License:: Open Source Software
 
 module RFF
-  
+
   # This class provides an "All audio to HTML5" conversion functionality. It takes every compatible with FFmpeg audio format and converts it to the three HTML5 audio formats - mp3, ogg and wav. If the input is already in one of these formats it is only converted to the two other formats and the original file is copied to the output directory, because it can be used as one of HTML5 sources.
-  
+
   class AudioHandler
-    
+
     # This constructor initializes the class with the following arguments:
     # * _input_ <b>(required)</b> - the full path to the input file
     # * <i>output_path</i> - a path to place the output file in. Defaults to nil, which means that the input' s directory path is used
@@ -18,7 +18,7 @@ module RFF
     # * <i>recommended_audio_quality</i> - determines if recommended by FFmpeg community audio quality settings should be used. Defaults to true, which means audio conversion with good, recommended quality. Set to false if you are giving additional arguments that determine this quality.
     # * <i>disable_subtitles_decoding</i> - in some formats subtitle decoding causes problems. This option disables this feature. Defaults to true to bypass problems by default.
     # All of the arguments are passed on to underlying Processor instances. This method also determines input type, initializes processing percentage and creates needed Processor instances.
-    
+
     def initialize input, output_path=nil, custom_args=nil, recommended_audio_quality=true, disable_subtitles_decoding=true
       @input = input
       @input_type = File.basename(@input).split(".")[1]
@@ -39,10 +39,11 @@ module RFF
       types.each do |type|
         @processors << RFF::Processor.new(@input, type, @output_path, nil, @custom_args, recommended_audio_quality, disable_subtitles_decoding)
       end
+      @handler_status = :ready
     end
-    
+
     # This method fires all the Processor instances (conversion processes) in a separate thread at once. Then it counts the overall processing percentage from all the Processor instances as the process goes and sets it to 100% on finish
-    
+
     def fire_all
       @processing_thread = Thread.new do |th|
         begin
@@ -50,12 +51,13 @@ module RFF
             proc.fire
             #sleep(5)
           end
+          @handler_status = :processing
           status = :processing
           while status != :done
             donecount = 0
             @processors.each do |proc|
               #puts "Process status:" + proc.status.to_s
-              if proc.status == :completed || proc.status == :failed || proc.status == :aborted
+              if (!proc.command_exit_status.nil? && (proc.status == :completed || proc.status == :failed)) || proc.status == :aborted
                 donecount = donecount + 1
               end
             end
@@ -70,27 +72,38 @@ module RFF
             end
             @processing_percentage = (processing_percentage.to_f/@processors.count).to_i
           end
+          @processors.each do |proc|
+              if proc.status != :completed
+                  @handler_status = :failed
+                  break
+              end
+          end
+          if @handler_status != :failed
+              @handler_status = :completed
+          end
           @processing_percentage = 100
         rescue => e
           puts "Caught exception: " + e.to_s
           puts "Backtrace:"
           puts e.backtrace
-          @status = :done
+          status = :done
+          @handler_status = :failed
         end
       end
     end
-    
-    
+
+
     # This method fires all the Processor instances (conversion processes) in a separate thread sequentially - next Processor in the row is fired only after the Processor before finishes. It also counts the overall processing percentage from all the Processor instances as the process goes and sets it to 100% on finish
-    
+
     def fire_sequential
       @processing_thread = Thread.new do |th|
         begin
+          @handler_status = :processing
           i = 0
           @processors.each do |proc|
             proc.fire
             sleep(1)
-            while proc.status == :processing
+            while proc.command_exit_status.nil? || proc.status == :processing && proc.status != :aborted
               if proc.processing_percentage != nil
                 @processing_percentage = (i*(100/@processors.count))+(proc.processing_percentage.to_f/@processors.count).to_i
               end
@@ -98,27 +111,37 @@ module RFF
             i = i+1
             #sleep(5)
           end
+          @processors.each do |proc|
+              if proc.status != :completed
+                  @handler_status = :failed
+                  break
+              end
+          end
+          if @handler_status != :failed
+              @handler_status = :completed
+          end
           @processing_percentage = 100
         rescue => e
           puts "Caught exception: " + e.to_s
           puts "Backtrace:"
           puts e.backtrace
-          @status = :done
+          status = :done
+          @handler_status = :failed
         end
       end
     end
-    
+
     # This method kills all the processes in Processor instances and its own processing thread
-    
+
     def killall
       @processors.each do |proc|
         proc.kill
       end
       @processing_thread.kill
     end
-    
+
     # This method returns the "to MP3" Processor instance if it exists or nil otherwise
-    
+
     def mp3_processor
       ret = nil
       @processors.each do |proc|
@@ -128,9 +151,9 @@ module RFF
       end
       ret
     end
-    
+
     # This method returns the "to OGG" Processor instance if it exists or nil otherwise
-    
+
     def ogg_processor
       ret = nil
       @processors.each do |proc|
@@ -140,9 +163,9 @@ module RFF
       end
       ret
     end
-    
+
     # This method returns the "to WAV" Processor instance if it exists or nil otherwise
-    
+
     def wav_processor
       ret = nil
       @processors.each do |proc|
@@ -152,41 +175,45 @@ module RFF
       end
       ret
     end
-    
+
     # This method returns full input path
-    
+
     def input
       @input
     end
-    
+
     # This method returns full output file name
-    
+
     def output_name
       @output_name
     end
-    
+
     # This method returns the path in which output file is saved
-    
+
     def output_path
       @output_path
     end
-    
+
     # This method returns custom arguments passed to FFmpeg
-    
+
     def custom_args
       @custom_args
     end
-    
+
     # This method returns percentage of process completion
-    
+
     def processing_percentage
       @processing_percentage || 0
     end
-    
+
     # This method returns percentage of process completion formatted for output
-    
+
     def format_processing_percentage
       @processing_percentage.nil? ? "0%" : @processing_percentage.to_s + "%"
     end
+
+    def handler_status
+        @handler_status
+    end
   end
 end

data/lib/video_handler.rb

@@ -2,11 +2,11 @@ require_relative 'processor'
 require 'fileutils'
 
 module RFF
-  
+
   # This class provides an "All video to HTML5" conversion functionality. It takes every compatible with FFmpeg video format and converts it to the three HTML5 video formats - mp4, ogv and webm. If the input is already in one of these formats it is only converted to the two other formats and the original file is copied to the output directory, because it can be used as one of HTML5 sources.
-  
+
   class VideoHandler
-    
+
     # This constructor initializes the class with the following arguments:
     # * _input_ <b>(required)</b> - the full path to the input file
     # * <i>output_path</i> - a path to place the output file in. Defaults to nil, which means that the input' s directory path is used
@@ -15,7 +15,7 @@ module RFF
     # * <i>recommended_audio_quality</i> - determines if recommended by FFmpeg community audio quality settings should be used. Defaults to true, which means audio conversion with good, recommended quality. Set to false if you are giving additional arguments that determine this quality.
     # * <i>disable_subtitles_decoding</i> - in some formats subtitle decoding causes problems. This option disables this feature. Defaults to true to bypass problems by default.
     # All of the arguments are passed on to underlying Processor instances. This method also determines input type, initializes processing percentage and creates needed Processor instances.
-    
+
     def initialize input, output_path=nil, quality="5000k", custom_args=nil, recommended_audio_quality=true, disable_subtitles_decoding=true
       @input = input
       @input_type = File.basename(@input).split(".")[1]
@@ -37,10 +37,11 @@ module RFF
       types.each do |type|
         @processors << RFF::Processor.new(@input, type, @output_path, @quality, @custom_args, recommended_audio_quality, disable_subtitles_decoding)
       end
+      @handler_status = :ready
     end
-    
+
     # This method fires all the Processor instances (conversion processes) in a separate thread at once. Then it counts the overall processing percentage from all the Processor instances as the process goes and sets it to 100% on finish
-    
+
     def fire_all
       @processing_thread = Thread.new do |th|
         begin
@@ -48,12 +49,13 @@ module RFF
             proc.fire
             #sleep(5)
           end
+          @handler_status = :processing
           status = :processing
           while status != :done
             donecount = 0
             @processors.each do |proc|
               #puts "Process status:" + proc.status.to_s
-              if proc.status == :completed || proc.status == :failed || proc.status == :aborted
+              if (!proc.command_exit_status.nil? && (proc.status == :completed || proc.status == :failed)) || proc.status == :aborted
                 donecount = donecount + 1
               end
             end
@@ -68,26 +70,37 @@ module RFF
             end
             @processing_percentage = (processing_percentage.to_f/@processors.count).to_i
           end
+          @processors.each do |proc|
+              if proc.status != :completed
+                  @handler_status = :failed
+                  break
+              end
+          end
+          if @handler_status != :failed
+              @handler_status = :completed
+          end
           @processing_percentage = 100
         rescue => e
           puts "Caught exception: " + e.to_s
           puts "Backtrace:"
           puts e.backtrace
-          @status = :done
+          status = :done
+          @handler_status = :failed
         end
       end
     end
-    
+
     # This method fires all the Processor instances (conversion processes) in a separate thread sequentially - next Processor in the row is fired only after the Processor before finishes. It also counts the overall processing percentage from all the Processor instances as the process goes and sets it to 100% on finish
-    
+
     def fire_sequential
       @processing_thread = Thread.new do |th|
         begin
           i = 0
+          @handler_status = :processing
           @processors.each do |proc|
             proc.fire
             sleep(1)
-            while proc.status == :processing
+            while proc.command_exit_status.nil? || proc.status == :processing && proc.status != :aborted
               if proc.processing_percentage != nil
                 @processing_percentage = (i*(100/@processors.count))+(proc.processing_percentage.to_f/@processors.count).to_i
               end
@@ -95,27 +108,37 @@ module RFF
             i = i+1
             #sleep(5)
           end
+          @processors.each do |proc|
+              if proc.status != :completed
+                  @handler_status = :failed
+                  break
+              end
+          end
+          if @handler_status != :failed
+              @handler_status = :completed
+          end
           @processing_percentage = 100
         rescue => e
           puts "Caught exception: " + e.to_s
           puts "Backtrace:"
           puts e.backtrace
-          @status = :done
+          status = :done
+          @handler_status = :failed
         end
       end
     end
-    
+
     # This method kills all the processes in Processor instances and its own processing thread
-    
+
     def killall
       @processors.each do |proc|
         proc.kill
       end
       @processing_thread.kill
     end
-    
+
     # This method returns the "to MP4" Processor instance if it exists or nil otherwise
-    
+
     def mp4_processor
       ret = nil
       @processors.each do |proc|
@@ -125,9 +148,9 @@ module RFF
       end
       ret
     end
-    
+
     # This method returns the "to OGV" Processor instance if it exists or nil otherwise
-    
+
     def ogv_processor
       ret = nil
       @processors.each do |proc|
@@ -137,9 +160,9 @@ module RFF
       end
       ret
     end
-    
+
     # This method returns the "to WEBM" Processor instance if it exists or nil otherwise
-    
+
     def webm_processor
       ret = nil
       @processors.each do |proc|
@@ -149,45 +172,45 @@ module RFF
       end
       ret
     end
-    
+
     # This method returns full input path
-    
+
     def input
       @input
     end
-    
+
     # This method returns full output file name
-    
+
     def output_name
       @output_name
     end
-    
+
     # This method returns the path in which output file is saved
-    
+
     def output_path
       @output_path
     end
-    
+
     # This method returns used video quality
-    
+
     def quality
       @quality
     end
-    
+
     # This method returns custom arguments passed to FFmpeg
-    
+
     def custom_args
       @custom_args
     end
-    
+
     # This method returns percentage of process completion
-    
+
     def processing_percentage
       @processing_percentage || 0
     end
-    
+
     # This method returns percentage of process completion formatted for output
-    
+
     def format_processing_percentage
       @processing_percentage.nil? ? "0%" : @processing_percentage.to_s + "%"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rff
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: '0.3'
 platform: ruby
 authors:
 - Phitherek_