From 57833a694220c28ecf2c8457ec1fad28a6a467a7 Mon Sep 17 00:00:00 2001
From: Agnibho Mondal <mondal@agnibho.com>
Date: Fri, 15 Sep 2023 00:43:15 +0530
Subject: [PATCH] Changed default config location

---
 config.py                    | 7 +++----
 {config => data}/config.json | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename {config => data}/config.json (84%)

diff --git a/config.py b/config.py
index 1396588..9921dae 100644
--- 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/data/config.json
similarity index 84%
rename from config/config.json
rename to data/config.json
index 65d9130..e591a53 100644
--- a/config/config.json
+++ b/data/config.json
@@ -1,6 +1,5 @@
 {
-    "config_directory": "config",
-    "data_directory": "data",
+    "data_directory": "~/MedScript",
     "document_directory": "document",
     "prescriber_directory": "prescriber",
     "prescriber": "prescriber",
@@ -9,6 +8,7 @@
     "preset_directory": "preset",
     "preset_newline": true,
     "preset_delimiter": ",",
+    "markdown": false,
     "smime": false,
     "root_bundle": "",
     "certificate": "",
-- 
2.39.2