staugaard-transcoding_machine 0.1.2 → 0.1.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 1

data/lib/transcoding_machine/server/transcoder.rb

@@ -44,16 +44,12 @@ module TranscodingMachine
       def start
         prepare_working_directory
         get_source_file
-        source_file_attributes, source_media_format = analyze_source_file
+        source_file_attributes, source_media_format, target_media_formats = analyze_source_file
 
         thumbnail_file_path = generate_thumbnail(source_file_attributes)
         storage.put_thumbnail_file(thumbnail_file_path, @source_file_name, @storage_options) if thumbnail_file_path
 
-        media_formats = @media_players.map {|mp| mp.best_format_for(source_file_attributes)}.compact.uniq
-
-        media_formats -= [source_media_format]
-
-        media_formats.each do |media_format|
+        target_media_formats.each do |media_format|
           destination_file_path = transcode(source_file_attributes, media_format)
           put_destination_file(destination_file_path, media_format)
         end
@@ -80,8 +76,11 @@ module TranscodingMachine
 
         source_media_format = @media_formats.find {|mf| mf.matches(source_file_attributes)}
 
-        @event_handler.analyzed_source_file(source_file_attributes, source_media_format) if @event_handler
-        [source_file_attributes, source_media_format]
+        target_media_formats = @media_players.map {|mp| mp.best_format_for(source_file_attributes)}.compact.uniq
+        target_media_formats -= [source_media_format]
+
+        @event_handler.analyzed_source_file(source_file_attributes, source_media_format, target_media_formats) if @event_handler
+        [source_file_attributes, source_media_format, target_media_formats]
       end
 
       def generate_thumbnail(source_file_attributes)

data/lib/transcoding_machine/server/transcoding_event_listener.rb

@@ -20,8 +20,10 @@ module TranscodingMachine
         push_status(:analyzing)
       end
 
-      def analyzed_source_file(source_file_attributes, source_media_format)
-        push_status(:analyzed, :media_format => source_media_format.id, :media_attributes => source_file_attributes)
+      def analyzed_source_file(source_file_attributes, source_media_format, target_media_formats)
+        push_status(:analyzed, :media_format => source_media_format.id,
+                               :media_attributes => source_file_attributes,
+                               :target_formats => target_media_formats.map &:id)
       end
 
       def generating_thumbnail_file

data/lib/transcoding_machine.rb

@@ -5,7 +5,6 @@ require 'transcoding_machine/media_format_criterium'
 require 'transcoding_machine/media_player'
 require 'transcoding_machine/client/job_queue'
 require 'transcoding_machine/client/result_queue'
-require 'transcoding_machine/client/server_manager'
 
 module TranscodingMachine
   version = YAML.load_file(File.expand_path('../VERSION.yml', File.dirname(__FILE__)))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staugaard-transcoding_machine
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Mick Staugaard