Merge pull request #1 from SoftwareQuTech/Develop

Updated how the paths to the CQC and APP files are read

Author: Axel Dahlberg

cqc/pythonLib.py

@@ -35,7 +35,7 @@
 import socket
 import warnings
 
-from cqc.settings import CQC_CONF_CQC_FILE, CQC_CONF_APP_FILE
+from cqc.settings import get_cqc_file, get_app_file
 from cqc.cqcHeader import (
     Header,
     CQCCmdHeader,
@@ -237,7 +237,7 @@ def __init__(self, name, socket_address=None, cqcFile=None, appFile=None, appID=
         if socket_address is None:
             # This file defines the network of CQC servers interfacing to virtual quantum nodes
             if cqcFile is None:
-                self.cqcFile = CQC_CONF_CQC_FILE
+                self.cqcFile = get_cqc_file()
             else:
                 self.cqcFile = cqcFile
 
@@ -290,7 +290,7 @@ def __init__(self, name, socket_address=None, cqcFile=None, appFile=None, appID=
 
                 # This file defines the application network
         if appFile is None:
-            self.appFile = CQC_CONF_APP_FILE
+            self.appFile = get_app_file()
         else:
             self.appFile = appFile
 

cqc/settings.py

@@ -54,15 +54,29 @@ def set_config(config):
     with open(settings_file, 'w') as f:
         config.write(f)
 
+def get_cqc_file():
+    """
+    Gets the path to the CQC file used
+    :return: str
+    """
+    config = get_config()
+    try:
+        file_path = config['FILEPATHS']['cqc_file']
+    except KeyError:
+        return None
+
+    return file_path
 
-############################
-# CONFIGURATION FILE FOR CQC
-############################
-config = get_config()
 
-# The path to the file specifying the addresses and ports of the CQC nodes
-# and the APP nodes.
-# If using SimulaQron, this will be set by SimulaQron.
-# Otherwise, specify the path to the files in the file settings.ini
-CQC_CONF_CQC_FILE = config['FILEPATHS']['cqc_file']
-CQC_CONF_APP_FILE = config['FILEPATHS']['app_file']
+def get_app_file():
+    """
+    Gets the path to the APP file used
+    :return: str
+    """
+    config = get_config()
+    try:
+        file_path = config['FILEPATHS']['app_file']
+    except KeyError:
+        return None
+
+    return file_path