Implemented downloading and uploading.

oleksii-unnamed · oleksii-unnamed · commit d9c40fd98b4f · 2022-05-30T12:04:30.000+03:00
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/Defaults.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/Defaults.kt
@@ -11,16 +11,14 @@ interface Defaults {
 
     interface Comparison {
         enum class FilesProviderType {
-            LOCAL, GOOGLE, DROPBOX
+            LOCAL
         }
 
         companion object {
-            const val DEFAULT_PRELOAD_RESULT_PAGE_COUNT = 2
             const val DEFAULT_PREVIEW_PAGE_WIDTH = 768
             const val DEFAULT_PREVIEW_PAGE_RATIO = 1.3f
             val DEFAULT_FILES_PROVIDER_TYPE = FilesProviderType.LOCAL
-            val DEFAULT_CACHE_DIRECTORY = System.getProperty("java.io.tmpdir")
-            val DEFAULT_TEMP_DIRECTORY = System.getProperty("java.io.tmpdir")
+            val DEFAULT_TEMP_DIRECTORY: String? = System.getProperty("java.io.tmpdir")
         }
     }
 
@@ -30,16 +28,4 @@ interface Defaults {
             const val DEFAULT_RESULT_DIRECTORY = "ResultFiles"
         }
     }
-
-    interface Google {
-        enum class AccessType {
-            OFFLINE, ONLINE
-        }
-
-        companion object {
-            const val DEFAULT_LOCAL_SERVER_RECEIVER_PORT = 8888
-            val DEFAULT_ACCESS_TYPE = AccessType.OFFLINE
-            const val DEFAULT_CREDENTIALS_PATH = "credentials.json"
-        }
-    }
 }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/Module.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/Module.kt
@@ -26,35 +26,32 @@ fun Application.module() {
         level = Level.DEBUG
         filter { call -> call.request.path().startsWith("/comparison") }
     }
-    install(ContentNegotiation) { gson {
-        serializeNulls()
-    }}
+    install(ContentNegotiation) {
+        gson {
+            serializeNulls()
+        }
+    }
     install(DefaultHeaders) {
         header("X-Engine", "Ktor") // will send this header with each response
     }
     install(StatusPages) {
         generalStatusPages()
         internalStatusPages()
     }
-//    data class MySession(val count: Int = 0)
-//    install(Sessions) {
-//        cookie<MySession>("MY_SESSION") {
-//            cookie.extensions["SameSite"] = "lax"
-//        }
-//    }
-
 
     install(Routing) {
         static("/static") {
             resources("static")
         }
-        homeModule()
-        configModule()
-        treeModule()
-        downloadModule()
-        uploadModule()
-        compareModule()
-        pageModule()
-        descriptionModule()
+        route("/comparison") {
+            homeModule()
+            configModule()
+            treeModule()
+            descriptionModule()
+            compareModule()
+            downloadModule()
+            uploadModule()
+            pageModule()
+        }
     }
 }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/config/ApplicationConfig.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/config/ApplicationConfig.kt
