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

airtime_mvc/application/models/StreamSetting.php

@@ -202,6 +202,13 @@ class Application_Model_StreamSetting
                             "type"=>"string");
         }
         
+        $sql = "SELECT *"
+        ." FROM cc_pref"
+        ." WHERE keystr = 'off_air_meta'";
+
+        $out = $con->query($sql)->fetchAll();
+        $rows[] = array("keyname" => $out[0]["keystr"], "value"=>$out[0]["valstr"], "type"=>"string");
+
         return $rows;
     }
 

install_minimal/airtime-install

@@ -19,6 +19,7 @@ showhelp () {
 --pypo|-p                         Install only pypo and liquidsoap
 --web|-w                          Install only files for web-server
 --liquidsoap-keep-alive|-l        Keep Liquidsoap alive when upgrading"
+    exit 0
 }
 
 overwrite="f"

python_apps/pypo/install/pypo-initialize.py

@@ -38,27 +38,6 @@ def get_os_codename():
 
     return ("unknown", "unknown")
 
-def generate_liquidsoap_config(ss):
-    data = ss['msg']
-    fh = open('/etc/airtime/liquidsoap.cfg', 'w')
-    fh.write("################################################\n")
-    fh.write("# THIS FILE IS AUTO GENERATED. DO NOT CHANGE!! #\n")
-    fh.write("################################################\n")
-    for d in data:
-        buffer = d[u'keyname'] + " = "
-        if(d[u'type'] == 'string'):
-            temp = d[u'value']
-            buffer += '"%s"' % temp
-        else:
-            temp = d[u'value']
-            if(temp == ""):
-                temp = "0"
-            buffer += temp
-        buffer += "\n"
-        fh.write(api_client.encode_to(buffer))
-    fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"\n')
-    fh.close()
-
 PATH_INI_FILE = '/etc/airtime/pypo.cfg'
 PATH_LIQUIDSOAP_BIN = '/usr/lib/airtime/pypo/bin/liquidsoap_bin'