From 0a7aa48f1e825baf55c5bdf9ad208369b7fe14d1 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Sat, 11 Sep 2021 00:14:52 +0430 Subject: [PATCH] fix apk log and apk name --- .../tachidesk/manga/controller/ExtensionController.kt | 7 +++++-- .../suwayomi/tachidesk/manga/impl/extension/Extension.kt | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt index a13fef81..70d82a1d 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/ExtensionController.kt @@ -8,11 +8,14 @@ package suwayomi.tachidesk.manga.controller * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import io.javalin.http.Context +import mu.KotlinLogging import suwayomi.tachidesk.manga.impl.extension.Extension import suwayomi.tachidesk.manga.impl.extension.ExtensionsList import suwayomi.tachidesk.server.JavalinSetup.future object ExtensionController { + private val logger = KotlinLogging.logger {} + /** list all extensions */ fun list(ctx: Context) { ctx.json( @@ -37,11 +40,11 @@ object ExtensionController { fun installFile(ctx: Context) { val uploadedFile = ctx.uploadedFile("file")!! - println(uploadedFile.filename) + logger.debug { "Uploaded extension file name: " + uploadedFile.filename } ctx.json( future { - Extension.installExternalExtension(uploadedFile.content) + Extension.installExternalExtension(uploadedFile.content, uploadedFile.filename) } ) } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt index 77d94fb0..6aba05ad 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt @@ -68,9 +68,8 @@ object Extension { } } - suspend fun installExternalExtension(inputStream: InputStream): Int { + suspend fun installExternalExtension(inputStream: InputStream, apkName: String): Int { return installAPK { - val apkName = "apkToSave.apk" val savePath = "${applicationDirs.extensionsRoot}/$apkName" // download apk file val downloadedFile = File(savePath)