staugaard-transcoding_machine 0.1.5 → 0.2.2

data/VERSION.yml

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

data/bin/update_transcoding_machine_ec2_server

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+require File.expand_path('../lib/transcoding_machine/server/worker', File.dirname(__FILE__))
+
+if ARGV.size >= 1
+  log = File.new(ARGV[0], "a")
+end
+log = log || STDERR
+
+begin
+  TranscodingMachine::Server::Ec2Environment.logger = log
+  TranscodingMachine::Server::Ec2Environment.load
+  
+  if TranscodingMachine::Server::Ec2Environment.updated_gem
+    `wget -O /tmp/transcoding_machine.gem #{TranscodingMachine::Server::Ec2Environment.updated_gem}`
+    `gem install /tmp/transcoding_machine.gem`
+  end
+rescue
+  log.puts "error #{$!}"
+  pp "#{$@}"
+  exit 1
+end

data/lib/transcoding_machine/client/job_queue.rb

@@ -9,6 +9,7 @@ module TranscodingMachine
         options[:key] = key
         options[:media_players] = media_player_ids
         options[:result_queue] = result_queue_name
+        options[:action] = :analyze
         RightAws::SqsGen2.new.queue(queue_name).push(options.to_yaml)
       end
     end

data/lib/transcoding_machine/server/ec2_environment.rb

@@ -74,6 +74,10 @@ module TranscodingMachine
       def self.status_queue_name
         data[:user_data][:status_queue_name]
       end
+      
+      def self.updated_gem
+        data[:user_data][:updated_gem]
+      end
     end
   end
 end

data/lib/transcoding_machine/server/transcoder.rb

@@ -17,10 +17,9 @@ module TranscodingMachine
         self.class.options[:storage]
       end
 
-      def initialize(source_file_name, media_players, media_formats, event_handler = nil, storage_options = {})
+      def initialize(source_file_name, media_formats, event_handler = nil, storage_options = {})
         @source_file_name = source_file_name
         @event_handler = event_handler
-        @media_players = media_players
         @media_formats = media_formats
         @storage_options = storage_options
       end
@@ -40,20 +39,9 @@ module TranscodingMachine
       def destination_file_path(media_format)
         File.expand_path(destination_file_name(media_format), work_directory)
       end
-
-      def start
-        prepare_working_directory
-        get_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
-
-        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
-        clear
+      
+      def has_source_file?
+        File.exist?(source_file_path)
       end
 
       def prepare_working_directory
@@ -64,22 +52,30 @@ module TranscodingMachine
       end
 
       def get_source_file
-        @event_handler.getting_source_file if @event_handler
-        storage.get_file(@source_file_name, source_file_path, @storage_options)
-        @event_handler.got_source_file if @event_handler
+        unless has_source_file?
+          prepare_working_directory
+          @event_handler.getting_source_file if @event_handler
+          storage.get_file(@source_file_name, source_file_path, @storage_options)
+          @event_handler.got_source_file if @event_handler
+        end
       end
 
-      def analyze_source_file
+      def analyze_source_file(media_players)
+        get_source_file
         @event_handler.analyzing_source_file if @event_handler
 
         source_file_attributes = MediaFileAttributes.new(source_file_path)
 
         source_media_format = @media_formats.find {|mf| mf.matches(source_file_attributes)}
 
-        target_media_formats = @media_players.map {|mp| mp.best_format_for(source_file_attributes)}.compact.uniq
+        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
+        
+        thumbnail_file_path = generate_thumbnail(source_file_attributes)
+        storage.put_thumbnail_file(thumbnail_file_path, @source_file_name, @storage_options) if thumbnail_file_path
+        
         [source_file_attributes, source_media_format, target_media_formats]
       end
 
@@ -95,6 +91,8 @@ module TranscodingMachine
       end
 
       def transcode(source_file_attributes, media_format)
+        get_source_file
+        media_format = @media_formats[media_format] unless media_format.is_a?(MediaFormat)
         @event_handler.transcoding(media_format) if @event_handler
 
         dst_file_path = destination_file_path(media_format)
@@ -114,6 +112,7 @@ module TranscodingMachine
         end
 
         @event_handler.transcoded(media_format) if @event_handler
+        put_destination_file(dst_file_path, media_format)
         dst_file_path
       end
 

data/lib/transcoding_machine/server/worker.rb

