Updated to support DVAP and DVRPTR too by parsing qn.cfg as appropriate.

8 years ago · ced530b50a
parent 9982f4889b
commit ced530b50a
2 changed files with 18 additions and 5 deletions
--- a/2
+++ b/2
@ -164,6 +164,8 @@ installmmdvm :
 	systemctl start mmdvm.service

 installdash :
+	/usr/bin/apt-get -y install python3-pip
+	/usr/bin/pip3 install libconf
 	/bin/cp -f dash/qng-dash.sh $(BINDIR)
 	/bin/cp -f dash/qng-info.py $(BINDIR)
 	/bin/cp -f dash/qngdash $(CRONDIR)
--- a/dash/qng-info.py
+++ b/dash/qng-info.py
@ -5,6 +5,7 @@ import datetime
 import socket
 import csv
 import configparser
+import libconf

 # HTML to send to browser
 html = """<!DOCTYPE html>
@ -64,17 +65,27 @@ def get_data():
        readCSV = csv.reader(csvfile, delimiter=',')
        for row in readCSV:
          reflector = row[1] + row[2]
-    config = configparser.ConfigParser()
-    config.read('/usr/local/etc/MMDVM.qn')
-    cs = config['General']['callsign']
-    rawfreq = config['Info']['txfrequency']
-    freq = float(rawfreq)/1000000
+    with open('/usr/local/etc/qn.cfg') as f:
+        config = libconf.load(f)
+    cs = config.ircddb.login
+    for key in config.module:
+        if config['module'][key]['type'] == 'mmdvm':
+            freq = get_MMDVM()
+        else:
+            freq = config['module'][key]['frequency']
    data.append(cs)
    data.append(freq)
    data.append(str(get_ip()))
    data.append(reflector)
    return data

+def get_MMDVM():
+    MMDVM_config = configparser.ConfigParser()
+    MMDVM_config.read('/usr/local/etc/MMDVM.qn')
+    rawfreq = config['Info']['txfrequency']
+    freq = float(rawfreq)/1000000
+    return freq
+
 def run():
  print('starting server...')