Updated to show lost of changes

oleksii-unnamed · oleksii-unnamed · commit 8fff1f3a5ef4 · 2022-05-27T15:15:16.000+03:00
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/Application.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/Application.kt
@@ -1,9 +1,9 @@
 package com.groupdocs.ui
 
+import com.groupdocs.comparison.license.License
 import com.groupdocs.ui.config.ApplicationConfig
 import com.groupdocs.ui.config.ServerConfig
 import com.groupdocs.ui.di.ModulesInjection
-import com.groupdocs.ui.status.InternalServerException
 import com.typesafe.config.ConfigFactory
 import io.ktor.server.application.*
 import io.ktor.server.config.*
@@ -15,6 +15,11 @@ import kotlinx.serialization.hocon.Hocon
 import org.koin.core.logger.PrintLogger
 import org.koin.dsl.module
 import org.koin.ktor.plugin.Koin
+import java.io.BufferedInputStream
+import java.net.URL
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
 
 @ExperimentalSerializationApi
 @KtorExperimentalAPI
@@ -40,6 +45,10 @@ fun main(args: Array<String>) {
             }
             main()
         }
+
+        comparisonConfig.application.licensePathOrNull?.let { path ->
+            setGroupdocsLicense(path)
+        }
     }.start(wait = true)
 }
 
@@ -68,4 +77,36 @@ fun extractComparisonConfig(): ApplicationConfig {
         useConfigNamingConvention = false
     }
     return hocon.decodeFromConfig(ApplicationConfig.serializer(), ConfigFactory.load("application.conf"))
-}
+}
+
+fun Application.setGroupdocsLicense(licensePath: String) {
+    try {
+        log.debug("Setting Groupdocs license...")
+
+        val licenseExtension = Defaults.Application.DEFAULT_LICENSE_EXTENSION
+        val license = License()
+        if (licensePath.startsWith("http://") || licensePath.startsWith("https://")) {
+            val url = URL(licensePath)
+            BufferedInputStream(url.openStream()).use { inputStream -> license.setLicense(inputStream) }
+        } else {
+            val path = Paths.get(licensePath)
+            if (Files.exists(path)) {
+                if (Files.isRegularFile(path)) {
+                    license.setLicense(licensePath)
+                } else {
+                    Files.list(path).use { pathStream ->
+                        val first =
+                            pathStream.filter { path ->
+                                path.endsWith(licenseExtension)
+                            }.findFirst()
+                        first.ifPresent { licensePath: Path? ->
+                            license.setLicense(licensePath)
+                        }
+                    }
+                }
+            }
+        }
+    } catch (e: Exception) {
+        log.warn("Can not verify Comparison license!", e)
+    }
+}
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
@@ -5,11 +5,21 @@ import java.nio.file.Path
 
 @kotlinx.serialization.Serializable
 data class ApplicationConfig(
+    val application: Application = Application(),
     val common: Common = Common(),
     val comparison: Comparison = Comparison(),
     val local: Local = Local(),
 )
 
