FreeDV
/
FreeDATA
mirror of https://github.com/DJ2LS/FreeDATA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve config write method. Add tests.

pull/550/head
Pedro 2023-11-06 19:04:35 +01:00
parent 13ad59ae6e
commit 24cfc8f691
4 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
modem/config.py
View File

@ -1,5 +1,6 @@
import configparser
import structlog
import json
class CONFIG:
"""
@ -56,6 +57,18 @@ class CONFIG:
raise Exception("'%s' needs to be a list" % setting)
# TODO finish this for all config settings!
# Handle special setting data type conversion
# is_writing means data from a dict being writen to the config file
# if False, it means the opposite direction
def handle_setting(self, section, setting, value, is_writing = False):
if (section == 'STATION' and setting == 'ssid_list'):
if (is_writing):
return json.dumps(value)
else:
return json.loads(value)
else:
return value
# Sets and writes config data from a dict containing data settings
def write(self, data):
@ -68,83 +81,35 @@ class CONFIG:
self.config[section] = {}
for setting in data[section]:
self.config[section][setting] = data[section][setting]
self.config[section][setting] = self.handle_setting(
section, setting, data[section][setting], True)
# Write config data to file
try:
with open(self.config_name, 'w') as configfile:
self.config.write(configfile)
return self.config
return self.read()
except Exception as conferror:
self.log.error("[CFG] reading logfile", e=conferror)
return False
# TODO remove this method when ready
def write_entire_config(self, data):
"""
write entire config
"""
self.config['NETWORK'] = {'#Network settings': None,
'ModemPORT': data[50]
}
self.config['STATION'] = {'#Station settings': None,
'mycall': data[1],
'mygrid': data[2],
'ssid_list': list(data[18])# [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] # list(data[18])
}
self.config['AUDIO'] = {'#Audio settings': None,
'rx': data[3],
'tx': data[4],
'txaudiolevel': data[14],
'rxaudiolevel': data[25],
'auto_tune': data[19]
}
self.config['RADIO'] = {'#Radio settings': None,
'radiocontrol': data[5],
'rigctld_ip': data[6],
'rigctld_port': data[7]
}
self.config['Modem'] = {'#Modem settings': None,
'scatter': data[8],
'fft': data[9],
'narrowband': data[10],
'fmin': data[11],
'fmax': data[12],
'qrv': data[15],
'rx_buffer_size': data[16],
'explorer': data[17],
'stats': data[19],
'fsk': data[13],
'tx_delay': data[21],
'transmit_morse_identifier' : data[26]
}
self.config['TCI'] = {'#TCI settings': None,
'ip': data[22],
'port': data[23]
}
self.config['MESH'] = {'#Mesh settings': None,
'enable_protocol': data[24]
}
try:
with open(self.config_name, 'w') as configfile:
self.config.write(configfile)
except Exception as conferror:
self.log.error("[CFG] reading logfile", e=conferror)
def read(self):
"""
read config file
"""
if not self.config_exists():
return False
# at first just copy the config as read from file
result = {s:dict(self.config.items(s)) for s in self.config.sections()}
return {s:dict(self.config.items(s)) for s in self.config.sections()}
# handle the special settings (like 'ssid_list')
for section in result:
for setting in result[section]:
result[section][setting] = self.handle_setting(
section, setting, result[section][setting], False)
return result
def get(self, area, key, default):
"""

3
modem/server.py
View File

@ -46,6 +46,7 @@ def index():
@app.route('/config', methods=['GET', 'POST'])
def config():
if request.method == 'POST':
print(request.form)
new_config = json.loads(request.form['config'])
set_config = config.write(new_config)
if not set_config:
@ -62,5 +63,3 @@ def echo(sock):
while True:
data = sock.receive()
sock.send(data)

36
tests/test_config.py
View File

@ -3,6 +3,10 @@ from modem import config
class TestConfigMethods(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.config = config.CONFIG('modem/config.ini')
def test_config_exists(self):
c = config.CONFIG('modem/config.ini')
self.assertTrue(c.config_exists())
@ -10,15 +14,41 @@ class TestConfigMethods(unittest.TestCase):
c = config.CONFIG('modem/nonexistant.ini')
self.assertFalse(c.config_exists())
def test_read(self):
data = self.config.read()
self.assertIsInstance(data, dict)
self.assertIn('NETWORK', data.keys())
self.assertIn('STATION', data.keys())
self.assertIn('AUDIO', data.keys())
self.assertIn('RADIO', data.keys())
def test_write(self):
c = self.config.read()
oldcall = c['STATION']['mycall']
newcall = 'T1CALL'
self.assertNotEqual(oldcall, newcall)
c['STATION']['mycall'] = newcall
new_conf = self.config.write(c)
self.assertEqual(new_conf['STATION']['mycall'], newcall)
c = self.config.read()
self.assertEqual(c['STATION']['mycall'], newcall)
# put it back as it was
c['STATION']['mycall'] = oldcall
last_conf = self.config.write(c)
self.assertEqual(last_conf['STATION']['mycall'], oldcall)
def test_validate_data(self):
c = config.CONFIG('modem/config.ini')
data = {'NETWORK': {'modemport': "abc"}}
with self.assertRaises(ValueError):
c.validate(data)
self.config.validate(data)
data = {'NETWORK': {'modemport': "3000"}}
self.assertIsNone(c.validate(data))
self.assertIsNone(self.config.validate(data))
if __name__ == '__main__':

12
tests/test_server.py
View File

@ -31,7 +31,7 @@ class TestIntegration(unittest.TestCase):
data = r.json()
self.assertEqual(data['data']['api_version'], 1)
def test_config(self):
def test_config_get(self):
r = requests.get(self.url + '/config')
self.assertEqual(r.status_code, 200)
@ -47,6 +47,16 @@ class TestIntegration(unittest.TestCase):
self.assertIn('AUDIO', config)
self.assertIn('Modem', config)
""" def test_config_post(self):
config = {'NETWORK': {'modemport' : 3050}}
r = requests.post(self.url + '/config', data=config)
self.assertEqual(r.status_code, 200)
r = requests.get(self.url + '/config')
self.assertEqual(r.status_code, 200)
payload = r.json()
config = payload['data']
self.assertEqual(config['NETWORK']['modemport'], 3050)
"""
if __name__ == '__main__':
unittest.main()