Changed default config location

diff --git a/config.py b/config.py
index 139658802006dbdefbd64c73da4f64e63115f38c..9921dae68d9f7b11a653218fc0eafb880067dcec 100644 (file)
--- a/config.py
+++ b/config.py
@@ -7,7 +7,7 @@
 
 import argparse, json, os, sys, shutil
 
-default_config_file=os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "config", "config.json"))
+default_config_file=os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), "data", "config.json"))
 
 real_dir=os.path.dirname(os.path.realpath(sys.argv[0]))
 
@@ -23,7 +23,6 @@ else:
     config_file=args.config
 
 default = {
-        "config_directory": "config",
         "data_directory": "data",
         "document_directory": "document",
         "prescriber_directory": "prescriber",
@@ -57,11 +56,11 @@ if(args.prescriber is None):
     if (not config["prescriber"].endswith(".json")): config["prescriber"]=config["prescriber"]+".json"
 else:
     if(not os.path.isabs(args.prescriber)):
-        args.prescriber=os.path.join(config["config_directory"], args.prescriber)
+        args.prescriber=os.path.join(config["prescriber_directory"], args.prescriber)
     if(os.path.isfile(args.prescriber)):
         config["prescriber"]=args.prescriber
     else:
-        config["prescriber"]=os.path.join(config["config_directory"], config["prescriber"])
+        config["prescriber"]=os.path.join(config["prescriber_directory"], config["prescriber"])
         print("File "+args.prescriber+" not found.")
 
 os.makedirs(config["data_directory"], exist_ok=True)

diff --git a/config/config.json b/config/config.json
deleted file mode 100644 (file)
index 65d9130..0000000
--- a/config/config.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "config_directory": "config",
-    "data_directory": "data",
-    "document_directory": "document",
-    "prescriber_directory": "prescriber",
-    "prescriber": "prescriber",
-    "template_directory": "template",
-    "template": "default",
-    "preset_directory": "preset",
-    "preset_newline": true,
-    "preset_delimiter": ",",
-    "smime": false,
-    "root_bundle": "",
-    "certificate": "",
-    "private_key": ""
-}

diff --git a/data/config.json b/data/config.json
new file mode 100644 (file)
index 0000000..e591a53
--- /dev/null
+++ b/data/config.json
@@ -0,0 +1,16 @@
+{
+    "data_directory": "~/MedScript",
+    "document_directory": "document",
+    "prescriber_directory": "prescriber",
+    "prescriber": "prescriber",
+    "template_directory": "template",
+    "template": "default",
+    "preset_directory": "preset",
+    "preset_newline": true,
+    "preset_delimiter": ",",
+    "markdown": false,
+    "smime": false,
+    "root_bundle": "",
+    "certificate": "",
+    "private_key": ""
+}