Refactor some stuff related to four streams, Liquidsoap is a piece of

shit too - no dynamic variables

python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py

@@ -10,18 +10,23 @@ def generate_liquidsoap_config(ss):
     fh.write("################################################\n")
     fh.write("# THIS FILE IS AUTO GENERATED. DO NOT CHANGE!! #\n")
     fh.write("################################################\n")
+    fh.write("# The ignore() lines are to squash unused variable warnings\n")
 
-    for d in data:
-        key = d['keyname']
+    for key, value in data.iteritems():
+        try:
+            str_buffer = "%s = %s\n" % (key, int(value))
+        except ValueError:
+            try: # Is it a boolean?
+                if "true" in value or "false" in value:
+                    str_buffer = "%s = %s\n" % (key, value.lower())
+                else:
+                    raise ValueError() # Just drop into the except below
+            except: #Everything else is a string
+                str_buffer = "%s = \"%s\"\n" % (key, value)
 
-        str_buffer = d[u'keyname'] + " = "
-        if d[u'type'] == 'string':
-            val = '"%s"' % d['value']
-        else:
-            val = d[u'value']
-            val = val if len(val) > 0 else "0"
-        str_buffer = "%s = %s\n" % (key, val)
         fh.write(str_buffer.encode('utf-8'))
+        # ignore squashes unused variable errors from Liquidsoap
+        fh.write(("ignore(%s)\n" % key).encode('utf-8'))
 
     fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"\n')
     fh.close()

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -104,7 +104,7 @@ server.register(namespace="vars",
                 fun (s) -> begin log("vars.bootup_time") time := s s end)
 server.register(namespace="streams",
                 "connection_status",
-                fun (s) -> begin log("streams.connection_status") "1:#{!s1_connected},2:#{!s2_connected},3:#{!s3_connected}:#{!s4_connected}" end)
+                fun (s) -> begin log("streams.connection_status") "1:#{!s1_connected},2:#{!s2_connected},3:#{!s3_connected},4:#{!s4_connected}" end)
 server.register(namespace="vars",
                 "default_dj_fade",
                 fun (s) -> begin log("vars.default_dj_fade") default_dj_fade := float_of_string(s) s end)
@@ -400,9 +400,9 @@ if s3_enable == true then
                 s3_connected, s3_description, s3_channels)
 end
 
-%ifdef s4_enable
 s4_namespace = ref ''
 if s4_enable == true then
+    log("Stream 4 Enabled")
     if s4_output == 'shoutcast' then
         s4_namespace := "shoutcast_stream_4"
     else
@@ -413,7 +413,6 @@ if s4_enable == true then
                 s4_mount, s4_url, s4_name, s4_genre, s4_user, s, "4",
                 s4_connected, s4_description, s4_channels)
 end
-%endif
 
 
 command = "/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --liquidsoap-started &"

python_apps/pypo/listenerstat.py

@@ -118,10 +118,10 @@ class ListenerStat(Thread):
                     else:
                         stats.append(self.get_shoutcast_stats(v))
                     self.update_listener_stat_error(v["mount"], 'OK')
-                except Exception, e:
+                except Exception as e:
                     try:
                         self.update_listener_stat_error(v["mount"], str(e))
-                    except Exception, e:
+                    except Exception as e:
                         self.logger.error('Exception: %s', e)
 
         return stats

python_apps/pypo/pypofetch.py

