diff options
| author | Marvin Borner | 2019-05-04 18:14:07 +0200 |
|---|---|---|
| committer | Marvin Borner | 2019-05-04 18:14:07 +0200 |
| commit | 04d0cb43f6a3ede1a61309cf17d78d189caa9dd4 (patch) | |
| tree | 43a1702d6cd3f137efe0446dba6475a46e9e7993 /src/main/kotlin/DatabaseController.kt | |
| parent | db002a20f1a2cd0c9b72546936ca5fae089b82c2 (diff) | |
General code cleanup
Co-authored-by: LarsVomMars <lars@kroenner.eu>
Diffstat (limited to 'src/main/kotlin/DatabaseController.kt')
| -rw-r--r-- | src/main/kotlin/DatabaseController.kt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/kotlin/DatabaseController.kt b/src/main/kotlin/DatabaseController.kt index d68bea0..8c0550a 100644 --- a/src/main/kotlin/DatabaseController.kt +++ b/src/main/kotlin/DatabaseController.kt @@ -127,8 +127,7 @@ class DatabaseController(dbFileLocation: String = "main.db") { return transaction { try { if (UserData.select { UserData.username eq usernameString }.empty()) { - val username = UserRegistration.select { UserRegistration.username eq usernameString }.map { it[UserRegistration.username] }[0] - username == usernameString + usernameString == UserRegistration.select { UserRegistration.username eq usernameString }.map { it[UserRegistration.username] }[0] } else false } catch (_: Exception) { false @@ -317,9 +316,13 @@ class DatabaseController(dbFileLocation: String = "main.db") { return transaction { try { val fileData = - FileLocation.select { FileLocation.accessId eq accessId }.map { it[FileLocation.path] to it[FileLocation.userId] to it[FileLocation.isShared] }[0] + FileLocation.select { + FileLocation.accessId eq accessId + }.map { it[FileLocation.path] to it[FileLocation.userId] to it[FileLocation.isShared] }[0] if (fileData.second) - FileLocation.select { (FileLocation.path eq "${fileData.first.first}${filename.substring(1)}") and (FileLocation.userId eq fileData.first.second) }.map { it[FileLocation.accessId] }[0] + FileLocation.select { + (FileLocation.path eq "${fileData.first.first}${filename.substring(1)}") and (FileLocation.userId eq fileData.first.second) + }.map { it[FileLocation.accessId] }[0] else "" } catch (_: Exception) { "" |