+@kotlinx.serialization.Serializable
+data class Application(
+    private val licensePath: String = "",
+    val hostAddress: String = "",
+) {
+    val licensePathOrNull: String?
+        get() = licensePath.ifBlank { null }
+}
+
 @kotlinx.serialization.Serializable
 data class Common(
     val pageSelector: Boolean = false,
@@ -26,10 +36,10 @@ data class Common(
 data class Comparison(
     private val filesProviderType: String = "",
     val preloadResultPageCount: Int = 0,
-    val previewPageWidth: Int = 0,
-    val previewPageRatio: Float = 0f,
-    val cacheDirectory: String = "",
-    val tempDirectory: String = "",
+    private val previewPageWidth: Int = 0,
+    private val previewPageRatio: Float = 0f,
+    private val cacheDirectory: String = "",
+    private val tempDirectory: String = "",
 ) {
     val filesProviderTypeOrDefault: Defaults.Comparison.FilesProviderType
         get() =
@@ -48,8 +58,8 @@ data class Comparison(
 
 @kotlinx.serialization.Serializable
 data class Local(
-    val filesDirectory: String = "",
-    val resultDirectory: String = "",
+    private val filesDirectory: String = "",
+    private val resultDirectory: String = "",
 ) {
 
     val filesDirectoryOrDefault: Path
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/CompareResponse.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/CompareResponse.kt
@@ -1,12 +1,10 @@
 package com.groupdocs.ui.model
 
-import com.groupdocs.comparison.result.ChangeInfo
-
 data class CompareResponse(
     /**
      * List of change information
      */
-    val changes: List<ChangeInfo>,
+    val changes: List<DocumentChange>,
 
     /**
      * List of images of pages with marked changes
@@ -21,7 +19,7 @@ data class CompareResponse(
     /**
      * Extension of compared files, for saving total results
      */
-    val extension: String = ""
+    val extension: String? = null
 )
 
 /**
@@ -35,4 +33,37 @@ data class ComparePage(
     val width: Int = 0,
     val height: Int = 0,
     val number: Int = 0,
+)
+
+data class DocumentChange(
+    val id: Int,
+    val type: Int,
+    val comparisonAction: Int,
+    val sourceText: String,
+    val targetText: String,
+    val text: String,
+    val componentType: String,
+    val box: ChangeBox,
+    val authors: List<String>,
+    val pageInfo: PageInfo,
+    val styleChanges: List<StyleChange>,
+)
+
+data class ChangeBox(
+    val y: Double,
+    val x: Double,
+    val height: Double,
+    val width: Double
+)
+
+data class PageInfo(
+    val height: Int,
+    val width: Int,
+    val pageNumber: Int
+)
+
+data class StyleChange(
+    val oldValue: Any,
+    val newValue: Any,
+    val propertyName: String
 )
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/TreeResponse.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/model/TreeResponse.kt
@@ -4,6 +4,6 @@ data class FileDescriptionEntity(
     val guid: String? = null,
     val name: String? = null,
     val docType: String? = null,
-    val isDirectory: Boolean? = null,
+    val directory: Boolean? = null,
     val size: Long? = null
 )
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareController.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/compare/CompareController.kt
@@ -1,9 +1,7 @@
 package com.groupdocs.ui.modules.compare
 
 import com.groupdocs.ui.manager.PathManager
-import com.groupdocs.ui.model.ComparePage
-import com.groupdocs.ui.model.CompareRequest
-import com.groupdocs.ui.model.CompareResponse
+import com.groupdocs.ui.model.*
 import com.groupdocs.ui.modules.BaseController
 import com.groupdocs.ui.status.InternalServerException
 import com.groupdocs.ui.usecase.AreFilesSupportedUseCase
@@ -17,6 +15,7 @@ import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.io.FileInputStream
 import java.io.FileOutputStream
+import java.nio.file.Files
 import java.util.*
 
 class CompareControllerImpl(
@@ -46,7 +45,10 @@ class CompareControllerImpl(
             targetName = targetFilePath.fileName.toString(),
             extension = resultExtension
         )
-        val changes = withContext(Dispatchers.IO) {
+        if (Files.notExists(resultPath.parent)) {
+            throw InternalServerException("Result directory does not exist") // TODO: Need another exception type
+        }
+        val changeInfos = withContext(Dispatchers.IO) {
             BufferedOutputStream(FileOutputStream(resultPath.toFile())).use { outputStream ->
                 return@withContext compareDocuments(
                     sourcePath = sourceFilePath,
@@ -82,11 +84,47 @@ class CompareControllerImpl(
             pages
         }
 
+        val changes = changeInfos.map { changeInfo ->
+            DocumentChange(
+                id = changeInfo.id,
+                type = changeInfo.type,
+                comparisonAction = changeInfo.comparisonAction,
+                sourceText = changeInfo.sourceText,
+                targetText = changeInfo.targetText,
+                text = changeInfo.text,
+                componentType = changeInfo.componentType,
+                box = ChangeBox(
+                    x = changeInfo.box.x,
+                    y = changeInfo.box.y,
+                    width = changeInfo.box.width,
+                    height = changeInfo.box.height
+                ),
+                authors = changeInfo.authors,
+                pageInfo = PageInfo(
+                    pageNumber = changeInfo.pageInfo.pageNumber,
+                    width = changeInfo.pageInfo.width,
+                    height = changeInfo.pageInfo.height
+                ),
+                styleChanges = changeInfo.styleChanges.map { styleChangeInfo ->
+                    StyleChange(
+                        propertyName = styleChangeInfo.propertyName,
+                        oldValue = styleChangeInfo.oldValue,
+                        newValue = styleChangeInfo.newValue
+                    )
+                }
+            )
+        }
+
+        val filesDirectory = pathManager.filesDirectory
         val resultDirectory = pathManager.resultDirectory
+
+        val guid = if (resultDirectory.startsWith(filesDirectory)) {
+            filesDirectory.relativize(resultPath)
+        } else resultDirectory.relativize(resultPath)
+
         return CompareResponse(
-            guid = resultDirectory.relativize(resultPath).toString(),
+            guid = guid.toString(),
             changes = changes,
-            extension = resultExtension,
             pages = pages
         )
     }
diff --git a/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/tree/TreeController.kt b/Demos/Ktor/comparison-ktor/src/main/kotlin/com/groupdocs/ui/modules/tree/TreeController.kt
@@ -24,11 +24,14 @@ class TreeControllerImpl(
             val isDirectory = it is LocalStorageEntry.Directory
             val size = if (it is LocalStorageEntry.File) it.size else 0
 
+            val filesDirectory = pathManager.filesDirectory
+            val fileFullPath = it.fullPath
+            val guid = filesDirectory.relativize(fileFullPath).toString()
             FileDescriptionEntity(
-                guid = it.fullPath.toString(),
+                guid = guid,
                 name = it.name,
                 docType = docType,
-                isDirectory = isDirectory,
+                directory = isDirectory,
                 size = size
             )
         }
diff --git a/Demos/Ktor/comparison-ktor/src/main/resources/application.conf b/Demos/Ktor/comparison-ktor/src/main/resources/application.conf
@@ -6,9 +6,11 @@
         # Absolute or relative path to GroupDocs license
         # Can be as a path to license file, to directory, in which license file is placed (*.lic) or url to download license file
         # Default value is `Licenses`
-        licensePath = null
+        licensePath = ""
+        licensePath = ${?LIC_PATH}
         # Host name or ip for server instance
-        hostAddress = null
+        hostAddress = ""
+        hostAddress = ${?HOST_ADDRESS}
     }
     ################################################
     # Common configurations
@@ -18,23 +20,29 @@
         # Set false to cancel uploading in case of existence of file with the same name
         # Set true to replace files with same name
         rewrite = true
+        rewrite = ${?REWRITE}
         # Page navigation
         # Set false to disable document navigation (go to next, previous, last and first page)
         pageSelector = true
         # Document download
         # Set false to disable document download
         download = true
+        download = ${?DOWNLOAD_ON}
         # Document upload
         # Set false to disable document upload
         upload = true
+        upload = ${?UPLOAD_ON}
         # Document print
         # Set false to disable document print
         print = true
+        print = ${?PRINT_ON}
         # File browser
         # Set false to disable document browse
         browse = true
+        browse = ${?BROWSE_ON}
         # Set false to disable right mouse click
         enableRightClick = true
+        enableRightClick = ${?RIGHTCLICK_ON}
     }
     ################################################
     # GroupDocs.Comparison configurations
@@ -43,23 +51,28 @@
         # Files provider, where to get files to show them in browse dialog
         # Available values are `google` - using Google Drive API, `dropbox` - using Dropbox API, `local` - using local directories
         filesProviderType = "local"
+        filesProviderType = ${?FILES_PROVIDER_TYPE}
         # Result pages preload
         # How many pages from a result document should be loaded, remaining pages will be loaded on page scrolling
         # Set 0 to load all pages at once
         preloadResultPageCount = 0
         # Page width that will be used to resize preview images before displaying them
         # Default value is 768
-        previewPageWidth = 768
+        previewPageWidth = 0
+        previewPageWidth = ${?PREVIEW_PAGE_WIDTH}
         # Ratio to calculate height of preview images using width
         # Default value is 1.3
-        previewPageRatio = 1.3
+        previewPageRatio = 0
+        previewPageRatio = ${?PREVIEW_PAGE_RATIO}
         # Absolute or relative path to directory to save cache files
         # Default value is system temp directory. The path is always local
-        cacheDirectory = "asd"
+        cacheDirectory = ""
+        cacheDirectory = ${?CACHE_DIR}
         # Absolute or relative path to directory to save temporary files
         # in case of using local files provider, relative path will be resolved with filesDirectory as base path
         # Default value is system temp directory. The path is always local
         tempDirectory = ""
+        tempDirectory = ${?TEMP_DIR}
     }
     ################################################
     # Local files provider Configuration
@@ -69,9 +82,11 @@
         # Directory must be created before app starts
         # Absolute or relative path to files directory, default value is `DocumentSamples`.
         filesDirectory = "DocumentSamples"
+        filesDirectory = ${?FILES_DIR}
         # Result files directory path
         # Directory must be created before app starts
         # Absolute or relative path to result files directory, default value is `ResultFiles`.
-        resultDirectory = "ResultFiles"
+        resultDirectory = ""
+        resultDirectory = ${?RESULT_DIR}
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ data class FileDescriptionEntity(`
`4`	`4`	`val guid: String? = null,`
`5`	`5`	`val name: String? = null,`
`6`	`6`	`val docType: String? = null,`
`7`		`- val isDirectory: Boolean? = null,`
	`7`	`+ val directory: Boolean? = null,`
`8`	`8`	`val size: Long? = null`
`9`	`9`	`)`