@@ -74,38 +74,66 @@ module TranscodingMachine
 
         start_time = Time.now
 
-        send_log_message "Transcoding: BLA BLA BLA"
-
         message_properties = YAML.load(msg.body)
         puts "consuming message #{message_properties.inspect}"
-        selected_media_players = find_media_players(message_properties[:media_players])
-        if selected_media_players.any?
-          if bucket = @s3.bucket(message_properties[:bucket].to_s)
-            key = bucket.key(message_properties[:key].to_s)
-            if key.exists?
-              transcoder = Transcoder.new(key.name,
-                                          selected_media_players,
-                                          @media_formats,
-                                          TranscodingEventListener.new(message_properties),
-                                          :bucket => bucket.name)
-              transcoder.start
+        
+        if bucket = @s3.bucket(message_properties[:bucket].to_s)
+          key = bucket.key(message_properties[:key].to_s)
+          if key.exists?
+            
+            transcoder = Transcoder.new(key.name,
+                                        @media_formats,
+                                        TranscodingEventListener.new(message_properties),
+                                        :bucket => bucket.name)
+
+            case message_properties[:action]
+            when :transcode
+              handle_transcode(transcoder, message_properties)
             else
-              send_log_message "Input file not found (bucket: #{message_properties[:bucket]} key: #{message_properties[:key]})"
+              handle_analyze(transcoder, message_properties)
             end
+            
           else
-            send_log_message "Input bucket not found (bucket: #{message_properties[:bucket]})"
+            send_log_message "Input file not found (bucket: #{message_properties[:bucket]} key: #{message_properties[:key]})"
           end
         else
-          send_log_message "No media players found #{message_properties[:media_players].inspect}"
+          send_log_message "Input bucket not found (bucket: #{message_properties[:bucket]})"
         end
-
+        
         end_time = Time.now
 
         if true #test if transcode was successful
           msg.delete
-          send_log_message "Transcoded: BLA BLA BLA"
         end
       end
+      
+      def handle_analyze(transcoder, message_properties)
+        send_log_message "Analyzing: #{message_properties[:bucket]}/#{message_properties[:key]}"
+        selected_media_players = find_media_players(message_properties[:media_players])
+        if selected_media_players.any?
+
+          source_file_attributes, source_media_format, target_media_formats = transcoder.analyze_source_file(selected_media_players)
+          
+          message_properties.delete(:media_players)
+          message_properties[:action] = :transcode
+          message_properties[:file_attributes] = source_file_attributes
+          
+          target_media_formats.each do |media_format|
+            message_properties[:media_format] = media_format
+            @work_queue.push(message_properties.to_yaml)
+          end
+
+        else
+          send_log_message "No media players found #{message_properties[:media_players].inspect}"
+        end
+        send_log_message "Analyzed: #{message_properties[:bucket]}/#{message_properties[:key]}"
+      end
+      
+      def handle_transcode(transcoder, message_properties)
+        send_log_message "Transcoding: #{message_properties[:bucket]}/#{message_properties[:key]} to format #{message_properties[:media_format]}"
+        transcoder.transcode(message_properties[:file_attributes], message_properties[:media_format])
+        send_log_message "Transcoded: #{message_properties[:bucket]}/#{message_properties[:key]} to format #{message_properties[:media_format]}"
+      end
 
       def find_media_players(media_player_ids)
         @media_players.slice(*media_player_ids).values

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staugaard-transcoding_machine
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.2
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,16 +47,17 @@ email: mick@staugaard.com
 executables: 
 - transcoding_machine
 - transcoding_machine_ec2_server
+- update_transcoding_machine_ec2_server
 extensions: []
 
 extra_rdoc_files: 
 - README
 - LICENSE
 files: 
-- NOTES.txt
 - VERSION.yml
 - bin/transcoding_machine
 - bin/transcoding_machine_ec2_server
+- bin/update_transcoding_machine_ec2_server
 - lib/transcoding_machine
 - lib/transcoding_machine/client
 - lib/transcoding_machine/client/job_queue.rb
@@ -75,7 +76,6 @@ files:
 - lib/transcoding_machine/server.rb
 - lib/transcoding_machine.rb
 - test/deserialze_test.rb
-- test/dummy_server_mananager.rb
 - test/fixtures
 - test/fixtures/serialized_models.json
 - test/media_format_criterium_test.rb