From a3c366c360cf73ecfc834894c6a22458868b78d1 Mon Sep 17 00:00:00 2001 From: Mitchell Syer Date: Sat, 22 Oct 2022 08:08:14 -0400 Subject: [PATCH] Lint (#423) --- .../androidcompat/db/ScrollableResultSet.kt | 28 +++++++++++++------ .../androidcompat/pm/PackageController.kt | 5 ++-- .../kotlin/eu/kanade/tachiyomi/AppModule.kt | 1 - .../interceptor/RateLimitInterceptor.kt | 4 +-- .../SpecificHostRateLimitInterceptor.kt | 4 +-- .../tachiyomi/source/local/LocalSource.kt | 3 +- .../suwayomi/tachidesk/global/impl/About.kt | 4 +-- .../tachidesk/global/impl/AppUpdate.kt | 6 ++-- .../manga/controller/BackupController.kt | 4 +-- .../suwayomi/tachidesk/manga/impl/Category.kt | 4 ++- .../tachidesk/manga/impl/CategoryManga.kt | 3 +- .../suwayomi/tachidesk/manga/impl/Manga.kt | 12 ++++---- .../suwayomi/tachidesk/manga/impl/Search.kt | 2 +- .../suwayomi/tachidesk/manga/impl/Source.kt | 2 +- .../manga/impl/backup/BackupFlags.kt | 2 +- .../impl/backup/proto/ProtoBackupExport.kt | 6 ++-- .../manga/impl/backup/proto/models/Backup.kt | 2 +- .../backup/proto/models/BackupCategory.kt | 2 +- .../impl/backup/proto/models/BackupChapter.kt | 2 +- .../impl/backup/proto/models/BackupManga.kt | 2 +- .../backup/proto/models/BackupTracking.kt | 2 +- .../manga/impl/chapter/ChapterForDownload.kt | 1 - .../manga/impl/download/DownloadManager.kt | 15 +++++++--- .../impl/download/model/DownloadChapter.kt | 2 +- .../impl/download/model/DownloadState.kt | 2 +- .../impl/download/model/DownloadStatus.kt | 2 +- .../manga/impl/extension/Extension.kt | 12 +++++--- .../manga/impl/extension/ExtensionsList.kt | 2 +- .../extension/github/ExtensionGithubApi.kt | 2 +- .../manga/impl/update/UpdaterSocket.kt | 3 +- .../manga/impl/util/BytecodeEditor.kt | 10 +++++-- .../tachidesk/manga/impl/util/DirName.kt | 6 ++-- .../manga/impl/util/lang/RxCoroutineBridge.kt | 10 ++++--- .../manga/impl/util/storage/ImageResponse.kt | 3 +- .../manga/model/dataclass/ChapterDataClass.kt | 2 +- .../model/dataclass/ExtensionDataClass.kt | 2 +- .../model/dataclass/MangaChapterDataClass.kt | 2 +- .../manga/model/dataclass/PageDataClass.kt | 2 +- .../manga/model/dataclass/PaginatedList.kt | 2 +- .../manga/model/dataclass/SourceDataClass.kt | 2 +- .../manga/model/table/CategoryTable.kt | 2 +- .../manga/model/table/ChapterTable.kt | 2 +- .../tachidesk/manga/model/table/MangaTable.kt | 2 +- .../suwayomi/tachidesk/server/ServerSetup.kt | 2 +- .../database/migration/M0001_Initial.kt | 4 +-- .../M0011_SourceDropPartOfFactorySource.kt | 2 +- .../tachidesk/server/util/DocumentationDsl.kt | 16 +++++------ .../server/util/WebInterfaceManager.kt | 3 +- .../tachidesk/manga/impl/CategoryMangaTest.kt | 15 ++++++---- .../tachidesk/manga/impl/MangaTest.kt | 9 ++++-- .../tachidesk/manga/impl/SearchTest.kt | 7 +++-- .../manga/model/PaginatedListTest.kt | 16 +++++------ .../tachidesk/test/ApplicationTest.kt | 2 +- .../suwayomi/tachidesk/test/TestUtils.kt | 4 ++- 54 files changed, 159 insertions(+), 109 deletions(-) diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt index d713c16e..76735525 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt @@ -60,9 +60,13 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } private fun internalMove(row: Int) { - if (cursor < 0) cursor = 0 - else if (cursor > resultSetLength + 1) cursor = resultSetLength + 1 - else cursor = row + if (cursor < 0) { + cursor = 0 + } else if (cursor > resultSetLength + 1) { + cursor = resultSetLength + 1 + } else { + cursor = row + } } private fun obj(column: Int): Any? { @@ -293,10 +297,11 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } override fun unwrap(iface: Class?): T { - if (thisIsWrapperFor(iface)) + if (thisIsWrapperFor(iface)) { return this as T - else + } else { return parent.unwrap(iface) + } } override fun next(): Boolean { @@ -531,10 +536,15 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent { } private fun castToLong(obj: Any?): Long { - if (obj == null) return 0 - else if (obj is Long) return obj - else if (obj is Number) return obj.toLong() - else throw IllegalStateException("Object is not a long!") + if (obj == null) { + return 0 + } else if (obj is Long) { + return obj + } else if (obj is Number) { + return obj.toLong() + } else { + throw IllegalStateException("Object is not a long!") + } } override fun getLong(columnIndex: Int): Long { diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt index 7c0e6a37..f94f3222 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt @@ -74,10 +74,11 @@ class PackageController { fun findPackage(packageName: String): InstalledPackage? { val file = File(androidFiles.packagesDir, packageName) - return if (file.exists()) + return if (file.exists()) { InstalledPackage(file) - else + } else { null + } } fun findJarFromApk(apkFile: File): File? { diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt index 1c363994..c46b8d1c 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt @@ -29,7 +29,6 @@ import uy.kohesive.injekt.api.get class AppModule(val app: Application) : InjektModule { override fun InjektRegistrar.registerInjectables() { - addSingleton(app) // addSingletonFactory { PreferencesHelper(app) } diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt index a776f2b5..58587000 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/RateLimitInterceptor.kt @@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit fun OkHttpClient.Builder.rateLimit( permits: Int, period: Long = 1, - unit: TimeUnit = TimeUnit.SECONDS, + unit: TimeUnit = TimeUnit.SECONDS ) = addInterceptor(RateLimitInterceptor(permits, period, unit)) private class RateLimitInterceptor( private val permits: Int, period: Long, - unit: TimeUnit, + unit: TimeUnit ) : Interceptor { private val requestQueue = ArrayList(permits) diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt index ec7a8fdb..2851a9b8 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/SpecificHostRateLimitInterceptor.kt @@ -26,14 +26,14 @@ fun OkHttpClient.Builder.rateLimitHost( httpUrl: HttpUrl, permits: Int, period: Long = 1, - unit: TimeUnit = TimeUnit.SECONDS, + unit: TimeUnit = TimeUnit.SECONDS ) = addInterceptor(SpecificHostRateLimitInterceptor(httpUrl, permits, period, unit)) class SpecificHostRateLimitInterceptor( httpUrl: HttpUrl, private val permits: Int, period: Long, - unit: TimeUnit, + unit: TimeUnit ) : Interceptor { private val requestQueue = ArrayList(permits) diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt index 40d74717..0aaaf01f 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt @@ -327,8 +327,9 @@ class LocalSource : CatalogueSource { fun getFormat(chapter: SChapter): Format { val chapFile = File(applicationDirs.localMangaRoot, chapter.url) - if (chapFile.exists()) + if (chapFile.exists()) { return getFormat(chapFile) + } throw Exception("Chapter not found") } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/About.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/About.kt index 84b8f0a1..8bc79b64 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/About.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/About.kt @@ -16,7 +16,7 @@ data class AboutDataClass( val buildType: String, val buildTime: Long, val github: String, - val discord: String, + val discord: String ) object About { @@ -28,7 +28,7 @@ object About { BuildConfig.BUILD_TYPE, BuildConfig.BUILD_TIME, BuildConfig.GITHUB, - BuildConfig.DISCORD, + BuildConfig.DISCORD ) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt index 8f8384e8..e3b14ac1 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/AppUpdate.kt @@ -46,13 +46,13 @@ object AppUpdate { UpdateDataClass( "Stable", stableJson["tag_name"]!!.jsonPrimitive.content, - stableJson["html_url"]!!.jsonPrimitive.content, + stableJson["html_url"]!!.jsonPrimitive.content ), UpdateDataClass( "Preview", previewJson["tag_name"]!!.jsonPrimitive.content, - previewJson["html_url"]!!.jsonPrimitive.content, - ), + previewJson["html_url"]!!.jsonPrimitive.content + ) ) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt index 0ede03fe..65022b1b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt @@ -84,7 +84,7 @@ object BackupController { includeCategories = true, includeChapters = true, includeTracking = true, - includeHistory = true, + includeHistory = true ) ) } @@ -116,7 +116,7 @@ object BackupController { includeCategories = true, includeChapters = true, includeTracking = true, - includeHistory = true, + includeHistory = true ) ) } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt index 46bb7110..acd9e634 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt @@ -41,7 +41,9 @@ object Category { normalizeCategories() newCategoryId - } else -1 + } else { + -1 + } } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt index 67cd7d61..ebc27002 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt @@ -86,13 +86,14 @@ object CategoryManga { dataClass } - if (categoryId == DEFAULT_CATEGORY_ID) + if (categoryId == DEFAULT_CATEGORY_ID) { return transaction { MangaTable .slice(selectedColumns) .select { (MangaTable.inLibrary eq true) and (MangaTable.defaultCategory eq true) } .map(transform) } + } return transaction { CategoryMangaTable.innerJoin(MangaTable) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt index 11ee265e..6f04fc49 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt @@ -45,10 +45,11 @@ import java.io.InputStream object Manga { private fun truncate(text: String?, maxLength: Int): String? { - return if (text?.length ?: 0 > maxLength) + return if (text?.length ?: 0 > maxLength) { text?.take(maxLength - 3) + "..." - else + } else { text + } } suspend fun getManga(mangaId: Int, onlineFetch: Boolean = false): MangaDataClass { @@ -68,12 +69,12 @@ object Manga { transaction { MangaTable.update({ MangaTable.id eq mangaId }) { - if (sManga.title != mangaEntry[MangaTable.title]) { val canUpdateTitle = updateMangaDownloadDir(mangaId, sManga.title) - if (canUpdateTitle) + if (canUpdateTitle) { it[MangaTable.title] = sManga.title + } } it[MangaTable.initialized] = true @@ -82,8 +83,9 @@ object Manga { it[MangaTable.description] = truncate(sManga.description, 4096) it[MangaTable.genre] = sManga.genre it[MangaTable.status] = sManga.status - if (sManga.thumbnail_url != null && sManga.thumbnail_url.orEmpty().isNotEmpty()) + if (sManga.thumbnail_url != null && sManga.thumbnail_url.orEmpty().isNotEmpty()) { it[MangaTable.thumbnail_url] = sManga.thumbnail_url + } it[MangaTable.realUrl] = runCatching { (source as? HttpSource)?.mangaDetailsRequest(sManga)?.url?.toString() diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt index ed64f31b..ad8407e2 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt @@ -78,7 +78,7 @@ object Search { data class FilterObject( val type: String, - val filter: Filter<*>, + val filter: Filter<*> ) fun setFilter(sourceId: Long, changes: List) { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt index 6df0f7c8..d151abe8 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt @@ -48,7 +48,7 @@ object Source { catalogueSource.supportsLatest, catalogueSource is ConfigurableSource, it[SourceTable.isNsfw], - catalogueSource.toString(), + catalogueSource.toString() ) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/BackupFlags.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/BackupFlags.kt index 05c69546..d06b6167 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/BackupFlags.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/BackupFlags.kt @@ -12,5 +12,5 @@ data class BackupFlags( val includeCategories: Boolean, val includeChapters: Boolean, val includeTracking: Boolean, - val includeHistory: Boolean, + val includeHistory: Boolean ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt index 7b593e6a..ce9a37ce 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt @@ -69,7 +69,7 @@ object ProtoBackupExport : ProtoBackupBase() { MangaStatus.valueOf(mangaRow[MangaTable.status]).value, mangaRow[MangaTable.thumbnail_url], TimeUnit.SECONDS.toMillis(mangaRow[MangaTable.inLibraryAt]), - 0, // not supported in Tachidesk + 0 // not supported in Tachidesk ) val mangaId = mangaRow[MangaTable.id].value @@ -94,7 +94,7 @@ object ProtoBackupExport : ProtoBackupBase() { TimeUnit.SECONDS.toMillis(it.fetchedAt), it.uploadDate, it.chapterNumber, - chapters.size - it.index, + chapters.size - it.index ) } } @@ -122,7 +122,7 @@ object ProtoBackupExport : ProtoBackupBase() { BackupCategory( it.name, it.order, - 0, // not supported in Tachidesk + 0 // not supported in Tachidesk ) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/Backup.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/Backup.kt index c32fb203..177b9a0e 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/Backup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/Backup.kt @@ -9,7 +9,7 @@ data class Backup( @ProtoNumber(2) var backupCategories: List = emptyList(), // Bump by 100 to specify this is a 0.x value @ProtoNumber(100) var brokenBackupSources: List = emptyList(), - @ProtoNumber(101) var backupSources: List = emptyList(), + @ProtoNumber(101) var backupSources: List = emptyList() ) { fun getSourceMap(): Map { return (brokenBackupSources.map { BackupSource(it.name, it.sourceId) } + backupSources) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt index 33479aaa..5b7c95c6 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt @@ -11,7 +11,7 @@ class BackupCategory( @ProtoNumber(2) var order: Int = 0, // @ProtoNumber(3) val updateInterval: Int = 0, 1.x value not used in 0.x // Bump by 100 to specify this is a 0.x value - @ProtoNumber(100) var flags: Int = 0, + @ProtoNumber(100) var flags: Int = 0 ) { fun getCategoryImpl(): CategoryImpl { return CategoryImpl().apply { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt index 38691c0e..b493f1d5 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt @@ -20,7 +20,7 @@ data class BackupChapter( @ProtoNumber(8) var dateUpload: Long = 0, // chapterNumber is called number is 1.x @ProtoNumber(9) var chapterNumber: Float = 0F, - @ProtoNumber(10) var sourceOrder: Int = 0, + @ProtoNumber(10) var sourceOrder: Int = 0 ) { fun toChapterImpl(): ChapterImpl { return ChapterImpl().apply { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt index 16b4e9e3..aff20da4 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt @@ -35,7 +35,7 @@ data class BackupManga( @ProtoNumber(101) var chapterFlags: Int = 0, @ProtoNumber(102) var brokenHistory: List = emptyList(), @ProtoNumber(103) var viewer_flags: Int? = null, - @ProtoNumber(104) var history: List = emptyList(), + @ProtoNumber(104) var history: List = emptyList() ) { fun getMangaImpl(): MangaImpl { return MangaImpl().apply { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupTracking.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupTracking.kt index 662c70ff..4135085e 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupTracking.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupTracking.kt @@ -24,7 +24,7 @@ data class BackupTracking( // startedReadingDate is called startReadTime in 1.x @ProtoNumber(10) var startedReadingDate: Long = 0, // finishedReadingDate is called endReadTime in 1.x - @ProtoNumber(11) var finishedReadingDate: Long = 0, + @ProtoNumber(11) var finishedReadingDate: Long = 0 ) { fun getTrackingImpl(): TrackImpl { return TrackImpl().apply { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt index ddaa6256..c1f89a1b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt @@ -37,7 +37,6 @@ private class ChapterForDownload( private val mangaId: Int ) { suspend fun asDownloadReady(): ChapterDataClass { - if (isNotCompletelyDownloaded()) { markAsNotDownloaded() diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt index 4a726005..98780918 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt @@ -49,7 +49,8 @@ object DownloadManager { |Supported commands are: | - STATUS | sends the current download status - |""".trimMargin() + | + """.trimMargin() ) } } @@ -65,7 +66,11 @@ object DownloadManager { return DownloadStatus( if (downloader == null || downloadQueue.none { it.state == Downloading } - ) "Stopped" else "Started", + ) { + "Stopped" + } else { + "Started" + }, downloadQueue ) } @@ -96,8 +101,10 @@ object DownloadManager { } fun start() { - if (downloader != null && !downloader?.isAlive!!) // doesn't exist or is dead + if (downloader != null && !downloader?.isAlive!!) { + // doesn't exist or is dead downloader = null + } if (downloader == null) { downloader = Downloader(downloadQueue) { notifyAllClients() } @@ -127,5 +134,5 @@ object DownloadManager { enum class DownloaderState(val state: Int) { Stopped(0), Running(1), - Paused(2), + Paused(2) } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadChapter.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadChapter.kt index 087463d3..f101150b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadChapter.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadChapter.kt @@ -18,5 +18,5 @@ class DownloadChapter( var manga: MangaDataClass, var state: DownloadState = Queued, var progress: Float = 0f, - var tries: Int = 0, + var tries: Int = 0 ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadState.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadState.kt index 61ef7d11..5be5d609 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadState.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadState.kt @@ -11,5 +11,5 @@ enum class DownloadState(val state: Int) { Queued(0), Downloading(1), Finished(2), - Error(3), + Error(3) } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadStatus.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadStatus.kt index 8768813c..c2f748af 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadStatus.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadStatus.kt @@ -9,5 +9,5 @@ package suwayomi.tachidesk.manga.impl.download.model data class DownloadStatus( val status: String, - val queue: List, + val queue: List ) 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 ae49f694..4a8f248f 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 @@ -225,12 +225,13 @@ object Extension { SourceTable.deleteWhere { SourceTable.extension eq extensionId } - if (extensionRecord[ExtensionTable.isObsolete]) + if (extensionRecord[ExtensionTable.isObsolete]) { ExtensionTable.deleteWhere { ExtensionTable.pkgName eq pkgName } - else + } else { ExtensionTable.update({ ExtensionTable.pkgName eq pkgName }) { it[isInstalled] = false } + } sources } @@ -265,8 +266,11 @@ object Extension { } suspend fun getExtensionIcon(apkName: String, useCache: Boolean): Pair { - val iconUrl = if (apkName == "localSource") "" - else transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.first() }[ExtensionTable.iconUrl] + val iconUrl = if (apkName == "localSource") { + "" + } else { + transaction { ExtensionTable.select { ExtensionTable.apkName eq apkName }.first() }[ExtensionTable.iconUrl] + } val saveDir = "${applicationDirs.extensionsRoot}/icon" diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt index cbdeac1d..82cca9f9 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt @@ -59,7 +59,7 @@ object ExtensionsList { it[ExtensionTable.isNsfw], it[ExtensionTable.isInstalled], it[ExtensionTable.hasUpdate], - it[ExtensionTable.isObsolete], + it[ExtensionTable.isObsolete] ) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt index 537d25c4..45c8c720 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt @@ -31,7 +31,7 @@ object ExtensionGithubApi { val nsfw: Int, val hasReadme: Int = 0, val hasChangelog: Int = 0, - val sources: List?, + val sources: List? ) @Serializable diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/UpdaterSocket.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/UpdaterSocket.kt index 69d901c5..cafa504c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/UpdaterSocket.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/update/UpdaterSocket.kt @@ -32,7 +32,8 @@ object UpdaterSocket : Websocket() { |Supported commands are: | - STATUS | sends the current update status - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/BytecodeEditor.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/BytecodeEditor.kt index 59d0a861..0deeaa2c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/BytecodeEditor.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/BytecodeEditor.kt @@ -67,7 +67,9 @@ object BytecodeEditor { } path to bytes - } else null + } else { + null + } } catch (e: Exception) { logger.error(e) { "Error loading class from Path: $path" } null @@ -172,7 +174,11 @@ object BytecodeEditor { ): MethodVisitor { logger.trace { "Processing method $name: ${desc.replaceIndirectly()}: $signature" } val mv: MethodVisitor? = super.visitMethod( - access, name, desc.replaceIndirectly(), signature, exceptions + access, + name, + desc.replaceIndirectly(), + signature, + exceptions ) return object : MethodVisitor(Opcodes.ASM5, mv) { override fun visitLdcInsn(cst: Any?) { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt index a49fad04..f19f0f63 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/DirName.kt @@ -60,7 +60,9 @@ fun updateMangaDownloadDir(mangaId: Int, newTitle: String): Boolean { val oldDirFile = File(oldDir) val newDirFile = File(newDir) - return if (oldDirFile.exists()) + return if (oldDirFile.exists()) { oldDirFile.renameTo(newDirFile) - else true + } else { + true + } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/RxCoroutineBridge.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/RxCoroutineBridge.kt index 896a0daa..5b07e817 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/RxCoroutineBridge.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/RxCoroutineBridge.kt @@ -37,11 +37,13 @@ private suspend fun Observable.awaitOne(): T = suspendCancellableCoroutin } override fun onCompleted() { - if (cont.isActive) cont.resumeWithException( - IllegalStateException( - "Should have invoked onNext" + if (cont.isActive) { + cont.resumeWithException( + IllegalStateException( + "Should have invoked onNext" + ) ) - ) + } } override fun onError(e: Throwable) { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/ImageResponse.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/ImageResponse.kt index f782adc3..2c8d9cc1 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/ImageResponse.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/ImageResponse.kt @@ -21,8 +21,9 @@ object ImageResponse { fun findFileNameStartingWith(directoryPath: String, fileName: String): String? { val target = "$fileName." File(directoryPath).listFiles().orEmpty().forEach { file -> - if (file.name.startsWith(target)) + if (file.name.startsWith(target)) { return "$directoryPath/${file.name}" + } } return null } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt index a6073022..e996358d 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt @@ -44,5 +44,5 @@ data class ChapterDataClass( val chapterCount: Int? = null, /** used to store client specific values */ - val meta: Map = emptyMap(), + val meta: Map = emptyMap() ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ExtensionDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ExtensionDataClass.kt index af850653..f3db7b72 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ExtensionDataClass.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ExtensionDataClass.kt @@ -20,5 +20,5 @@ data class ExtensionDataClass( val installed: Boolean, val hasUpdate: Boolean, - val obsolete: Boolean, + val obsolete: Boolean ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaChapterDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaChapterDataClass.kt index c7629884..54d763e8 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaChapterDataClass.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaChapterDataClass.kt @@ -9,5 +9,5 @@ package suwayomi.tachidesk.manga.model.dataclass data class MangaChapterDataClass( val manga: MangaDataClass, - val chapter: ChapterDataClass, + val chapter: ChapterDataClass ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PageDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PageDataClass.kt index 48cfbc65..0687e14b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PageDataClass.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PageDataClass.kt @@ -9,5 +9,5 @@ package suwayomi.tachidesk.manga.model.dataclass data class PageDataClass( val index: Int, - var imageUrl: String, + var imageUrl: String ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PaginatedList.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PaginatedList.kt index 4a38a916..7deefd65 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PaginatedList.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PaginatedList.kt @@ -11,7 +11,7 @@ import kotlin.math.min open class PaginatedList( val page: List, - val hasNextPage: Boolean, + val hasNextPage: Boolean ) const val PaginationFactor = 50 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/SourceDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/SourceDataClass.kt index 7aefb7e2..ca9e6a2f 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/SourceDataClass.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/SourceDataClass.kt @@ -25,5 +25,5 @@ data class SourceDataClass( val isNsfw: Boolean, /** A nicer version of [name] */ - val displayName: String, + val displayName: String ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt index c00f7cad..0bcc0fd2 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt @@ -21,5 +21,5 @@ fun CategoryTable.toDataClass(categoryEntry: ResultRow) = CategoryDataClass( categoryEntry[this.id].value, categoryEntry[order], categoryEntry[name], - categoryEntry[isDefault], + categoryEntry[isDefault] ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt index 47d704d6..19bc49f7 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt @@ -53,5 +53,5 @@ fun ChapterTable.toDataClass(chapterEntry: ResultRow) = chapterEntry[isDownloaded], chapterEntry[pageCount], transaction { ChapterTable.select { manga eq chapterEntry[manga].value }.count().toInt() }, - getChapterMetaMap(chapterEntry[id]), + getChapterMetaMap(chapterEntry[id]) ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt index cba2c39b..4a3798d8 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt @@ -59,7 +59,7 @@ fun MangaTable.toDataClass(mangaEntry: ResultRow) = mangaEntry[inLibrary], mangaEntry[inLibraryAt], meta = getMangaMetaMap(mangaEntry[id].value), - realUrl = mangaEntry[realUrl], + realUrl = mangaEntry[realUrl] ) enum class MangaStatus(val value: Int) { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt index d10a7afc..e5c04e03 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt @@ -85,7 +85,7 @@ fun applicationSetup() { applicationDirs.extensionsRoot + "/icon", applicationDirs.thumbnailsRoot, applicationDirs.mangaDownloadsRoot, - applicationDirs.localMangaRoot, + applicationDirs.localMangaRoot ).forEach { File(it).mkdirs() } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0001_Initial.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0001_Initial.kt index 6837268e..ce038472 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0001_Initial.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0001_Initial.kt @@ -13,8 +13,8 @@ import org.jetbrains.exposed.dao.id.IdTable import org.jetbrains.exposed.dao.id.IntIdTable import org.jetbrains.exposed.sql.Table -@Suppress("ClassName", "unused") /** initial migration, create all tables */ +@Suppress("ClassName", "unused") class M0001_Initial : AddTableMigration() { private class ExtensionTable : IntIdTable() { init { @@ -128,7 +128,7 @@ class M0001_Initial : AddTableMigration() { chapterTable, pageTable, categoryTable, - categoryMangaTable, + categoryMangaTable ) } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0011_SourceDropPartOfFactorySource.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0011_SourceDropPartOfFactorySource.kt index fbf57385..9be9429b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0011_SourceDropPartOfFactorySource.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0011_SourceDropPartOfFactorySource.kt @@ -12,5 +12,5 @@ import de.neonew.exposed.migrations.helpers.DropColumnMigration @Suppress("ClassName", "unused") class M0011_SourceDropPartOfFactorySource : DropColumnMigration( "Source", - "part_of_factory_source", + "part_of_factory_source" ) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/DocumentationDsl.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/DocumentationDsl.kt index d72ce666..bb20559e 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/DocumentationDsl.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/DocumentationDsl.kt @@ -242,7 +242,7 @@ inline fun handler( it, getParam(it, param1), getParam(it, param2), - getParam(it, param3), + getParam(it, param3) ) } ) @@ -265,7 +265,7 @@ inline fun handler( getParam(it, param1), getParam(it, param2), getParam(it, param3), - getParam(it, param4), + getParam(it, param4) ) } ) @@ -290,7 +290,7 @@ inline fun handler( getParam(it, param2), getParam(it, param3), getParam(it, param4), - getParam(it, param5), + getParam(it, param5) ) } ) @@ -317,7 +317,7 @@ inline fun >)[0]), FilterObject("CheckBox", (source.mFilterList[6].state as List>)[1]), - FilterObject("CheckBox", (source.mFilterList[6].state as List>)[2]), + FilterObject("CheckBox", (source.mFilterList[6].state as List>)[2]) ) ) ) diff --git a/server/src/test/kotlin/suwayomi/tachidesk/manga/model/PaginatedListTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/manga/model/PaginatedListTest.kt index a429c3bb..c6b6dd6f 100644 --- a/server/src/test/kotlin/suwayomi/tachidesk/manga/model/PaginatedListTest.kt +++ b/server/src/test/kotlin/suwayomi/tachidesk/manga/model/PaginatedListTest.kt @@ -31,7 +31,7 @@ class PaginatedListTest : ApplicationTest() { assertEquals( PaginatedList(listIndicesOf(0, PaginationFactor - 1), false), - paginated, + paginated ) } @@ -43,14 +43,14 @@ class PaginatedListTest : ApplicationTest() { assertEquals( PaginatedList(listIndicesOf(0, PaginationFactor), true), - firstPage, + firstPage ) val secondPage = paginatedFrom(1, lister = masterLister) assertEquals( PaginatedList(listIndicesOf(PaginationFactor, PaginationFactor * 2 - 1), false), - secondPage, + secondPage ) } @@ -62,14 +62,14 @@ class PaginatedListTest : ApplicationTest() { assertEquals( PaginatedList(listIndicesOf(0, PaginationFactor), true), - firstPage, + firstPage ) val secondPage = paginatedFrom(1, lister = masterLister) assertEquals( PaginatedList(listIndicesOf(PaginationFactor, PaginationFactor * 2), false), - secondPage, + secondPage ) } @@ -81,21 +81,21 @@ class PaginatedListTest : ApplicationTest() { assertEquals( PaginatedList(listIndicesOf(0, PaginationFactor), true), - firstPage, + firstPage ) val secondPage = paginatedFrom(1, lister = masterLister) assertEquals( PaginatedList(listIndicesOf(PaginationFactor, PaginationFactor * 2), true), - secondPage, + secondPage ) val thirdPage = paginatedFrom(2, lister = masterLister) assertEquals( PaginatedList(listIndicesOf(PaginationFactor * 2, PaginationFactor * 2 + 1), false), - thirdPage, + thirdPage ) } diff --git a/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt index 48683209..69171a19 100644 --- a/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt +++ b/server/src/test/kotlin/suwayomi/tachidesk/test/ApplicationTest.kt @@ -76,7 +76,7 @@ open class ApplicationTest { applicationDirs.extensionsRoot + "/icon", applicationDirs.thumbnailsRoot, applicationDirs.mangaDownloadsRoot, - applicationDirs.localMangaRoot, + applicationDirs.localMangaRoot ).forEach { File(it).mkdirs() } diff --git a/server/src/test/kotlin/suwayomi/tachidesk/test/TestUtils.kt b/server/src/test/kotlin/suwayomi/tachidesk/test/TestUtils.kt index dffbe8b1..d6b82737 100644 --- a/server/src/test/kotlin/suwayomi/tachidesk/test/TestUtils.kt +++ b/server/src/test/kotlin/suwayomi/tachidesk/test/TestUtils.kt @@ -23,7 +23,9 @@ fun setLoggingEnabled(enabled: Boolean = true) { val logger = (KotlinLogging.logger(Logger.ROOT_LOGGER_NAME).underlyingLogger as ch.qos.logback.classic.Logger) logger.level = if (enabled) { Level.DEBUG - } else Level.ERROR + } else { + Level.ERROR + } } const val BASE_PATH = "build/tmp/TestDesk"