Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x

airtime_mvc/application/controllers/ScheduleController.php

@@ -246,7 +246,7 @@ class ScheduleController extends Zend_Controller_Action
                         'callback' => 'window["beginEditShow"]'), 'title' => 'Edit Show');
                 $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/delete-show'.$params,
                         'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Delete This Instance');
-                if ($show->getShow()->isRepeating()) {
+                if ($show->getShow()->isRepeating() || $show->getShow()->isRebroadcast()) {
                     $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/cancel-show'.$params,
                             'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Delete This Instance and All Following');
                 }

airtime_mvc/application/views/scripts/dashboard/about.phtml

@@ -1,8 +1,8 @@
 <div class="text-content">
     <h2>About</h2>
 <p>
-<a href="http://airtime.sourcefabric.org">Airtime</a> <?php echo $this->airtime_version ?>, the open radio software for scheduling and remote station management.<br>
+<a href="http://airtime.sourcefabric.org" target="_blank">Airtime</a> <?php echo $this->airtime_version ?>, the open radio software for scheduling and remote station management.<br>
-© 2011 <a href="http://www.sourcefabric.org">Sourcefabric</a> o.p.s 2011. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL v.3</a>
+© 2011 <a href="http://www.sourcefabric.org" target="_blank">Sourcefabric</a> o.p.s 2011. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
 </p>
 </div>
 <br>

install_full/ubuntu/airtime-full-install

@@ -24,7 +24,7 @@ echo "----------------------------------------------------"
 
 dist=`lsb_release -is`
 
-if [ "$dist" -eq "Debian" ]; then
+if [ "$dist" = "Debian" ]; then
     grep "deb http://www.debian-multimedia.org squeeze main non-free" /etc/apt/sources.list
     if [ "$?" -ne "0" ]; then
         echo "deb http://www.debian-multimedia.org squeeze main non-free" >> /etc/apt/sources.list

install_minimal/airtime-install

@@ -17,15 +17,16 @@ fi
 
 showhelp () {
     echo "Usage: airtime-install [options]
---help|-h            Displays usage information.
+--help|-h                       Displays usage information.
---overwrite|-o       Overwrite any existing config files.
+--overwrite|-o                  Overwrite any existing config files.
---preserve|-p        Keep any existing config files.
+--preserve|-p                   Keep any existing config files.
---no-db|-n           Turn off database install.
+--no-db|-n                      Turn off database install.
---reinstall|-r       Force a fresh install of this Airtime Version
+--reinstall|-r                  Force a fresh install of this Airtime Version
---media-monitor|-m   Install only media-monitor
+--media-monitor|-m              Install only media-monitor
---pypo|-p            Install only pypo and liquidsoap
+--pypo|-p                       Install only pypo and liquidsoap
---show-recorder|-s   Install only show-recorder
+--show-recorder|-s              Install only show-recorder
---web|-w             Install only files for web-server"
+--web|-w                        Install only files for web-server
+--liquidsoap-keep-alive|-l      Keep Liquidsoap alive when upgrading"
 }
 
 overwrite="f"
@@ -36,8 +37,9 @@ mediamonitor="f"
 pypo="f"
 showrecorder="f"
 web="f"
+liquidsoap_keep_alive="f"
 
-set -- $(getopt -l help,overwrite,preserve,no-db,reinstall,media-monitor,pypo,show-recorder,web "hopnrmysw" "$@")
+set -- $(getopt -l help,overwrite,preserve,no-db,reinstall,media-monitor,pypo,show-recorder,web,liquidsoap-keep-alive "hopnrmyswl" "$@")
 while [ $# -gt 0 ]
 do
     case "$1" in
@@ -50,6 +52,7 @@ do
     (-y|--pypo) pypo="t";;
     (-s|--show-recorder) showrecorder="t";;
     (-w|--web) web="t";;
+    (-l|--liquidsoap-keep-alive) liquidsoap_keep_alive="t";;
     
     (--) shift; break;;
     (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;;
@@ -103,6 +106,7 @@ export reinstall
 export nodb
 export overwrite
 export preserve
+export liquidsoap_keep_alive
 
 set +e
 test "$mediamonitor" = "t" -o "$pypo" = "t" -o "$showrecorder" = "t"

python_apps/pypo/airtime-playout-init-d

@@ -34,6 +34,14 @@ liquidsoap_stop () {
         rm -f $PIDFILE1
 }
 
+stop_pypo () {
+        monit unmonitor airtime-playout >/dev/null 2>&1
+        
+        # Send TERM after 5 seconds, wait at most 30 seconds.
+        start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE0
+        rm -f $PIDFILE0
+}
+
 start () {
         start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE0 --startas $DAEMON0
         monit monitor airtime-playout >/dev/null 2>&1
@@ -124,6 +132,12 @@ case "${1:-''}" in
            start-liquidsoap
            echo "Done."
         ;;
+  'pypo-stop')
+           # restart commands here
+           echo -n "Restarting Pypo: "
+           stop_pypo
+           echo "Done."
+        ;;
   *)      # no parameter specified
         echo "Usage: $SELF start|stop|restart|status"
         exit 1

python_apps/pypo/install/pypo-initialize.py

@@ -103,8 +103,14 @@ try:
 
     #restart airtime-playout   
     print "* Waiting for pypo processes to start..."
-    p = Popen("/etc/init.d/airtime-playout stop", shell=True)
+    if os.environ["liquidsoap_keep_alive"] == "f":
-    sts = os.waitpid(p.pid, 0)[1]
+        print " * Restarting any previous Liquidsoap instances"
+        p = Popen("/etc/init.d/airtime-playout stop", shell=True)
+        sts = os.waitpid(p.pid, 0)[1]
+    else:
+        print " * Keeping any previous Liquidsoap instances running"
+        p = Popen("/etc/init.d/airtime-playout pypo-stop", shell=True)
+        sts = os.waitpid(p.pid, 0)[1]
     p = Popen("/etc/init.d/airtime-playout start-no-monit", shell=True)
     sts = os.waitpid(p.pid, 0)[1]