awslive-poster 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d613313ddc2fe0727ddd7d848d4036ba12dfb127ce1f59cb4b28ab111fadc1
-  data.tar.gz: a03630438dd58e6250bdbdae95f91c58e4b6cf8344a270f249d2902008ee87b6
+  metadata.gz: 73119e23084cd47331c2a61590c5ee61d9f4e5534d3d0432fb168d56d207c0a0
+  data.tar.gz: 14b381cbcc3c18fa6964bff356b245d9735f52fac3ce1ee83dfccb93e3dae7cf
 SHA512:
-  metadata.gz: b600f73b6936af7645dc67e9e9938fd9c6367316d5d10251485b44fca3962b1c6a26bb542336311620c0f1b3fd914a0d8a555129a39e92e7bc9ec36367b8365d
-  data.tar.gz: 5adc0432f41e2d0422352a5c73e07983cab835ed22e3e8b756c8a6e43e5c62cb43ca66309c89fdc3daea1b780e58712e17c7b5b528fe223b67f081dbb10708fc
+  metadata.gz: 3843d5f31d41323642c26b913b65118e4bd49da5674479f362ab9e83d07ca347ec7e249f4e79c70dd1220b0cd60ddf8134a00b2d1d1a9eb7a61504bd0e805c69
+  data.tar.gz: 661426581000a6715af969a9a912abe9be2af828605e14f66d46e04a6f72f4085eaf33a9f30c3b850b78789238f918727ad305796798a9a21e9345edfa5e3608

data/lib/awslive-poster/awslive_poster.rb

@@ -15,32 +15,26 @@ module Awslive
     def initialize(channel_id, access_key=nil , access_secret =nil, region = nil)
       credentials = Aws::SharedCredentials.new
       if !access_key.nil? && !access_secret.nil?
-        aws_region = 'us-east-1' if region.nil?
+        aws_region = region.nil? ? 'us-east-1' : region
+        puts "AWS REgion #{aws_region}"
         @medialiveclient = Aws::MediaLive::Client.new( :access_key_id => access_key, :secret_access_key => access_secret, :region => aws_region )
-        @s3 = Aws::S3::Resource.new( :access_key_id => access_key, :secret_access_key => access_secret, :region => aws_region )
+        client = Aws::S3::Client.new(access_key_id: access_key, secret_access_key: access_secret, region: 'us-east-1')
+        @s3 = Aws::S3::Resource.new(client: client)
       elsif credentials.set?
         @medialiveclient = Aws::MediaLive::Client.new(:credentials => credentials)
-        @s3 = Aws::S3::Resource.new(:credentials => credentials)
+        @s3 = Aws::S3::Client.new(:credentials => credentials)
       else
         @medialiveclient = Aws::MediaLive::Client.new
-        @s3 = Aws::S3::Resource.new
+        @s3 = Aws::S3::Client.new
       end
       @channel_id = channel_id
       @last_computed_time = nil
+
       @last_preview_url = nil
       @interval = nil
     end
 
     def get_url(channel_info = nil)
-      if !@last_computed_time.nil? && !@last_preview_url.nil? && !@interval.nil?
-        threshold_gap = @interval > MAX_CHANNEL_START_TIME ? MAX_CHANNEL_START_TIME : @interval
-        current_time = Time.now.to_i
-        if current_time - @last_computed_time < threshold_gap
-          # quick fetch hence returning already computed preview URL.
-          puts "returning from cache"
-          return @last_preview_url
-        end
-      end
       preview_url = nil
       channel_info = @medialiveclient.describe_channel({ :channel_id => "#{@channel_id}" }) if channel_info.nil?
       channel_state = channel_info[:state]
@@ -55,29 +49,43 @@ module Awslive
         uri = URI(url)
         modifier = get_framecapture_modifier(out_group)
         @interval = get_framecapture_interval(out_group, channel_info)
-        seq_counter = compute_index(start_time, @interval)
+        index, seq_counter = compute_index(start_time, @interval)
         suffix = uri.path[1..-1]
         bucket = @s3.bucket("#{uri.host}")
+        puts "object prefix #{suffix}#{modifier}.#{seq_counter}.jpg"
         obj = bucket.object("#{suffix}#{modifier}.#{seq_counter}.jpg")
-        if obj.exists?
-          preview_url = obj.presigned_url(:get)
-        else
-          raise PosterImageDoesNotExist.new("Poster Image #{suffix}#{modifier}.#{seq_counter}.jpg Does not exist!")
+        preview_url = get_presigned_url(obj) rescue nil
+        if preview_url.nil?
+          puts "seems delay in generating posters; decrementing the counter!!"
+          index = index - 1
+          seq_counter = index.to_s.rjust(5,'0')
+          obj = bucket.object("#{suffix}#{modifier}.#{seq_counter}.jpg")
+          preview_url = get_presigned_url(obj)
         end
+        raise PosterImageDoesNotExist.new("Poster Image #{suffix}#{modifier}.#{seq_counter}.jpg Does not exist!") if preview_url.nil?
       else
         raise InvalidChannelState.new("Channel Need to be in running state!, current state is #{channel_state}")
       end
-      @last_preview_url = preview_url
       preview_url
     end
 
+    def get_presigned_url(obj)
+      url = nil
+      puts "Fetching the object at #{Time.now}"
+      puts "Object #{obj}"
+      if obj.exists?
+        url = obj.presigned_url(:get) rescue nil
+      end
+      url
+    end
+
     def compute_index(start_time, interval)
       channel_start_time = Time.iso8601(start_time).to_i
       current_time = Time.now.utc.to_i
       diff_time = current_time - channel_start_time
-      image_index = (diff_time / interval.to_i).to_i
+      image_index = (diff_time / interval.to_i).round
       index =  image_index.to_s.rjust(5,'0')
-      index
+      return image_index, index
     end
 
     def get_channel_start_time(channel_info)
@@ -151,4 +159,4 @@ module Awslive
       video_info
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awslive-poster
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Maheshwaran G
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler