From c23ac5faa800d0d15a1e4dfe06bd1e2ce6191368 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 27 May 2021 02:23:17 +0430 Subject: [PATCH] fix compile issue --- server/src/main/kotlin/suwayomi/server/ServerSetup.kt | 2 +- server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt | 2 +- .../src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt | 4 ++-- server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt | 2 +- server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt | 2 +- server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt | 2 +- server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt | 4 ++-- server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt | 2 +- .../suwayomi/tachidesk/impl/extension/ExtensionsList.kt | 2 +- .../main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/server/ServerSetup.kt index 0fc4227..85ab4ee 100644 --- a/server/src/main/kotlin/suwayomi/server/ServerSetup.kt +++ b/server/src/main/kotlin/suwayomi/server/ServerSetup.kt @@ -13,9 +13,9 @@ import org.kodein.di.DI import org.kodein.di.bind import org.kodein.di.conf.global import org.kodein.di.singleton +import suwayomi.server.database.databaseUp import suwayomi.server.util.AppMutex.handleAppMutex import suwayomi.server.util.SystemTray.systemTray -import suwayomi.tachidesk.model.database.databaseUp import xyz.nulldev.androidcompat.AndroidCompat import xyz.nulldev.androidcompat.AndroidCompatInitializer import xyz.nulldev.ts.config.ApplicationRootDir diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt index 07323bb..c242692 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt @@ -15,10 +15,10 @@ import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.update import suwayomi.tachidesk.impl.CategoryManga.removeMangaFromCategory +import suwayomi.tachidesk.model.dataclass.CategoryDataClass import suwayomi.tachidesk.model.table.CategoryMangaTable import suwayomi.tachidesk.model.table.CategoryTable import suwayomi.tachidesk.model.table.toDataClass -import suwayomi.tachidesk.model.dataclass.CategoryDataClass object Category { /** diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt index b5fc39c..48a08ab 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt @@ -14,12 +14,12 @@ import org.jetbrains.exposed.sql.insert import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.update +import suwayomi.tachidesk.model.dataclass.CategoryDataClass +import suwayomi.tachidesk.model.dataclass.MangaDataClass import suwayomi.tachidesk.model.table.CategoryMangaTable import suwayomi.tachidesk.model.table.CategoryTable import suwayomi.tachidesk.model.table.MangaTable import suwayomi.tachidesk.model.table.toDataClass -import suwayomi.tachidesk.model.dataclass.CategoryDataClass -import suwayomi.tachidesk.model.dataclass.MangaDataClass object CategoryManga { fun addMangaToCategory(mangaId: Int, categoryId: Int) { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt index 2ddc753..012ab20 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt @@ -19,11 +19,11 @@ import org.jetbrains.exposed.sql.update import suwayomi.tachidesk.impl.Manga.getManga import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource import suwayomi.tachidesk.impl.util.lang.awaitSingle +import suwayomi.tachidesk.model.dataclass.ChapterDataClass import suwayomi.tachidesk.model.table.ChapterTable import suwayomi.tachidesk.model.table.MangaTable import suwayomi.tachidesk.model.table.PageTable import suwayomi.tachidesk.model.table.toDataClass -import suwayomi.tachidesk.model.dataclass.ChapterDataClass object Chapter { /** get chapter list when showing a manga */ diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt index da1b8de..2c03f33 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt @@ -14,11 +14,11 @@ import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.transactions.transaction import org.jetbrains.exposed.sql.update import suwayomi.tachidesk.impl.Manga.getManga +import suwayomi.tachidesk.model.dataclass.MangaDataClass import suwayomi.tachidesk.model.table.CategoryMangaTable import suwayomi.tachidesk.model.table.CategoryTable import suwayomi.tachidesk.model.table.MangaTable import suwayomi.tachidesk.model.table.toDataClass -import suwayomi.tachidesk.model.dataclass.MangaDataClass object Library { // TODO: `Category.isLanding` is to handle the default categories a new library manga gets, diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt index 448d8e1..08ff1ab 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt @@ -23,9 +23,9 @@ import suwayomi.tachidesk.impl.util.lang.awaitSingle import suwayomi.tachidesk.impl.util.network.await import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.clearCachedImage import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse +import suwayomi.tachidesk.model.dataclass.MangaDataClass import suwayomi.tachidesk.model.table.MangaStatus import suwayomi.tachidesk.model.table.MangaTable -import suwayomi.tachidesk.model.dataclass.MangaDataClass import java.io.InputStream object Manga { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt index 5a64b6e..b3359c0 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt @@ -13,10 +13,10 @@ import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.transactions.transaction import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource import suwayomi.tachidesk.impl.util.lang.awaitSingle -import suwayomi.tachidesk.model.table.MangaStatus -import suwayomi.tachidesk.model.table.MangaTable import suwayomi.tachidesk.model.dataclass.MangaDataClass import suwayomi.tachidesk.model.dataclass.PagedMangaListDataClass +import suwayomi.tachidesk.model.table.MangaStatus +import suwayomi.tachidesk.model.table.MangaTable object MangaList { fun proxyThumbnailUrl(mangaId: Int): String { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt index 4eca218..4c1d43d 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt @@ -13,9 +13,9 @@ import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.transactions.transaction import suwayomi.tachidesk.impl.extension.Extension.getExtensionIconUrl import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource +import suwayomi.tachidesk.model.dataclass.SourceDataClass import suwayomi.tachidesk.model.table.ExtensionTable import suwayomi.tachidesk.model.table.SourceTable -import suwayomi.tachidesk.model.dataclass.SourceDataClass object Source { private val logger = KotlinLogging.logger {} diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/ExtensionsList.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/ExtensionsList.kt index 6142101..cdeec04 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/ExtensionsList.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/ExtensionsList.kt @@ -17,8 +17,8 @@ import org.jetbrains.exposed.sql.update import suwayomi.tachidesk.impl.extension.Extension.getExtensionIconUrl import suwayomi.tachidesk.impl.extension.github.ExtensionGithubApi import suwayomi.tachidesk.impl.extension.github.OnlineExtension -import suwayomi.tachidesk.model.table.ExtensionTable import suwayomi.tachidesk.model.dataclass.ExtensionDataClass +import suwayomi.tachidesk.model.table.ExtensionTable import java.util.concurrent.ConcurrentHashMap object ExtensionsList { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt index be0280b..45d1e58 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt @@ -11,8 +11,8 @@ import eu.kanade.tachiyomi.source.model.SManga import org.jetbrains.exposed.dao.id.IntIdTable import org.jetbrains.exposed.sql.ResultRow import suwayomi.tachidesk.impl.MangaList.proxyThumbnailUrl -import suwayomi.tachidesk.model.table.MangaStatus.Companion import suwayomi.tachidesk.model.dataclass.MangaDataClass +import suwayomi.tachidesk.model.table.MangaStatus.Companion object MangaTable : IntIdTable() { val url = varchar("url", 2048)