staugaard-transcoding_machine 0.1.4 → 0.1.5

data/VERSION.yml

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

data/lib/transcoding_machine/client/result_queue.rb

@@ -2,9 +2,10 @@ require 'right_aws'
 
 module TranscodingMachine
   class ResultQueue
-    def initialize
+    def initialize(logger = nil)
       @sqs = RightAws::SqsGen2.new
       @consuming = false
+      @logger = logger
     end
 
     def start_consuming(queue_names, &block)
@@ -37,7 +38,7 @@ module TranscodingMachine
       begin
         yield(message_properties)
       rescue Exception => e
-        
+        @logger.error(e) if @logger
       end
       
       @last_active_at = Time.now

data/lib/transcoding_machine/server/file_storage.rb

@@ -17,6 +17,7 @@ module TranscodingMachine
 
       def put_thumbnail_file(thumbnail_file_path, source_file, options)
         FileUtils.mv(thumbnail_file_path.path, @root)
+        thumbnail_file_path.path
       end
     end
   end

data/lib/transcoding_machine/server/s3_storage.rb

@@ -29,6 +29,7 @@ module TranscodingMachine
         destination_key = RightAws::S3::Key.create(@s3.bucket(options[:bucket]), "#{source_file_key_name}.thumb.jpg")
         destination_key.put(thumbnail_file, 'public-read', 'Content-Type' => 'image/jpg')
         FileUtils.rm(thumbnail_file.path)
+        destination_key.name
       end
     end
   end

data/lib/transcoding_machine/server/transcoder.rb

@@ -118,9 +118,10 @@ module TranscodingMachine
       end
 
       def put_destination_file(file_path, media_format)
-        @event_handler.putting_destination_file(file_path, media_format) if @event_handler
-        storage.put_file(destination_file_path(media_format), destination_file_name(media_format), media_format, @storage_options)
-        @event_handler.put_destination_file(file_path, media_format) if @event_handler
+        dst_name = destination_file_name(media_format)
+        @event_handler.putting_destination_file(dst_name, media_format) if @event_handler
+        storage.put_file(destination_file_path(media_format), dst_name, media_format, @storage_options)
+        @event_handler.put_destination_file(dst_name, media_format) if @event_handler
       end
 
       def clear

data/lib/transcoding_machine/server/transcoding_event_listener.rb

@@ -21,7 +21,7 @@ module TranscodingMachine
       end
 
       def analyzed_source_file(source_file_attributes, source_media_format, target_media_formats)
-        push_status(:analyzed, :media_format => source_media_format.id,
+        push_status(:analyzed, :media_format => source_media_format ? source_media_format.id : nil,
                                :media_attributes => source_file_attributes,
                                :target_formats => target_media_formats.map(&:id))
       end

metadata

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