From 60565729caf0e8aad4587c4cae10281ece24d580 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Fri, 4 Jun 2021 13:35:07 +0430 Subject: [PATCH] lint by linter --- server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Anime.kt | 2 +- .../suwayomi/tachidesk/anime/impl/extension/Extension.kt | 2 +- .../src/main/kotlin/suwayomi/tachidesk/manga/TachideskAPI.kt | 4 ++-- server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt | 2 +- server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt | 2 +- .../suwayomi/tachidesk/manga/impl/extension/Extension.kt | 2 +- .../suwayomi/tachidesk/manga/impl/util/GetHttpSource.kt | 2 +- .../src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt | 2 +- .../src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt | 2 +- .../server/database/migration/M0010_MangaAndChapterMeta.kt | 2 +- server/src/test/kotlin/suwayomi/TestExtensions.kt | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Anime.kt b/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Anime.kt index 3c296df7..5fb0c589 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Anime.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Anime.kt @@ -21,11 +21,11 @@ import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource import suwayomi.tachidesk.anime.model.dataclass.AnimeDataClass import suwayomi.tachidesk.anime.model.table.AnimeStatus import suwayomi.tachidesk.anime.model.table.AnimeTable -import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle import suwayomi.tachidesk.manga.impl.util.network.await import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.clearCachedImage import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse +import suwayomi.tachidesk.server.ApplicationDirs import java.io.InputStream object Anime { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/Extension.kt b/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/Extension.kt index df3fa39f..8155ae6c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/Extension.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/Extension.kt @@ -39,9 +39,9 @@ import suwayomi.tachidesk.anime.impl.util.PackageTools.loadExtensionSources import suwayomi.tachidesk.anime.impl.util.PackageTools.trustedSignatures import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable import suwayomi.tachidesk.anime.model.table.AnimeSourceTable -import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.manga.impl.util.network.await import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse +import suwayomi.tachidesk.server.ApplicationDirs import uy.kohesive.injekt.injectLazy import java.io.File import java.io.InputStream diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/TachideskAPI.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/TachideskAPI.kt index 8c28db24..88421c6b 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/TachideskAPI.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/TachideskAPI.kt @@ -8,8 +8,6 @@ package suwayomi.tachidesk.manga * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import io.javalin.Javalin -import suwayomi.tachidesk.server.JavalinSetup.future -import suwayomi.tachidesk.server.impl.About import suwayomi.tachidesk.manga.impl.Category import suwayomi.tachidesk.manga.impl.CategoryManga.addMangaToCategory import suwayomi.tachidesk.manga.impl.CategoryManga.getCategoryMangaList @@ -41,6 +39,8 @@ import suwayomi.tachidesk.manga.impl.extension.Extension.installExtension import suwayomi.tachidesk.manga.impl.extension.Extension.uninstallExtension import suwayomi.tachidesk.manga.impl.extension.Extension.updateExtension import suwayomi.tachidesk.manga.impl.extension.ExtensionsList.getExtensionList +import suwayomi.tachidesk.server.JavalinSetup.future +import suwayomi.tachidesk.server.impl.About import java.text.SimpleDateFormat import java.util.Date 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 961b8408..e2139b40 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt @@ -18,7 +18,6 @@ import org.jetbrains.exposed.sql.update import org.kodein.di.DI import org.kodein.di.conf.global import org.kodein.di.instance -import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl import suwayomi.tachidesk.manga.impl.Source.getSource import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource @@ -30,6 +29,7 @@ import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass import suwayomi.tachidesk.manga.model.table.MangaMetaTable import suwayomi.tachidesk.manga.model.table.MangaStatus import suwayomi.tachidesk.manga.model.table.MangaTable +import suwayomi.tachidesk.server.ApplicationDirs import java.io.InputStream object Manga { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt index 3ac698bf..9b3cac6f 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt @@ -16,7 +16,6 @@ import org.jetbrains.exposed.sql.update import org.kodein.di.DI import org.kodein.di.conf.global import org.kodein.di.instance -import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse @@ -24,6 +23,7 @@ import suwayomi.tachidesk.manga.impl.util.storage.SafePath import suwayomi.tachidesk.manga.model.table.ChapterTable import suwayomi.tachidesk.manga.model.table.MangaTable import suwayomi.tachidesk.manga.model.table.PageTable +import suwayomi.tachidesk.server.ApplicationDirs import java.io.File import java.io.InputStream 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 250a7138..253285f3 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 @@ -25,7 +25,6 @@ import org.jetbrains.exposed.sql.update import org.kodein.di.DI import org.kodein.di.conf.global import org.kodein.di.instance -import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.manga.impl.extension.ExtensionsList.extensionTableAsDataClass import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi import suwayomi.tachidesk.manga.impl.util.PackageTools.EXTENSION_FEATURE @@ -42,6 +41,7 @@ import suwayomi.tachidesk.manga.impl.util.network.await import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse import suwayomi.tachidesk.manga.model.table.ExtensionTable import suwayomi.tachidesk.manga.model.table.SourceTable +import suwayomi.tachidesk.server.ApplicationDirs import uy.kohesive.injekt.injectLazy import java.io.File import java.io.InputStream diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/GetHttpSource.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/GetHttpSource.kt index 5166b9a2..09ec499c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/GetHttpSource.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/GetHttpSource.kt @@ -15,10 +15,10 @@ import org.jetbrains.exposed.sql.transactions.transaction import org.kodein.di.DI import org.kodein.di.conf.global import org.kodein.di.instance -import suwayomi.tachidesk.server.ApplicationDirs import suwayomi.tachidesk.manga.impl.util.PackageTools.loadExtensionSources import suwayomi.tachidesk.manga.model.table.ExtensionTable import suwayomi.tachidesk.manga.model.table.SourceTable +import suwayomi.tachidesk.server.ApplicationDirs import java.util.concurrent.ConcurrentHashMap object GetHttpSource { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt index a7683262..be351f28 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt @@ -7,8 +7,8 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.future.future import mu.KotlinLogging import suwayomi.tachidesk.anime.AnimeAPI -import suwayomi.tachidesk.server.util.Browser import suwayomi.tachidesk.manga.TachideskAPI +import suwayomi.tachidesk.server.util.Browser import java.io.IOException import java.util.concurrent.CompletableFuture import kotlin.concurrent.thread diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt index 1c75a389..867103a2 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt @@ -65,7 +65,7 @@ fun applicationSetup() { // register Tachidesk's config which is dubbed "ServerConfig" GlobalConfigManager.registerModule( - ServerConfig.register(GlobalConfigManager.config) + ServerConfig.register(GlobalConfigManager.config) ) // Make sure only one instance of the app is running diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0010_MangaAndChapterMeta.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0010_MangaAndChapterMeta.kt index a3355356..c47e74bf 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0010_MangaAndChapterMeta.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0010_MangaAndChapterMeta.kt @@ -4,9 +4,9 @@ import org.jetbrains.exposed.dao.id.IntIdTable import org.jetbrains.exposed.sql.ReferenceOption import org.jetbrains.exposed.sql.SchemaUtils import org.jetbrains.exposed.sql.transactions.transaction -import suwayomi.tachidesk.server.database.migration.lib.Migration import suwayomi.tachidesk.manga.model.table.ChapterTable import suwayomi.tachidesk.manga.model.table.MangaTable +import suwayomi.tachidesk.server.database.migration.lib.Migration /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/test/kotlin/suwayomi/TestExtensions.kt b/server/src/test/kotlin/suwayomi/TestExtensions.kt index 725fa3be..cc484726 100644 --- a/server/src/test/kotlin/suwayomi/TestExtensions.kt +++ b/server/src/test/kotlin/suwayomi/TestExtensions.kt @@ -21,7 +21,6 @@ import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import rx.Observable -import suwayomi.tachidesk.server.applicationSetup import suwayomi.tachidesk.manga.impl.Source.getSourceList import suwayomi.tachidesk.manga.impl.extension.Extension.installExtension import suwayomi.tachidesk.manga.impl.extension.Extension.uninstallExtension @@ -30,6 +29,7 @@ import suwayomi.tachidesk.manga.impl.extension.ExtensionsList.getExtensionList import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle import suwayomi.tachidesk.manga.model.dataclass.ExtensionDataClass +import suwayomi.tachidesk.server.applicationSetup import java.io.File @TestInstance(TestInstance.Lifecycle.PER_CLASS)