Merge pull request #450 from datafruits/fix-live-notifs

fix syncing metadata from liquidsoap

app/models/scheduled_show.rb

@@ -117,6 +117,7 @@ def queue_playlist!
         end
         puts "found track: #{track}"
         if track
+          # should be audio_file_name in dev ???
           liquidsoap.add_to_queue track.url
           puts "added to queue: #{track.url}"
           ScheduledShowExpAwardWorker.perform_later self.id

app/services/liquidsoap_requests.rb

@@ -34,7 +34,8 @@ def add_to_queue uri
   end
 
   def skip
-    @liquidsoap_socket.write("icecast.skip").encode("UTF-8")
+    # @liquidsoap_socket.write("icecast.skip").encode("UTF-8")
+    @liquidsoap_socket.write("backup_playlist.flush_and_skip").encode("UTF-8")
   end
 
   def scheduled_shows_queue

app/services/live_notification.rb

@@ -12,10 +12,9 @@ def self.perform radio, notification
     if s.present? && s.dj.username == user
       current_show[:scheduled_show] = s.id
     else
-      current_show[:scheduled_show] = nil
+      current_show[:scheduled_show] = ""
     end
 
-    # why does this fail
     ::StreamPusher.redis.hset "#{radio}:current_show", current_show
   end
 end

app/services/schedule_monitor.rb

@@ -23,6 +23,12 @@ def self.perform radio, now, liquidsoap_socket_class=Liquidsoap::Socket
       end
       # current_scheduled_show_in_db and redis should sync
       radio.set_current_show_playing current_scheduled_show_in_db.id
+      # TODO set current_show metadata here
+      # TODO when to clear this ??
+      #
+      # on fallback switch???
+      current_show = { title: current_scheduled_show_in_db.title, user: current_scheduled_show_in_db.dj.username }
+      StreamPusher.redis.hset "#{radio}:current_show", current_show
     else
       puts "current show is already playing and queued?"
     end