@@ -216,98 +216,9 @@ class PypoFetch(Thread):
     TODO: This function needs to be way shorter, and refactored :/ - MK
     """
     def regenerate_liquidsoap_conf(self, setting):
-        existing = {}
+        self.restart_liquidsoap()
+        self.update_liquidsoap_connection_status()
 
-        setting = sorted(setting.items())
-        try:
-            fh = open('/etc/airtime/liquidsoap.cfg', 'r')
-        except IOError, e:
-            #file does not exist
-            self.restart_liquidsoap()
-            return
-
-        self.logger.info("Reading existing config...")
-        # read existing conf file and build dict
-        while True:
-            line = fh.readline()
-
-            # empty line means EOF
-            if not line:
-                break
-
-            line = line.strip()
-
-            if not len(line) or line[0] == "#":
-                continue
-
-            try:
-                key, value = line.split('=', 1)
-            except ValueError:
-                continue
-            key = key.strip()
-            value = value.strip()
-            value = value.replace('"', '')
-            if value == '' or value == "0":
-                value = ''
-            existing[key] = value
-        fh.close()
-
-        # dict flag for any change in config
-        change = {}
-        # this flag is to detect disable -> disable change
-        # in that case, we don't want to restart even if there are changes.
-        state_change_restart = {}
-        #restart flag
-        restart = False
-
-        self.logger.info("Looking for changes...")
-        # look for changes
-        for k, s in setting:
-            if "output_sound_device" in s[u'keyname'] or "icecast_vorbis_metadata" in s[u'keyname']:
-                dump, stream = s[u'keyname'].split('_', 1)
-                state_change_restart[stream] = False
-                # This is the case where restart is required no matter what
-                if (existing[s[u'keyname']] != str(s[u'value'])):
-                    self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
-                    restart = True;
-            elif "master_live_stream_port" in s[u'keyname'] or "master_live_stream_mp" in s[u'keyname'] or "dj_live_stream_port" in s[u'keyname'] or "dj_live_stream_mp" in s[u'keyname'] or "off_air_meta" in s[u'keyname']:
-                if (existing[s[u'keyname']] != s[u'value']):
-                    self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
-                    restart = True;
-            else:
-                stream, dump = s[u'keyname'].split('_', 1)
-                if "_output" in s[u'keyname']:
-                    if (existing[s[u'keyname']] != s[u'value']):
-                        self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
-                        restart = True;
-                        state_change_restart[stream] = True
-                    elif (s[u'value'] != 'disabled'):
-                        state_change_restart[stream] = True
-                    else:
-                        state_change_restart[stream] = False
-                else:
-                    # setting inital value
-                    if stream not in change:
-                        change[stream] = False
-                    if not (s[u'value'] == existing[s[u'keyname']]):
-                        self.logger.info("Keyname: %s, Current value: %s, New Value: %s", s[u'keyname'], existing[s[u'keyname']], s[u'value'])
-                        change[stream] = True
-
-        # set flag change for sound_device alway True
-        self.logger.info("Change:%s, State_Change:%s...", change, state_change_restart)
-
-        for k, v in state_change_restart.items():
-            if k == "sound_device" and v:
-                restart = True
-            elif v and change[k]:
-                self.logger.info("'Need-to-restart' state detected for %s...", k)
-                restart = True
-        # rewrite
-        if restart:
-            self.restart_liquidsoap()
-        else:
-            self.logger.info("No change detected in setting...")
-            self.update_liquidsoap_connection_status()
 
     @ls_timeout
     def update_liquidsoap_connection_status(self):

python_apps/pypo/pypoliquidsoap.py

@@ -15,6 +15,7 @@ class PypoLiquidsoap():
                 "s1": None,
                 "s2": None,
                 "s3": None,
+                "s4": None,
                 }
 
         self.telnet_liquidsoap = TelnetLiquidsoap(telnet_lock, \

python_apps/pypo/pyponotify.py

@@ -83,12 +83,12 @@ class Notify:
 
     # @pram time: time that LS started
     def notify_liquidsoap_status(self, msg, stream_id, time):
-        logger.debug('#################################################')
-        logger.debug('# Calling server to update liquidsoap status    #')
-        logger.debug('#################################################')
-        logger.debug('msg = ' + str(msg))
+        logger.info('#################################################')
+        logger.info('# Calling server to update liquidsoap status    #')
+        logger.info('#################################################')
+        logger.info('msg = ' + str(msg))
         response = self.api_client.notify_liquidsoap_status(msg, stream_id, time)
-        logger.debug("Response: " + json.dumps(response))
+        logger.info("Response: " + json.dumps(response))
 
     def notify_source_status(self, source_name, status):
         logger.debug('#################################################')