Move the UPLOAD_DIRECTORY under the SCRATCH_DIRECTORY by default.

If the UPLOAD_DIRECTORY is not specified in the configuration file(s),
then, by default, have it under the SCRATCH_DIRECTORY.

1 files changed, 15 insertions, 2 deletions

diff --git a/uploader/__init__.py b/uploader/__init__.py
index a28ed8d..32eabba 100644
--- a/uploader/__init__.py
+++ b/uploader/__init__.py
@@ -78,9 +78,22 @@ def __setup_scratch_directory__(app: Flask) -> Flask:
         app.config["SCRATCH_DIRECTORY"]).absolute()
     return app
 
-def update_unspecified_defaults(app: Flask):
+def __setup_upload_directory__(app: Flask) -> Flask:
+    if app.config.get("UPLOAD_DIRECTORY", "").strip() == "":
+        app.config["UPLOAD_DIRECTORY"] = app.config[
+            "SCRATCH_DIRECTORY"].joinpath("uploads")
+    else:
+        app.config["UPLOAD_DIRECTORY"] = Path(
+            app.config["UPLOAD_DIRECTORY"].strip()).absolute()
+
+    return app
+
+
+def update_unspecified_defaults(app: Flask) -> Flask:
     """Setup the defaults for necessary configurations that do not have values specified for them."""
-    __setup_scratch_directory__(app)
+    return __setup_upload_directory__(__setup_scratch_directory__(app))
+
+
 def create_app(config: Optional[dict] = None):
     """The application factory.