Merge branch '2.3.x' into devel

python_apps/pypo/airtime-liquidsoap-init-d

@@ -28,6 +28,7 @@ stop () {
         # Send TERM after 5 seconds, wait at most 30 seconds.
         start-stop-daemon --stop --oknodo --retry=TERM/10/KILL/5 --quiet --pidfile $PIDFILE
         rm -f $PIDFILE
+        sleep 4
 }
 
 start_no_monit() {

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -42,13 +42,13 @@ queue = amplify(1., override="replay_gain", queue)
 # the crossfade function controls fade in/out
 queue = crossfade_airtime(queue)
 queue = on_metadata(notify, queue)
-queue = map_metadata(update=false, append_title, queue)
 output.dummy(fallible=true, queue)
 
 http = input.http_restart(id="http")
 http = cross_http(http_input_id="http",http)
 output.dummy(fallible=true, http)
 stream_queue = http_fallback(http_input_id="http", http=http, default=queue)
+stream_queue = map_metadata(update=false, append_title, stream_queue)
 
 ignore(output.dummy(stream_queue, fallible=true))
 

python_apps/pypo/pypofetch.py

@@ -534,7 +534,7 @@ class PypoFetch(Thread):
                 #check if this file is opened (sometimes Liquidsoap is still
                 #playing the file due to our knowledge of the track length
                 #being incorrect!)
-                if not self.is_file_opened():
+                if not self.is_file_opened(path):
                     os.remove(path)
             except Exception, e:
                 self.logger.error(e)

python_apps/pypo/pypopush.py

@@ -372,7 +372,17 @@ class PypoPush(Thread):
         first_link = chain[0]
 
         self.modify_cue_point(first_link)
-        if float(first_link['cue_in']) >= float(first_link['cue_out']):
+
+        #ATM, we should never have an exception here. However in the future, it
+        #would be nice to allow cue_out to be None which would then allow us to
+        #fallback to the length of the track as the end point.
+        try:
+            end = first_link['cue_out']
+        except TypeError:
+            #cue_out is type None
+            end = first_link['length']
+
+        if float(first_link['cue_in']) >= float(end):
             chain = chain [1:]
 
         return chain
@@ -498,6 +508,11 @@ class PypoPush(Thread):
             self.logger.debug(msg)
             tn.write(msg)
 
+            show_name = media_item['show_name']
+            msg = 'vars.show_name %s\n' % show_name.encode('utf-8')
+            tn.write(msg)
+            self.logger.debug(msg)
+
             tn.write("exit\n")
             self.logger.debug(tn.read_all())