Switch config file to json

This patch makes configuration parsing easier as well as making the full
configuration available in many subclasses.

1 files changed, 12 insertions, 18 deletions

diff --git a/main.py b/main.py
index e6cacf5..37d623e 100755
--- a/main.py
+++ b/main.py
@@ -8,6 +8,7 @@
 # Free Software Foundation, version 3.
 #
 
+import json
 import subprocess
 from src.ogClient import *
 from src.ogConfig import *
@@ -15,27 +16,20 @@ from signal import signal, SIGPIPE, SIG_DFL
 
 def main():
 	signal(SIGPIPE, SIG_DFL)
-	ogconfig = ogConfig()
-	config_path = f'{ogConfig.OG_PATH}ogclient/cfg/ogclient.cfg'
-	if (not ogconfig.parser_file(config_path)):
-		print ('Error: Parsing configuration file')
+	config_path = f'{ogConfig.OG_PATH}ogclient/cfg/ogclient.json'
+	try:
+		with open(config_path, 'r') as f:
+			CONFIG = json.load(f)
+	except:
+		print('Error: Parsing configuration file')
 		return 0
 
-	ip = ogconfig.get_value_section('opengnsys', 'ip')
-	port = ogconfig.get_value_section('opengnsys', 'port')
-	url = ogconfig.get_value_section('opengnsys', 'url')
-	mode = ogconfig.get_value_section('opengnsys', 'mode')
-	samba_user = ogconfig.get_value_section('samba', 'user')
-	samba_pass = ogconfig.get_value_section('samba', 'pass')
+	MODE = CONFIG['opengnsys']['mode']
+	URL = CONFIG['opengnsys']['url']
+	if MODE == 'linux':
+		proc = subprocess.Popen(["browser", "-qws", URL])
 
-	samba_config = None
-
-	if mode == 'linux':
-		proc = subprocess.Popen(["browser", "-qws", url])
-	elif mode == 'virtual':
-		samba_config = {'user': samba_user, 'pass': samba_pass}
-
-	client = ogClient(ip, int(port), mode, samba_config)
+	client = ogClient(config=CONFIG)
 	client.connect()
 	client.run()