From 97534cba897a7f9b529375722f91705ea6dcb9a8 Mon Sep 17 00:00:00 2001 From: Agnibho Mondal Date: Tue, 5 Sep 2023 22:07:26 +0530 Subject: [PATCH] Rearranged directories --- config.py | 19 ++++++++++++++----- config/config.json | 8 +++++--- data/{ => document}/.gitignore | 0 {config => data/prescriber}/prescriber.json | 0 {preset => data/preset}/.gitignore | 0 .../template}/default/index.html | 0 {template => data/template}/default/style.css | 0 .../prescriber-0.2.schema | 0 .../prescription-0.2.schema | 0 window.py | 8 ++++---- 10 files changed, 23 insertions(+), 12 deletions(-) rename data/{ => document}/.gitignore (100%) rename {config => data/prescriber}/prescriber.json (100%) rename {preset => data/preset}/.gitignore (100%) rename {template => data/template}/default/index.html (100%) rename {template => data/template}/default/style.css (100%) rename schema/prescriber-0.1.schema => resource/prescriber-0.2.schema (100%) rename schema/prescription-0.1.schema => resource/prescription-0.2.schema (100%) diff --git a/config.py b/config.py index c9d14fe..91468f7 100644 --- a/config.py +++ b/config.py @@ -7,6 +7,8 @@ import argparse, json, os +default_config_file=os.path.abspath(os.path.join("config", "config.json")) + parser = argparse.ArgumentParser() parser.add_argument("filename", nargs="?") parser.add_argument("-c", "--config") @@ -14,18 +16,20 @@ parser.add_argument("-p", "--prescriber") args = parser.parse_args() if(args.config is None): - config_file=os.path.join("config", "config.json") + config_file=default_config_file else: config_file=args.config default = { - "data_directory": "data", "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", - "prescriber": "prescriber.json" + "preset_newline": "True" } with open(config_file) as conf: @@ -33,9 +37,14 @@ with open(config_file) as conf: config = default | read config["filename"]=args.filename +config["data_directory"]=os.path.abspath(config["data_directory"]) +config["document_directory"]=os.path.join(config["data_directory"], config["document_directory"]) +config["template_directory"]=os.path.join(config["data_directory"], config["template_directory"]) config["template"]=os.path.join(config["template_directory"], config["template"]) if(args.prescriber is None): - config["prescriber"]=os.path.join(config["config_directory"], config["prescriber"]) + config["prescriber_directory"]=os.path.join(config["data_directory"], config["prescriber_directory"]) + config["prescriber"]=os.path.join(config["prescriber_directory"], config["prescriber"]) + 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) diff --git a/config/config.json b/config/config.json index fcd2378..c18be77 100644 --- a/config/config.json +++ b/config/config.json @@ -1,9 +1,11 @@ { - "data_directory": "data", "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", - "prescriber": "prescriber.json" + "preset_newline": "True" } diff --git a/data/.gitignore b/data/document/.gitignore similarity index 100% rename from data/.gitignore rename to data/document/.gitignore diff --git a/config/prescriber.json b/data/prescriber/prescriber.json similarity index 100% rename from config/prescriber.json rename to data/prescriber/prescriber.json diff --git a/preset/.gitignore b/data/preset/.gitignore similarity index 100% rename from preset/.gitignore rename to data/preset/.gitignore diff --git a/template/default/index.html b/data/template/default/index.html similarity index 100% rename from template/default/index.html rename to data/template/default/index.html diff --git a/template/default/style.css b/data/template/default/style.css similarity index 100% rename from template/default/style.css rename to data/template/default/style.css diff --git a/schema/prescriber-0.1.schema b/resource/prescriber-0.2.schema similarity index 100% rename from schema/prescriber-0.1.schema rename to resource/prescriber-0.2.schema diff --git a/schema/prescription-0.1.schema b/resource/prescription-0.2.schema similarity index 100% rename from schema/prescription-0.1.schema rename to resource/prescription-0.2.schema diff --git a/window.py b/window.py index 998b17e..eb507b3 100644 --- a/window.py +++ b/window.py @@ -38,7 +38,7 @@ class MainWindow(QMainWindow): def cmd_open(self): try: - self.current_file.set_file(QFileDialog.getOpenFileName(self, "Open File", config["data_directory"], "Prescriptions (*.mpaz);; All Files (*)")[0]) + self.current_file.set_file(QFileDialog.getOpenFileName(self, "Open File", config["document_directory"], "Prescriptions (*.mpaz);; All Files (*)")[0]) self.current_file.open() self.prescription.read_from(os.path.join(self.current_file.directory.name,"prescription.json")) self.load_interface_from_instance() @@ -52,7 +52,7 @@ class MainWindow(QMainWindow): def cmd_save(self, save_as=False): self.update_instance() suggest=self.prescription.id if(self.prescription.id) else self.prescription.name - suggest=os.path.abspath(os.path.join(config["data_directory"], suggest)+".mpaz") + suggest=os.path.abspath(os.path.join(config["document_directory"], suggest)+".mpaz") if(save_as or not self.unchanged_state or QMessageBox.StandardButton.Yes==QMessageBox.question(self,"Confirm change", "Modify the original file?")): try: if not os.path.exists(self.current_file.file): @@ -72,7 +72,7 @@ class MainWindow(QMainWindow): def cmd_save_as(self): suggest=self.prescription.id if(self.prescription.id) else self.prescription.name - suggest=os.path.abspath(os.path.join(config["data_directory"], suggest)+".mpaz") + suggest=os.path.abspath(os.path.join(config["document_directory"], suggest)+".mpaz") self.current_file.set_file(QFileDialog.getSaveFileName(self, "Save File", suggest, "Prescriptions (*.mpaz);; All Files (*)")[0]) Path(self.current_file.file).touch() self.cmd_save(save_as=True) @@ -248,7 +248,7 @@ class MainWindow(QMainWindow): def add_attachment(self): try: - new=QFileDialog.getOpenFileName(self, "Open File", config["data_directory"], "PDF (*.pdf);; Images (*.jpg, *.jpeg, *.png, *.gif);; All Files (*)")[0] + new=QFileDialog.getOpenFileName(self, "Open File", config["document_directory"], "PDF (*.pdf);; Images (*.jpg, *.jpeg, *.png, *.gif);; All Files (*)")[0] if new: self.input_attachment.addItem(new) except Exception as e: -- 2.39.2