From 5cbb9d1ffe6ad4b7d89c0b189a7821d1005bbdda Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 16 May 2019 18:07:53 +0200 Subject: Fixed many issues with directory uploading and sharing Co-authored-by: LarsVomMars --- src/main/kotlin/App.kt | 5 ++++ src/main/kotlin/DatabaseController.kt | 2 +- src/main/kotlin/FileController.kt | 45 ++++++++++++++++++++++++------ src/main/resources/css/files.css | 6 ++++ src/main/resources/js/files.js | 28 +++++++++++++++---- src/main/resources/views/files.rocker.html | 12 ++++---- 6 files changed, 77 insertions(+), 21 deletions(-) (limited to 'src/main') diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt index 3607702..12b70db 100644 --- a/src/main/kotlin/App.kt +++ b/src/main/kotlin/App.kt @@ -146,6 +146,11 @@ fun main(args: Array) { */ post("/upload/*", fileController::upload, roles(Roles.USER)) + /** + * Indexes every file of the user into the database + */ + get("/index", fileController::indexAll, roles(Roles.USER)) + /** * Deletes file */ diff --git a/src/main/kotlin/DatabaseController.kt b/src/main/kotlin/DatabaseController.kt index 255b6e4..481d23b 100644 --- a/src/main/kotlin/DatabaseController.kt +++ b/src/main/kotlin/DatabaseController.kt @@ -322,7 +322,7 @@ class DatabaseController { } true } else { - if (!isDirectoryBool) log.warning("File already exists!") + if (!isDirectoryBool && debug) log.warning("File already exists!") false } } catch (err: Exception) { diff --git a/src/main/kotlin/FileController.kt b/src/main/kotlin/FileController.kt index 070679f..6e13f87 100644 --- a/src/main/kotlin/FileController.kt +++ b/src/main/kotlin/FileController.kt @@ -98,13 +98,11 @@ class FileController { * Saves multipart media data into requested directory */ fun upload(ctx: Context) { - ctx.uploadedFiles("file").forEach { (_, content, name, _) -> val fixedName = name.replace(":", "/") // "fix" for Firefox.. val userId = userHandler.getVerifiedUserId(ctx) var addPath = "" - // Directory sharing fixedName.split("/").forEach { addPath += "$it/" if (!fixedName.endsWith(it)) databaseController.addFile(addPath, userId, true) @@ -117,25 +115,53 @@ class FileController { ) } } + + ctx.json("success") } - /* + /** + * Re-indexes every file in the users directory + */ fun indexAll(ctx: Context) { - Files.list(Paths.get("$fileHome/${getVerifiedUserId(ctx)}").forEach { - // TODO: Add file indexing function + val userId = userHandler.getVerifiedUserId(ctx) + + fun recursiveIndex(filePath: String = "") { + Files.list(Paths.get("$fileHome/$userId$filePath")).forEach { + val filename = it.toString().drop("$fileHome/$userId".length + 1) + + if (it.toFile().isDirectory) { + databaseController.addFile("$filename/", userId, true) + recursiveIndex("/$filename") + } else databaseController.addFile(filename, userId, false) + } } + + recursiveIndex() } - */ /** * Deletes the requested file */ - fun delete(ctx: Context) { // TODO: Fix deleting of directories + fun delete(ctx: Context) { val userId = userHandler.getVerifiedUserId(ctx) if (userId > 0) { val path = ctx.splat(0) ?: "" - File("$fileHome/$userId/$path").delete() // File.deleteRecursively() kind of "crashes" server but deletes folder :'( - databaseController.deleteFile(path, userId) // kind of works for deleting directories + val file = File("$fileHome/$userId/$path") + + fun deleteDirectory(recursiveFile: File) { + val fileList = recursiveFile.listFiles() + if (fileList != null) { + for (subFile in fileList) { + deleteDirectory(subFile) + } + } + recursiveFile.delete() + } + + if (file.isDirectory) { + deleteDirectory(file) + } else file.delete() + databaseController.deleteFile(path, userId) } } @@ -146,6 +172,7 @@ class FileController { val userId = userHandler.getVerifiedUserId(ctx) val shareType = ctx.queryParam("type").toString() val firstParam = ctx.splat(0) ?: "" + log.info(shareType) if (userId > 0) { val path = "$firstParam${if (shareType == "dir") "/" else ""}" val accessId = databaseController.getAccessId(path, userId) diff --git a/src/main/resources/css/files.css b/src/main/resources/css/files.css index 9037d3a..2b8e510 100644 --- a/src/main/resources/css/files.css +++ b/src/main/resources/css/files.css @@ -12,6 +12,12 @@ color: inherit; } +.progress { + display: none; + color: green; + float: right; +} + table { table-layout: fixed; width: 100%; diff --git a/src/main/resources/js/files.js b/src/main/resources/js/files.js index 00015c4..9c8c135 100644 --- a/src/main/resources/js/files.js +++ b/src/main/resources/js/files.js @@ -43,15 +43,34 @@ drop.addEventListener('drop', e => { setListeners(); iterateFiles(item, files => { + const progress = document.getElementById("progress"); const request = new XMLHttpRequest(); const formData = new FormData(); for (const file of files) formData.append('file', file); + request.upload.onprogress = e => { + if (e.lengthComputable) { + progress.style.display = "block"; + progress.innerText = `Uploading ${files.length} file(s): ${(e.loaded / e.total * 100).toFixed(2)}%`; + } + }; + + request.onreadystatechange = () => { + if (request.readyState === 4) { + if (request.status === 200) { + progress.innerText = "Finished uploading!"; + setTimeout(() => progress.style.display = "none", 3000) + } else { + progress.style.color = "red"; + progress.innerText = "An error occurred :("; + } + } + }; + request.open('POST', `/upload/${path}`.clean(), true); request.send(formData); - }); } @@ -212,16 +231,14 @@ setListeners(); /** * Iterates over files and directories + * TODO: Add empty directory upload support * @param item * @param callback */ -// TODO: Add empty directory upload support -const files = []; - function iterateFiles(item, callback) { + const files = []; console.log(item); (function iterate(subItem) { - console.log(subItem); if (subItem.isDirectory) { const directoryReader = subItem.createReader(); directoryReader.readEntries(entries => { @@ -233,7 +250,6 @@ function iterateFiles(item, callback) { } else subItem.file(file => { const newName = subItem.fullPath.charAt(0) === '/' ? subItem.fullPath.substr(1) : subItem.fullPath; - console.log(newName); files.push(new File([file], newName, { lastModified: file.lastModified, lastModifiedDate: file.lastModifiedDate, diff --git a/src/main/resources/views/files.rocker.html b/src/main/resources/views/files.rocker.html index 2392928..1bdf858 100644 --- a/src/main/resources/views/files.rocker.html +++ b/src/main/resources/views/files.rocker.html @@ -18,25 +18,27 @@ @layout.template(files.size() + " Files", ctx, css, js) -> {

+ @if (!isShared) { Files @if (!path.isEmpty()) { - + } - - @if (!isShared) { @for (int i = 0; i < path.split("/").length - 1; i++) { @path.split("/")[i] - + } @if (path.split("/").length > 0) { - @(path.split("/")[path.split("/").length - 1]) } } else { + + Shared + @(path.split("/")[path.split("/").length - 1]) } +

-- cgit v1.2.3