CC-1469: Crossfading support (non-equal power)

-further implementation..

python_apps/pypo/pypoliqqueue.py

@@ -43,6 +43,8 @@ class PypoLiqQueue(Thread):
                     time_until_next_play = \
                             self.date_interval_to_seconds(
                                     schedule_deque[0]['start'] - datetime.utcnow())
+                    if time_until_next_play < 0:
+                        time_until_next_play = 0
                 else:
                     time_until_next_play = None
             else:
@@ -59,13 +61,7 @@ class PypoLiqQueue(Thread):
     def is_media_item_finished(self, media_item):
         return datetime.utcnow() > media_item['end']
 
-    def telnet_to_liquidsoap(self, media_item):
+    def find_available_queue(self):
-        """
-        telnets to liquidsoap and pushes the media_item to its queue. Push the
-        show name of every media_item as well, just to keep Liquidsoap up-to-date
-        about which show is playing.
-        """
-        
         available_queue = None
         for i in self.liq_queue_tracker:
             mi = self.liq_queue_tracker[i]
@@ -76,6 +72,17 @@ class PypoLiqQueue(Thread):
         if available_queue == None:
             raise NoQueueAvailableException()
 
+        return available_queue
+
+    def telnet_to_liquidsoap(self, media_item):
+        """
+        telnets to liquidsoap and pushes the media_item to its queue. Push the
+        show name of every media_item as well, just to keep Liquidsoap up-to-date
+        about which show is playing.
+        """
+        
+        available_queue = self.find_available_queue()
+
         try:
             self.telnet_liquidsoap.queue_push(available_queue, media_item)
             self.liq_queue_tracker[available_queue] = media_item

python_apps/pypo/pypopush.py

@@ -71,15 +71,15 @@ class PypoPush(Thread):
                 LS_PORT\
                 )
 
-        liq_queue_tracker = {
+        self.liq_queue_tracker = {
                 "s0": None,
                 "s1": None,
                 "s2": None,
                 "s3": None,
                 }
 
-        self.pypoLiq_q = Queue()
+        self.future_scheduled_queue = Queue()
-        self.plq = PypoLiqQueue(self.pypoLiq_q, \
+        self.plq = PypoLiqQueue(self.future_scheduled_queue, \
                 telnet_lock, \
                 liq_queue_tracker, \
                 self.telnet_liquidsoap)
@@ -131,8 +131,6 @@ class PypoPush(Thread):
 
                 self.future_scheduled_queue.put(scheduled_for_future)
 
-                self.pypoLiq_q.put(scheduled_for_future)
-
                 """
                 #queue.get timeout never had a chance to expire. Instead a new
                 #schedule was received. Let's parse this schedule and generate
@@ -193,7 +191,7 @@ class PypoPush(Thread):
     def separate_present_future(self, media_schedule):
         tnow = datetime.utcnow()
 
-        present = {}
+        present = []
         future = {}
 
         sorted_keys = sorted(media_schedule.keys())
@@ -205,13 +203,13 @@ class PypoPush(Thread):
             diff_sec = self.date_interval_to_seconds(diff_td)
 
             if diff_sec >= 0:
-                present[media_item['start']] = media_item
+                present.append(media_item)
             else:
                 future[media_item['start']] = media_item
 
         return present, future
 
-    def verify_correct_present_media(self, currently_playing):
+    def verify_correct_present_media(self, scheduled_now):
         #verify whether Liquidsoap is currently playing the correct items.
         #if we find an item that Liquidsoap is not playing, then push it
         #into one of Liquidsoap's queues. If Liquidsoap is already playing
@@ -221,10 +219,38 @@ class PypoPush(Thread):
         #Check for Liquidsoap media we should source.skip
         #get liquidsoap items for each queue. Since each queue can only have one
         #item, we should have a max of 8 items.
-        #TODO
 
-        #Check for media Liquidsoap should start playing
+        schedule_ids = set()
-        #TODO
+        for i in scheduled_now:
+            schedule_ids.add(i["row_id"])
+
+        liq_queue_ids = set()
+        for i in self.liq_queue_tracker:
+            mi = self.liq_queue_tracker[i]
+            if not self.plq.is_media_item_finished(mi):
+                liq_queue_ids.add(mi["row_id"])
+
+        to_be_added = schedule_ids - liq_queue_ids
+        to_be_removed = liq_queue_ids - schedule_ids
+
+        if len(to_be_removed):
+            self.logger.info("Need to remove items from Liquidsoap: %s" % \
+                    to_be_removed)
+
+            for i in self.liq_queue_tracker:
+                mi = self.liq_queue_tracker[i]
+                if mi["row_id"] in to_be_removed:
+                    self.telnet_liquidsoap.queue_remove(i)
+
+
+        if len(to_be_added):
+            self.logger.info("Need to add items to Liquidsoap *now*: %s" % \
+                    to_be_added)
+
+            for i in scheduled_now:
+                if i["row_id"] in to_be_added:
+                    queue_id = self.plq.find_available_queue()
+                    self.telnet_liquidsoap.queue_push(queue_id)
 
     def get_current_stream_id_from_liquidsoap(self):
         response = "-1"

python_apps/pypo/telnetliquidsoap.py

@@ -19,6 +19,21 @@ class TelnetLiquidsoap:
     def __is_empty(self, tn, queue_id):
         return True
 
+    def queue_remove(self, queue_id):
+        try:
+            self.telnet_lock.acquire()
+            tn = self.__connect()
+
+
+            #TODO: Need a source.skip for each queue
+
+            tn.write("exit\n")
+            self.logger.debug(tn.read_all())
+        except Exception:
+            raise
+        finally:
+            self.telnet_lock.release()
+
 
     def queue_push(self, queue_id, media_item):
         try: