Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/public/css/styles.css

@@ -1752,6 +1752,8 @@ button.ui-button.md-cancel {
 .dialogPopup fieldset dd input[type="text"], .dialogPopup fieldset dd textarea {
 	width:99.5%;
 	padding:0;
+}
+.dialogPopup fieldset dd input[type="text"] {
 	height:23px;
 }
 .dialogPopup fieldset dd select {
@@ -1792,7 +1794,7 @@ label span {
     font-size: 12px;
     text-indent: 0;
 	margin:0;
-	width:100%;
+	width:99%;
 	line-height:180%;
 	resize: none;
 }
@@ -2297,3 +2299,5 @@ tfoot tr th	{
 	-moz-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
 	-webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
 }
+#stream_url {font-size:12px; line-height: 170%;}
+.stream-setting-content fieldset {border-width:0 1px 1px 1px;}

install_minimal/airtime-install

@@ -61,6 +61,8 @@ python ${SCRIPTPATH}/../python_apps/icecast2/install/icecast2-install.py
 # reload its config files.
 /etc/init.d/monit restart
 
+#allow monit to boot up before issuing commands
+sleep 1
 
 set +e
 monit monitor airtime-media-monitor

python_apps/pypo/airtime-liquidsoap

@@ -6,7 +6,7 @@ virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 ls_user="pypo"
 export HOME="/var/tmp/airtime/pypo/"
 api_client_path="/usr/lib/airtime/"
-ls_path="/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"
+ls_path="/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap --verbose"
 ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
 
 exec 2>&1

python_apps/pypo/airtime-playout-init-d

@@ -107,11 +107,21 @@ case "${1:-''}" in
            # status commands here
            /usr/bin/airtime-check-system
         ;;
+  'stop-liquidsoap')
+           echo -n "Stopping Liquidsoap: "
+           liquidsoap_stop
+           echo "Done."
+        ;;
+  'start-liquidsoap')
+           echo -n "Starting Liquidsoap: "
+           liquidsoap_start
+           echo "Done."
+        ;;
   'restart-liquidsoap')
            # restart commands here
            echo -n "Restarting Liquidsoap: "
-           liquidsoap_stop
-           liquidsoap_start
+           stop-liquidsoap
+           start-liquidsoap
            echo "Done."
         ;;
   *)      # no parameter specified

python_apps/pypo/install/pypo-install.py

@@ -109,7 +109,7 @@ try:
   os.remove(config["bin_dir"]+"/bin/liquidsoap_scripts/liquidsoap.cfg")
   
   print "Setting permissions"
-  #os.system("chmod -R 755 "+config["bin_dir"])
+  os.system("chmod 755 "+os.path.join(config["bin_dir"], "liquidsoap_scripts/notify.sh"))
   os.system("chown -R pypo:pypo "+config["bin_dir"])
   os.system("chown -R pypo:pypo "+config["cache_base_dir"])
 

python_apps/pypo/liquidsoap_scripts/ls_lib.liq

@@ -1,6 +1,6 @@
 def notify(m)
+  log("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
   system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
-  print("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
 end
 
 # A function applied to each metadata chunk
@@ -55,7 +55,6 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
         end
         output = output.icecast(host = host,
                     port = port,
-                    encoding = "UTF-8",
                     password = pass,
                     mount = mount_point,
                     fallible = true,

python_apps/pypo/liquidsoap_scripts/notify.sh

@@ -10,4 +10,4 @@ SCRIPT=`readlink -f $0`
 # Absolute path this script is in
 SCRIPTPATH=`dirname $SCRIPT`
 
-cd ${SCRIPTPATH}/../ && ./pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &
+cd ${SCRIPTPATH}/../ && python pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &