4 files changed, 15 insertions, 12 deletions
diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt
index f081bea..d3f0cd9 100644
--- a/src/main/kotlin/App.kt
+++ b/src/main/kotlin/App.kt
@@ -17,11 +17,9 @@ const val fileHome = "files"
 val databaseController = DatabaseController()
 val userHandler = UserHandler()
 val fileController = FileController()
-val log = Logger.getLogger("App.kt")
+private val log = Logger.getLogger("App.kt")
 
 fun main() {
-    log.warning(File(".").absolutePath)
-
     val app = Javalin.create().apply {
         enableStaticFiles("${File(".").absolutePath}/src/main/resources/", Location.EXTERNAL)
         port(7000)
diff --git a/src/main/kotlin/DatabaseController.kt b/src/main/kotlin/DatabaseController.kt
index 77f2e70..d65e800 100644
--- a/src/main/kotlin/DatabaseController.kt
+++ b/src/main/kotlin/DatabaseController.kt
@@ -222,7 +222,7 @@ class DatabaseController(dbFileLocation: String = "main.db") {
                 }
                 true
             } catch (err: org.jetbrains.exposed.exceptions.ExposedSQLException) {
-                log.warning("File already exists!")
+                if (!isDirectoryBool) log.warning("File already exists!")
                 false
             }
         }
@@ -235,7 +235,8 @@ class DatabaseController(dbFileLocation: String = "main.db") {
     fun deleteFile(fileLocation: String, userId: Int) {
         transaction {
             try {
-                FileLocation.deleteWhere { (FileLocation.path eq fileLocation) and (FileLocation.userId eq userId) }
+                // TODO: Think of new solution for directory deleting (instead of wildcards)
+                FileLocation.deleteWhere { (FileLocation.path like "$fileLocation%") and (FileLocation.userId eq userId) }
             } catch (_: org.jetbrains.exposed.exceptions.ExposedSQLException) {
                 log.warning("File does not exist!")
             }
@@ -272,8 +273,7 @@ class DatabaseController(dbFileLocation: String = "main.db") {
                     val isDir =
                         FileLocation.select { FileLocation.accessId eq accessId }.map { it[FileLocation.isDirectory] }[0]
                     ReturnFileData(userId, fileLocation, isDir)
-                }
-                else
+                } else
                     ReturnFileData(-1, "", false)
             } catch (_: org.jetbrains.exposed.exceptions.ExposedSQLException) {
                 log.warning("File does not exist!")
diff --git a/src/main/kotlin/FileController.kt b/src/main/kotlin/FileController.kt
index d8f7dfb..06c1402 100644
--- a/src/main/kotlin/FileController.kt
+++ b/src/main/kotlin/FileController.kt
@@ -8,8 +8,11 @@ import java.io.*
 import java.nio.charset.*
 import java.nio.file.*
 import java.text.*
+import java.util.logging.*
 
 class FileController {
+    private val log = Logger.getLogger(this.javaClass.name)
+
     /**
      * Crawls the requested file and either renders the directory view or the file view
      */
@@ -113,16 +116,16 @@ class FileController {
     fun upload(ctx: Context) {
         ctx.uploadedFiles("file").forEach { (_, content, name, _) ->
             val path = "${ctx.splats()[0]}/$name"
-            val uid = userHandler.getVerifiedUserId(ctx)
+            val userId = userHandler.getVerifiedUserId(ctx)
             var addPath = ""
             path.split("/").forEach {
                 addPath += "$it/"
-                if (!path.endsWith(it)) databaseController.addFile(addPath, uid, true)
+                if (!path.endsWith(it)) databaseController.addFile(addPath, userId, true)
             }
-            if (databaseController.addFile(path, uid)) {
+            if (databaseController.addFile(path, userId)) {
                 FileUtil.streamToFile(
                     content,
-                    "$fileHome/$uid/$path"
+                    "$fileHome/$userId/$path"
                 )
             }
         }
@@ -144,7 +147,7 @@ class FileController {
         if (userId > 0) {
             val path = ctx.splats()[0]
             File("$fileHome/$userId/$path").delete()  // File.deleteRecursively() kind of "crashes" server but deletes folder :'(
-            databaseController.deleteFile(path, userId)
+            databaseController.deleteFile(path, userId)  // kind of works for deleting directories
         }
     }
 
diff --git a/src/main/kotlin/UserHandler.kt b/src/main/kotlin/UserHandler.kt
index cc9a768..1309348 100644
--- a/src/main/kotlin/UserHandler.kt
+++ b/src/main/kotlin/UserHandler.kt
@@ -3,9 +3,11 @@ package space.anity
 import io.javalin.*
 import io.javalin.rendering.template.*
 import org.joda.time.*
+import java.util.logging.*
 import kotlin.math.*
 
 class UserHandler {
+    private val log = Logger.getLogger(this.javaClass.name)
     /**
      * Checks and verifies users credentials and logs the user in
      */