@@ -13,11 +13,10 @@ data class ApplicationConfig(
 
 @kotlinx.serialization.Serializable
 data class Application(
-    private val licensePath: String = "",
-    val hostAddress: String = "",
+    private val licensePath: String = ""
 ) {
-    val licensePathOrNull: String?
-        get() = licensePath.ifBlank { null }
+    val licensePathOrNull: String
+        get() = licensePath.ifBlank { Defaults.Application.DEFAULT_LICENSE_PATH }
 }
 
 @kotlinx.serialization.Serializable
@@ -28,8 +27,7 @@ data class Common(
     val print: Boolean = false,
     val browse: Boolean = false,
     val rewrite: Boolean = false,
-    val enableRightClick: Boolean = false,
-    val sessionTimeout: Int = 0
+    val enableRightClick: Boolean = false
 )
 
 @kotlinx.serialization.Serializable
@@ -49,7 +47,7 @@ data class Comparison(
                 else -> Defaults.Comparison.DEFAULT_FILES_PROVIDER_TYPE
             }
     val tempDirectoryOrDefault: String
-        get() = tempDirectory.ifBlank { Defaults.Comparison.DEFAULT_TEMP_DIRECTORY }
+        get() = tempDirectory.ifBlank { Defaults.Comparison.DEFAULT_TEMP_DIRECTORY } ?: throw IllegalStateException("Can't get temp directory!")
     val previewPageWidthOrDefault: Int
         get() = if (previewPageWidth == 0) Defaults.Comparison.DEFAULT_PREVIEW_PAGE_WIDTH else previewPageWidth
     val previewPageRatioOrDefault: Float
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/di/ModulesInjection.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/di/ModulesInjection.kt
@@ -16,10 +16,7 @@ import com.groupdocs.ui.modules.tree.TreeController
 import com.groupdocs.ui.modules.tree.TreeControllerImpl
 import com.groupdocs.ui.modules.upload.UploadController
 import com.groupdocs.ui.modules.upload.UploadControllerImpl
-import com.groupdocs.ui.usecase.AreFilesSupportedUseCase
-import com.groupdocs.ui.usecase.CompareDocumentsUseCase
-import com.groupdocs.ui.usecase.GetLocalFilesUseCase
-import com.groupdocs.ui.usecase.RetrieveLocalFilePagesStreamUseCase
+import com.groupdocs.ui.usecase.*
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
@@ -40,6 +37,7 @@ object ModulesInjection {
         singleOf(::RetrieveLocalFilePagesStreamUseCase)
         singleOf(::AreFilesSupportedUseCase)
         singleOf(::CompareDocumentsUseCase)
+        singleOf(::SaveStreamToFilesDirectoryUseCase)
     }
     val managerBeans = module {
         singleOf(::PathManagerImpl) { bind<PathManager>() }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/DownloadResponse.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/DownloadResponse.kt
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/UploadResponse.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/UploadResponse.kt
@@ -1,5 +1,5 @@
 package com.groupdocs.ui.model
 
 data class UploadResponse(
-    val id: Int
+    val guid: String
 )
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareModule.kt
@@ -9,10 +9,10 @@ import io.ktor.server.routing.*
 import org.koin.ktor.ext.inject
 
 
-fun Routing.compareModule() {
+fun Route.compareModule() {
     val compareController by inject<CompareController>()
 
-    post("/comparison/compare") {
+    post("/compare") {
         val request = call.receive<CompareRequest>()
         val response = compareController.compare(request)
         call.respond(HttpStatusCode.OK, response)
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/config/ConfigModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/config/ConfigModule.kt
@@ -7,10 +7,10 @@ import io.ktor.server.routing.*
 import org.koin.ktor.ext.inject
 
 
-fun Routing.configModule() {
+fun Route.configModule() {
     val configController by inject<ConfigController>()
 
-    get("/comparison/loadConfig") {
+    get("/loadConfig") {
         val response = configController.config()
         call.respond(HttpStatusCode.OK, response)
     }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/description/DescriptionModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/description/DescriptionModule.kt
@@ -9,10 +9,10 @@ import io.ktor.server.routing.*
 import org.koin.ktor.ext.inject
 
 
-fun Routing.descriptionModule() {
+fun Route.descriptionModule() {
     val descriptionController by inject<DescriptionController>()
 
-    post("/comparison/loadDocumentDescription") {
+    post("/loadDocumentDescription") {
         val request = call.receive<DescriptionRequest>()
         val response = descriptionController.description(request)
         call.respond(HttpStatusCode.OK, response)
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/download/DownloadController.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/download/DownloadController.kt
@@ -1,16 +1,27 @@
 package com.groupdocs.ui.modules.download
 
-import com.groupdocs.ui.model.DownloadResponse
+import com.groupdocs.ui.manager.PathManager
 import com.groupdocs.ui.modules.BaseController
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
+import java.io.OutputStream
+import java.nio.file.Files
 
-class DownloadControllerImpl : BaseController(), DownloadController, KoinComponent {
-    override suspend fun download(): DownloadResponse {
-        return DownloadResponse(123)
+class DownloadControllerImpl(
+    private val pathManager: PathManager
+) : BaseController(), DownloadController, KoinComponent {
+    override suspend fun download(fileName: String,  outputStream: OutputStream) {
+        val resultPath = pathManager.filesDirectory.resolve(fileName).toAbsolutePath().normalize().toString()
+        val resultDocumentPath = pathManager.assertPathIsInsideFilesDirectory(resultPath)
+
+        withContext(Dispatchers.IO) {
+            Files.copy(resultDocumentPath, outputStream)
+        }
     }
 
 }
 
 interface DownloadController {
-    suspend fun download(): DownloadResponse
+    suspend fun download(fileName: String,  outputStream: OutputStream)
 }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/download/DownloadModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/download/DownloadModule.kt
@@ -1,17 +1,38 @@
 package com.groupdocs.ui.modules.download
 
+import com.groupdocs.ui.status.InternalServerException
+import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
+import io.ktor.util.*
 import org.koin.ktor.ext.inject
+import java.nio.file.Paths
 
-
-fun Routing.downloadModule() {
+fun Route.downloadModule() {
     val downloadController by inject<DownloadController>()
 
-    get("/comparison/downloadDocument") {
-        val response = downloadController.download()
-        call.respond(response)
-//        call.respondBytes(HttpStatusCode.OK)
+    get("/downloadDocument/") {
+        call.parameters["guid"]?.let { guid ->
+            val guidAsPath = Paths.get(guid)
+            call.response.headers.apply {
+                append("Content-disposition", "attachment; filename=${guidAsPath.fileName}")
+                append("Content-Description", "File Transfer")
+                append("Content-Transfer-Encoding", "binary")
+                append("Cache-Control", "must-revalidate")
+                append("Pragma", "public")
+            }
+
+            call.respondOutputStream(
+                status = HttpStatusCode.OK,
+                contentType = ContentType.Application.OctetStream,
+                producer = {
+                    downloadController.download(
+                        fileName = guid,
+                        outputStream = this
+                    )
+                }
+            )
+        } ?: throw InternalServerException("Document guid is not provided!")
     }
 }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/home/HomeModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/home/HomeModule.kt
@@ -5,11 +5,13 @@ import io.ktor.server.html.*
 import io.ktor.server.routing.*
 
 
-fun Routing.homeModule() {
-    get("/comparison") {
-        call.respondHtmlTemplate(HomeTemplate()) {
-            pageTitle {
-                +"GroupDocs.Comparison for Java Spring"
+fun Route.homeModule() {
+    route("") {
+        get {
+            call.respondHtmlTemplate(HomeTemplate()) {
+                pageTitle {
+                    +"GroupDocs.Comparison for Java Spring"
+                }
             }
         }
     }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/page/PageModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/page/PageModule.kt
@@ -6,10 +6,10 @@ import io.ktor.server.routing.*
 import org.koin.ktor.ext.inject
 
 
-fun Routing.pageModule() {
+fun Route.pageModule() {
     val pageController by inject<PageController>()
 
-    post("/comparison/loadDocumentPage") {
+    post("/loadDocumentPage") {
         val response = pageController.page()
         call.respond(response)
 //        call.respondBytes(HttpStatusCode.OK)
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/tree/TreeModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/tree/TreeModule.kt
@@ -9,10 +9,10 @@ import io.ktor.server.routing.*
 import org.koin.ktor.ext.inject
 
 
-fun Routing.treeModule() {
+fun Route.treeModule() {
     val treeController by inject<TreeController>()
 
-    post("/comparison/loadFileTree") {
+    post("/loadFileTree") {
         val request = call.receive<TreeRequest>()
         val response = treeController.tree(request)
         call.respond(HttpStatusCode.OK, response)
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/upload/UploadController.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/upload/UploadController.kt
@@ -2,15 +2,36 @@ package com.groupdocs.ui.modules.upload
 
 import com.groupdocs.ui.model.UploadResponse
 import com.groupdocs.ui.modules.BaseController
+import com.groupdocs.ui.usecase.SaveStreamToFilesDirectoryUseCase
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
+import java.io.BufferedInputStream
+import java.net.URL
+import java.nio.file.Paths
 
-class UploadControllerImpl : BaseController(), UploadController, KoinComponent {
-    override suspend fun upload(): UploadResponse {
-        return UploadResponse(123)
+class UploadControllerImpl(
+    private val saveStreamToFilesDirectory: SaveStreamToFilesDirectoryUseCase
+) : BaseController(), UploadController, KoinComponent {
+    override suspend fun uploadDisk(fileName: String, inputStream: BufferedInputStream, rewrite: Boolean): UploadResponse {
+        saveStreamToFilesDirectory(fileName, inputStream, rewrite)
+        return UploadResponse(fileName)
     }
 
+    override suspend fun uploadUrl(fileUrl: String, rewrite: Boolean): UploadResponse {
+        val url = URL(fileUrl)
+        val fileName = Paths.get(url.path).fileName.toString()
+
+        withContext(Dispatchers.IO) {
+            url.openStream().use { inputStream ->
+                saveStreamToFilesDirectory(fileName, inputStream, rewrite)
+            }
+        }
+        return UploadResponse(fileName)
+    }
 }
 
 interface UploadController {
-    suspend fun upload(): UploadResponse
+    suspend fun uploadDisk(fileName: String, inputStream: BufferedInputStream, rewrite: Boolean): UploadResponse
+    suspend fun uploadUrl(fileUrl: String, rewrite: Boolean): UploadResponse
 }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/upload/UploadModule.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/upload/UploadModule.kt
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/usecase/SaveStreamToFilesDirectoryUseCase.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/usecase/SaveStreamToFilesDirectoryUseCase.kt
diff --git a/Demos/Ktor/comparison-ktor/src/main/resources/application.conf b/Demos/Ktor/comparison-ktor/src/main/resources/application.conf

Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,14 @@ interface Defaults {`
`11`	`11`
`12`	`12`	`interface Comparison {`
`13`	`13`	`enum class FilesProviderType {`
`14`		`- LOCAL, GOOGLE, DROPBOX`
	`14`	`+ LOCAL`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`companion object {`
`18`		`- const val DEFAULT_PRELOAD_RESULT_PAGE_COUNT = 2`
`19`	`18`	`const val DEFAULT_PREVIEW_PAGE_WIDTH = 768`
`20`	`19`	`const val DEFAULT_PREVIEW_PAGE_RATIO = 1.3f`
`21`	`20`	`val DEFAULT_FILES_PROVIDER_TYPE = FilesProviderType.LOCAL`
`22`		`- val DEFAULT_CACHE_DIRECTORY = System.getProperty("java.io.tmpdir")`
`23`		`- val DEFAULT_TEMP_DIRECTORY = System.getProperty("java.io.tmpdir")`
	`21`	`+ val DEFAULT_TEMP_DIRECTORY: String? = System.getProperty("java.io.tmpdir")`
`24`	`22`	`}`
`25`	`23`	`}`
`26`	`24`
`@@ -30,16 +28,4 @@ interface Defaults {`
`30`	`28`	`const val DEFAULT_RESULT_DIRECTORY = "ResultFiles"`
`31`	`29`	`}`
`32`	`30`	`}`
`33`		`-`
`34`		`- interface Google {`
`35`		`- enum class AccessType {`
`36`		`- OFFLINE, ONLINE`
`37`		`- }`
`38`		`-`
`39`		`- companion object {`
`40`		`- const val DEFAULT_LOCAL_SERVER_RECEIVER_PORT = 8888`
`41`		`- val DEFAULT_ACCESS_TYPE = AccessType.OFFLINE`
`42`		`- const val DEFAULT_CREDENTIALS_PATH = "credentials.json"`
`43`		`- }`
`44`		`- }`
`45`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package com.groupdocs.ui.model`
`2`	`2`
`3`	`3`	`data class UploadResponse(`
`4`		`- val id: Int`
	`4`	`+ val guid: String`
`5`	`5`	`)`