awslive-inputlooper 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c42835fefb68681c4cb5c5a30bcf86b2f07a69359d17f25d7ef33f0fbb79e1
-  data.tar.gz: 64d6ea47aa196236dd23a0bbe6142502e78dce9c3e60289d1008cb3ed2e520c3
+  metadata.gz: a808cc52ee361a7bad8e992f5b986e1d6bd7ad9106d0a4a99983e4d75173ba62
+  data.tar.gz: 6afc3d0c102de956d418bd8a4e9ab0c732abc0d615d82f4a2499547ec5b6b376
 SHA512:
-  metadata.gz: 0a73e00dc2f4b7c8edd491e9a7206ebb2b257eea96568b67cfbb3e66964443bb7a1b9282d3946cfc3dd29735ac5256669def897ec11cc359034e28e1aece6cf1
-  data.tar.gz: a1faf5d6fdd71591166fbac43a7aa7114134ad07f6cc50a801d10ca0b5165e38bfc8e18774b96bb83c9307598bec3aa0267b9f8cd51ac18999a606ca4feac009
+  metadata.gz: 76344f3ac9c93b5637fd0ec24aba60a7c1fc815eff27927957b7d3c0fcb39852de05f0bc2e738cd7ac0f8aa7a6c4b61eab7a0589975363fe2df7148c7cbcb3b0
+  data.tar.gz: 4abb1f5ac234ce5768b0bc7d12c64134988be068f8018db611425ef2165c6d4d85fa30370577698eb9a06de64fb47acce51cb06ebcf629359b98fd129cd7be67

data/lib/awslive-inputlooper/input_looper.rb

@@ -32,6 +32,7 @@ module Awslive
       @channel_id = channel_id
       @playlist = playlist
       @loop_thread = nil
+      set_log_flag(true)
     end
 
     def switch_and_loop_playlist(playlist, sleep_time = nil)
@@ -73,7 +74,7 @@ module Awslive
       return playlist_loop_alive
     end
 
-    def switch_input(force_immed = nil, exclude_query_param = nil)
+    def switch_input(force_immed = nil, exclude_query_param = nil, loopback = nil)
       # Fetching the channel information every time to know the state of the channel and input in pipeline.
       channel_info = get_channel_info
       channel_state = channel_info[:state]
@@ -102,14 +103,20 @@ module Awslive
         end
 
         follow_schedule = @scheduler.get_follow_schedule(@channel_id, current_input_action_name)
+        log( "Follow Schedule => #{follow_schedule}")
         current_url = @scheduler.get_action_url(@channel_id, current_input_action_name)
-        log( "current URL #{current_url} next URL #{follow_schedule}")
+        log("Current URL => #{current_url}")
+        next_file = identify_next_input(current_url, exclude_query_param, loopback )
+        log("Next URL => #{next_file}")
+        if next_file.nil? && follow_schedule.nil? && !loopback
+          log ("end of playlist and loopback not enabled!!")
+          return
+        end
+        log( "current URL #{current_url} next URL #{next_file}")
         unless follow_schedule.nil?
           follow_url = @scheduler.get_follow_action_url(@channel_id, current_input_action_name)
           log("Follow URL #{follow_url}")
-          next_file = identify_next_input(current_url, exclude_query_param)
-          log( "Next URL #{next_file}")
-          if !follow_url[0].nil? && next_file != follow_url[0]
+          if !follow_url[0].nil? && next_file.split('?')[0] != follow_url[0].split('?')[0]
             log( "Playlist seems to be changed, hence aligning.")
             @scheduler.delete( @channel_id,[ "#{follow_schedule[:action_name]}"])
             next_input_name = dynamic_input[:input_attachment_name]
@@ -125,7 +132,7 @@ module Awslive
           end
         else
           log("No follow Schedule!")
-          next_file = identify_next_input(current_url, exclude_query_param)
+          #next_file = identify_next_input(current_url, exclude_query_param)
           unless next_file.nil?
             next_input_name = dynamic_input[:input_attachment_name]
             log( "Next input Name #{next_input_name} #{next_file}")
@@ -142,18 +149,59 @@ module Awslive
       end
     end
 
