Added multi layer directory upload support

Co-authored-by: LarsVomMars <lars@kroenner.eu>

2 files changed, 11 insertions, 9 deletions

diff --git a/src/main/kotlin/DatabaseController.kt b/src/main/kotlin/DatabaseController.kt
index bdbdc18..255b6e4 100644
--- a/src/main/kotlin/DatabaseController.kt
+++ b/src/main/kotlin/DatabaseController.kt
@@ -326,8 +326,7 @@ class DatabaseController {
                     false
                 }
             } catch (err: Exception) {
-                if (!isDirectoryBool) error(err)
-                true // Ugly solution
+                error(err)
             }
         }
     }
diff --git a/src/main/kotlin/FileController.kt b/src/main/kotlin/FileController.kt
index d62b4b4..070679f 100644
--- a/src/main/kotlin/FileController.kt
+++ b/src/main/kotlin/FileController.kt
@@ -98,20 +98,22 @@ class FileController {
      * Saves multipart media data into requested directory
      */
     fun upload(ctx: Context) {
-        val firstParam = ctx.splat(0) ?: ""
-        ctx.uploadedFiles("file").forEach { (_, content, name, _) ->
-            val path = if (firstParam.isEmpty()) name else "$firstParam/$name"
 
+        ctx.uploadedFiles("file").forEach { (_, content, name, _) ->
+            val fixedName = name.replace(":", "/") // "fix" for Firefox..
             val userId = userHandler.getVerifiedUserId(ctx)
             var addPath = ""
-            path.split("/").forEach {
+
+            // Directory sharing
+            fixedName.split("/").forEach {
                 addPath += "$it/"
-                if (!path.endsWith(it)) databaseController.addFile(addPath, userId, true)
+                if (!fixedName.endsWith(it)) databaseController.addFile(addPath, userId, true)
             }
-            if (databaseController.addFile(path, userId)) {
+
+            if (databaseController.addFile(fixedName, userId)) {
                 FileUtil.streamToFile(
                     content,
-                    "$fileHome/$userId/$path"
+                    "$fileHome/$userId/$fixedName"
                 )
             }
         }
@@ -186,6 +188,7 @@ class FileController {
             }
         } else {
             log.info("Unknown file!")
+            throw NotFoundResponse("Shared file couldn't be found.")
         }
     }