-    def identify_next_input(file_url, exclude_query_param)
+    def is_url_duplicated(url)
+      match_count = 0
+      is_duplicated = false
+      @playlist.each_with_index do | playlist_file, index |
+        playlist_file = playlist_file.split('?')[0]
+        if playlist_file == url.split('?')[0]
+          match_count =  match_count + 1
+        end
+        if match_count >= 2
+          is_duplicated = true
+          break
+        end
+      end
+      is_duplicated
+    end
+
+    def get_order(url)
+      puts "URL => #{url}"
+      order = nil
+      if !url.nil?
+        uri = URI.parse(url) rescue nil
+        params = CGI.parse(uri.query) unless uri.nil?
+        if !params.nil?
+          order = params["order"].first rescue nil
+        end
+      end
+      order
+    end
+
+    def identify_next_input(file_url, exclude_query_param, loopback = true)
       next_file = @playlist[0]
       #puts " File Url #{file_url}"
       if !file_url.nil? && !file_url[0].nil?
+        is_duplicated = is_url_duplicated(file_url[0])
+        log( "URL Duplicate => #{is_duplicated}")
         @playlist.each_with_index do | playlist_file, index |
           #puts "next file identification #{playlist_file}   #{file_url[0]}  #{index}"
-          if !exclude_query_param.nil?
+          if !exclude_query_param.nil? && !is_duplicated
             playlist_file = playlist_file.split('?')[0]
             file_url[0] = file_url[0].split('?')[0]
           end
           if playlist_file == file_url[0]
+            if is_duplicated
+              p_order = get_order(playlist_file)
+              c_order = get_order(file_url[0])
+              puts "playlist Order #{p_order} : current order #{c_order}"
+            end
+            next if is_duplicated && !p_order.nil? && !c_order.nil? && p_order != c_order
             if index == (@playlist.length - 1)
+              if !loopback
+                next_file = nil
+                break
+              end
               next_file = @playlist[0]
             else
               next_file = @playlist[index + 1]

data/lib/awslive-scheduler/input_switch_schedule_action.rb

@@ -41,7 +41,6 @@ module Awslive
     def get_follow_schedule_action(follow_input, trigger_input, urlpath = nil)
       action_hash = FOLLOW_HASH.clone
       action_hash[:action_name] = "#{get_action_id}"
-      puts "action hash #{action_hash}"
       action_hash[:schedule_action_start_settings][:follow_mode_schedule_action_start_settings][:reference_action_name] = "#{follow_input}"
       action_hash[:schedule_action_settings][:input_switch_settings][:input_attachment_name_reference] = "#{trigger_input}"
       action_hash[:schedule_action_settings][:input_switch_settings][:url_path] = [ urlpath ] unless urlpath.nil?

data/lib/awslive-scheduler/schedule_action.rb

@@ -46,6 +46,7 @@ module Awslive
     end
 
     def get_follow_schedule(channel_id, action_name)
+      puts "Follow for action Name : #{action_name}"
       follow_schedule = nil
       response = @mediaclient.describe_schedule({channel_id: "#{channel_id}", max_results: 100 } )
       loop do
@@ -53,6 +54,11 @@ module Awslive
           unless schedule_action[:schedule_action_start_settings][:follow_mode_schedule_action_start_settings].nil?
             # This is follow action
             if schedule_action[:schedule_action_start_settings][:follow_mode_schedule_action_start_settings][:reference_action_name] == action_name
+              # Identifying only the input switch follow action for right follow up! as it provides SCTE35 follow up as well.
+              puts "Scheduled Action #{schedule_action}"
+              if schedule_action[:schedule_action_settings][:input_switch_settings].nil?
+                next
+              end
               follow_schedule = schedule_action
               break
             end
@@ -94,7 +100,7 @@ module Awslive
           scheduled_action << @input_switch_schedule_action.get_follow_schedule_action(data[:follow_input], data[:trigger_input], data[:url_path])
           type, duration = get_type_duration(data[:url_path])
           if !type.nil? && !duration.nil? && type == "ad_marker"
-            puts "Duration => #{duration}"
+            puts "ad marker provisioned for duration => #{duration}"
             ad_scheduled_action << @ad_marker_schedule_action.get_follow_schedule_action(data[:follow_input], duration.to_i)
           end
         end
@@ -148,7 +154,6 @@ module Awslive
     def get_action_url(channel_id, action_name)
       url = nil
       follow_schedule = get_scheudle_action(channel_id, action_name)
-      puts "Follow Schedule #{follow_schedule}"
       url = follow_schedule[:schedule_action_settings][:input_switch_settings][:url_path] unless follow_schedule.nil?
       url
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awslive-inputlooper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Maheshwaran G
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler