move all packages to 'suwayomi.tachidesk'

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ApplicationRootDir.kt

@@ -12,7 +12,7 @@ import net.harawata.appdirs.AppDirsFactory
 val ApplicationRootDir: String
     get(): String {
         return System.getProperty(
-                "suwayomi.server.rootDir",
+                "suwayomi.tachidesk.server.rootDir",
                 AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
         )
     }

AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/Logging.kt

@@ -17,4 +17,4 @@ fun setLogLevel(level: Level) {
 }
 
 fun debugLogsEnabled(config: Config)
-    = System.getProperty("suwayomi.server.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()
+    = System.getProperty("suwayomi.tachidesk.server.debugLogsEnabled", config.getString("server.debugLogsEnabled")).toBoolean()

scripts/resources/Tachidesk Debug Launcher.bat

@@ -1 +1 @@
-jre\bin\java -Dsuwayomi.server.debugLogsEnabled=true -jar  Tachidesk.jar
+jre\bin\java -Dsuwayomi.tachidesk.server.debugLogsEnabled=true -jar  Tachidesk.jar

scripts/resources/Tachidesk Electron Launcher.bat

@@ -1 +1 @@
-jre\bin\javaw "-Dsuwayomi.server.webInterface=electron" "-Dsuwayomi.server.electronPath=electron/electron.exe" -jar Tachidesk.jar
+jre\bin\javaw "-Dsuwayomi.tachidesk.server.webInterface=electron" "-Dsuwayomi.tachidesk.server.electronPath=electron/electron.exe" -jar Tachidesk.jar

server/build.gradle.kts

@@ -73,7 +73,7 @@ dependencies {
     testImplementation(kotlin("test-junit5"))
 }
 
-val MainClass = "suwayomi.MainKt"
+val MainClass = "suwayomi.tachidesk.MainKt"
 application {
     mainClass.set(MainClass)
 

server/src/main/kotlin/suwayomi/tachidesk/Main.kt

@@ -1,4 +1,4 @@
-package suwayomi
+package suwayomi.tachidesk
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -7,8 +7,8 @@ package suwayomi
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import suwayomi.server.JavalinSetup.javalinSetup
+import suwayomi.tachidesk.server.JavalinSetup.javalinSetup
-import suwayomi.server.applicationSetup
+import suwayomi.tachidesk.server.applicationSetup
 
 fun main() {
     applicationSetup()

server/src/main/kotlin/suwayomi/tachidesk/anime/AnimeAPI.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime
+package suwayomi.tachidesk.anime
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -8,20 +8,20 @@ package suwayomi.anime
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import io.javalin.Javalin
-import suwayomi.anime.impl.Anime.getAnime
+import suwayomi.tachidesk.anime.impl.Anime.getAnime
-import suwayomi.anime.impl.Anime.getAnimeThumbnail
+import suwayomi.tachidesk.anime.impl.Anime.getAnimeThumbnail
-import suwayomi.anime.impl.AnimeList.getAnimeList
+import suwayomi.tachidesk.anime.impl.AnimeList.getAnimeList
-import suwayomi.anime.impl.Episode.getEpisode
+import suwayomi.tachidesk.anime.impl.Episode.getEpisode
-import suwayomi.anime.impl.Episode.getEpisodeList
+import suwayomi.tachidesk.anime.impl.Episode.getEpisodeList
-import suwayomi.anime.impl.Episode.modifyEpisode
+import suwayomi.tachidesk.anime.impl.Episode.modifyEpisode
-import suwayomi.anime.impl.Source.getAnimeSource
+import suwayomi.tachidesk.anime.impl.Source.getAnimeSource
-import suwayomi.anime.impl.Source.getSourceList
+import suwayomi.tachidesk.anime.impl.Source.getSourceList
-import suwayomi.anime.impl.extension.Extension.getExtensionIcon
+import suwayomi.tachidesk.anime.impl.extension.Extension.getExtensionIcon
-import suwayomi.anime.impl.extension.Extension.installExtension
+import suwayomi.tachidesk.anime.impl.extension.Extension.installExtension
-import suwayomi.anime.impl.extension.Extension.uninstallExtension
+import suwayomi.tachidesk.anime.impl.extension.Extension.uninstallExtension
-import suwayomi.anime.impl.extension.Extension.updateExtension
+import suwayomi.tachidesk.anime.impl.extension.Extension.updateExtension
-import suwayomi.anime.impl.extension.ExtensionsList.getExtensionList
+import suwayomi.tachidesk.anime.impl.extension.ExtensionsList.getExtensionList
-import suwayomi.server.JavalinSetup.future
+import suwayomi.tachidesk.server.JavalinSetup.future
 
 object AnimeAPI {
     fun defineEndpoints(app: Javalin) {

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Anime.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl
+package suwayomi.tachidesk.anime.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -15,17 +15,17 @@ import org.jetbrains.exposed.sql.update
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import org.kodein.di.instance
-import suwayomi.anime.impl.AnimeList.proxyThumbnailUrl
+import suwayomi.tachidesk.anime.impl.AnimeList.proxyThumbnailUrl
-import suwayomi.anime.impl.Source.getAnimeSource
+import suwayomi.tachidesk.anime.impl.Source.getAnimeSource
-import suwayomi.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
+import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
-import suwayomi.anime.model.dataclass.AnimeDataClass
+import suwayomi.tachidesk.anime.model.dataclass.AnimeDataClass
-import suwayomi.anime.model.table.AnimeStatus
+import suwayomi.tachidesk.anime.model.table.AnimeStatus
-import suwayomi.anime.model.table.AnimeTable
+import suwayomi.tachidesk.anime.model.table.AnimeTable
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.impl.util.network.await
+import suwayomi.tachidesk.manga.impl.util.network.await
-import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.clearCachedImage
+import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.clearCachedImage
-import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse
+import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
 import java.io.InputStream
 
 object Anime {

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/AnimeList.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl
+package suwayomi.tachidesk.anime.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,12 +11,12 @@ import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
+import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
-import suwayomi.anime.model.dataclass.AnimeDataClass
+import suwayomi.tachidesk.anime.model.dataclass.AnimeDataClass
-import suwayomi.anime.model.dataclass.PagedAnimeListDataClass
+import suwayomi.tachidesk.anime.model.dataclass.PagedAnimeListDataClass
-import suwayomi.anime.model.table.AnimeStatus
+import suwayomi.tachidesk.anime.model.table.AnimeStatus
-import suwayomi.anime.model.table.AnimeTable
+import suwayomi.tachidesk.anime.model.table.AnimeTable
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 
 object AnimeList {
     fun proxyThumbnailUrl(animeId: Int): String {

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Episode.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl
+package suwayomi.tachidesk.anime.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -16,13 +16,13 @@ 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.anime.impl.Anime.getAnime
+import suwayomi.tachidesk.anime.impl.Anime.getAnime
-import suwayomi.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
+import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
-import suwayomi.anime.model.dataclass.EpisodeDataClass
+import suwayomi.tachidesk.anime.model.dataclass.EpisodeDataClass
-import suwayomi.anime.model.table.AnimeTable
+import suwayomi.tachidesk.anime.model.table.AnimeTable
-import suwayomi.anime.model.table.EpisodeTable
+import suwayomi.tachidesk.anime.model.table.EpisodeTable
-import suwayomi.anime.model.table.toDataClass
+import suwayomi.tachidesk.anime.model.table.toDataClass
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 
 object Episode {
     /** get episode list when showing an anime */

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/Source.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl
+package suwayomi.tachidesk.anime.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,11 +11,11 @@ import mu.KotlinLogging
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.anime.impl.extension.Extension.getExtensionIconUrl
+import suwayomi.tachidesk.anime.impl.extension.Extension.getExtensionIconUrl
-import suwayomi.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
+import suwayomi.tachidesk.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
-import suwayomi.anime.model.dataclass.AnimeSourceDataClass
+import suwayomi.tachidesk.anime.model.dataclass.AnimeSourceDataClass
-import suwayomi.anime.model.table.AnimeExtensionTable
+import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
-import suwayomi.anime.model.table.AnimeSourceTable
+import suwayomi.tachidesk.anime.model.table.AnimeSourceTable
 
 object Source {
     private val logger = KotlinLogging.logger {}

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/Extension.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl.extension
+package suwayomi.tachidesk.anime.impl.extension
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -25,23 +25,23 @@ import org.jetbrains.exposed.sql.update
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import org.kodein.di.instance
-import suwayomi.anime.impl.extension.ExtensionsList.extensionTableAsDataClass
+import suwayomi.tachidesk.anime.impl.extension.ExtensionsList.extensionTableAsDataClass
-import suwayomi.anime.impl.extension.github.ExtensionGithubApi
+import suwayomi.tachidesk.anime.impl.extension.github.ExtensionGithubApi
-import suwayomi.anime.impl.util.PackageTools.EXTENSION_FEATURE
+import suwayomi.tachidesk.anime.impl.util.PackageTools.EXTENSION_FEATURE
-import suwayomi.anime.impl.util.PackageTools.LIB_VERSION_MAX
+import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MAX
-import suwayomi.anime.impl.util.PackageTools.LIB_VERSION_MIN
+import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MIN
-import suwayomi.anime.impl.util.PackageTools.METADATA_NSFW
+import suwayomi.tachidesk.anime.impl.util.PackageTools.METADATA_NSFW
-import suwayomi.anime.impl.util.PackageTools.METADATA_SOURCE_CLASS
+import suwayomi.tachidesk.anime.impl.util.PackageTools.METADATA_SOURCE_CLASS
-import suwayomi.anime.impl.util.PackageTools.dex2jar
+import suwayomi.tachidesk.anime.impl.util.PackageTools.dex2jar
-import suwayomi.anime.impl.util.PackageTools.getPackageInfo
+import suwayomi.tachidesk.anime.impl.util.PackageTools.getPackageInfo
-import suwayomi.anime.impl.util.PackageTools.getSignatureHash
+import suwayomi.tachidesk.anime.impl.util.PackageTools.getSignatureHash
-import suwayomi.anime.impl.util.PackageTools.loadExtensionSources
+import suwayomi.tachidesk.anime.impl.util.PackageTools.loadExtensionSources
-import suwayomi.anime.impl.util.PackageTools.trustedSignatures
+import suwayomi.tachidesk.anime.impl.util.PackageTools.trustedSignatures
-import suwayomi.anime.model.table.AnimeExtensionTable
+import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
-import suwayomi.anime.model.table.AnimeSourceTable
+import suwayomi.tachidesk.anime.model.table.AnimeSourceTable
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
-import suwayomi.tachidesk.impl.util.network.await
+import suwayomi.tachidesk.manga.impl.util.network.await
-import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse
+import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.io.InputStream

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/ExtensionsList.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl.extension
+package suwayomi.tachidesk.anime.impl.extension
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -14,11 +14,11 @@ import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.anime.impl.extension.Extension.getExtensionIconUrl
+import suwayomi.tachidesk.anime.impl.extension.Extension.getExtensionIconUrl
-import suwayomi.anime.impl.extension.github.ExtensionGithubApi
+import suwayomi.tachidesk.anime.impl.extension.github.ExtensionGithubApi
-import suwayomi.anime.impl.extension.github.OnlineExtension
+import suwayomi.tachidesk.anime.impl.extension.github.OnlineExtension
-import suwayomi.anime.model.dataclass.AnimeExtensionDataClass
+import suwayomi.tachidesk.anime.model.dataclass.AnimeExtensionDataClass
-import suwayomi.anime.model.table.AnimeExtensionTable
+import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
 import java.util.concurrent.ConcurrentHashMap
 
 object ExtensionsList {

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/github/ExtensionGithubApi.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl.extension.github
+package suwayomi.tachidesk.anime.impl.extension.github
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -13,10 +13,10 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.network.NetworkHelper
 import okhttp3.Request
-import suwayomi.anime.impl.util.PackageTools.LIB_VERSION_MAX
+import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MAX
-import suwayomi.anime.impl.util.PackageTools.LIB_VERSION_MIN
+import suwayomi.tachidesk.anime.impl.util.PackageTools.LIB_VERSION_MIN
-import suwayomi.anime.model.dataclass.AnimeExtensionDataClass
+import suwayomi.tachidesk.anime.model.dataclass.AnimeExtensionDataClass
-import suwayomi.tachidesk.impl.util.network.UnzippingInterceptor
+import suwayomi.tachidesk.manga.impl.util.network.UnzippingInterceptor
 import uy.kohesive.injekt.injectLazy
 
 object ExtensionGithubApi {

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/extension/github/OnlineExtension.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl.extension.github
+package suwayomi.tachidesk.anime.impl.extension.github
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/util/GetAnimeHttpSource.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl.util
+package suwayomi.tachidesk.anime.impl.util
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -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.anime.impl.util.PackageTools.loadExtensionSources
+import suwayomi.tachidesk.anime.impl.util.PackageTools.loadExtensionSources
-import suwayomi.anime.model.table.AnimeExtensionTable
+import suwayomi.tachidesk.anime.model.table.AnimeExtensionTable
-import suwayomi.anime.model.table.AnimeSourceTable
+import suwayomi.tachidesk.anime.model.table.AnimeSourceTable
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
 import java.util.concurrent.ConcurrentHashMap
 
 object GetAnimeHttpSource {

server/src/main/kotlin/suwayomi/tachidesk/anime/impl/util/PackageTools.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.impl.util
+package suwayomi.tachidesk.anime.impl.util
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -22,7 +22,7 @@ import org.kodein.di.conf.global
 import org.kodein.di.instance
 import org.w3c.dom.Element
 import org.w3c.dom.Node
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
 import xyz.nulldev.androidcompat.pm.InstalledPackage.Companion.toList
 import xyz.nulldev.androidcompat.pm.toPackageInfo
 import java.io.File

server/src/main/kotlin/suwayomi/tachidesk/anime/model/dataclass/AnimeDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.dataclass
+package suwayomi.tachidesk.anime.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -7,7 +7,7 @@ package suwayomi.anime.model.dataclass
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import suwayomi.anime.model.table.AnimeStatus
+import suwayomi.tachidesk.anime.model.table.AnimeStatus
 
 data class AnimeDataClass(
     val id: Int,

server/src/main/kotlin/suwayomi/tachidesk/anime/model/dataclass/AnimeExtensionDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.dataclass
+package suwayomi.tachidesk.anime.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/anime/model/dataclass/AnimeSourceDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.dataclass
+package suwayomi.tachidesk.anime.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/anime/model/dataclass/EpisodeDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.dataclass
+package suwayomi.tachidesk.anime.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/anime/model/table/AnimeExtensionTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.table
+package suwayomi.tachidesk.anime.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/anime/model/table/AnimeSourceTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.table
+package suwayomi.tachidesk.anime.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/anime/model/table/AnimeTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.table
+package suwayomi.tachidesk.anime.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -10,9 +10,9 @@ package suwayomi.anime.model.table
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.impl.MangaList.proxyThumbnailUrl
+import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
-import suwayomi.tachidesk.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.model.table.MangaStatus.Companion
+import suwayomi.tachidesk.manga.model.table.MangaStatus.Companion
 
 object AnimeTable : IntIdTable() {
     val url = varchar("url", 2048)

server/src/main/kotlin/suwayomi/tachidesk/anime/model/table/EpisodeTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.anime.model.table
+package suwayomi.tachidesk.anime.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,7 +11,7 @@ import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ResultRow
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.anime.model.dataclass.EpisodeDataClass
+import suwayomi.tachidesk.anime.model.dataclass.EpisodeDataClass
 
 object EpisodeTable : IntIdTable() {
     val url = varchar("url", 2048)

server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/models/DHistory.kt

@@ -1,3 +0,0 @@
-package suwayomi.tachidesk.impl.backup.legacy.models
-
-data class DHistory(val url: String, val lastRead: Long)

server/src/main/kotlin/suwayomi/tachidesk/manga/TachideskAPI.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk
+package suwayomi.tachidesk.manga
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -8,39 +8,39 @@ package suwayomi.tachidesk
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import io.javalin.Javalin
-import suwayomi.server.JavalinSetup.future
+import suwayomi.tachidesk.server.JavalinSetup.future
-import suwayomi.server.impl.About
+import suwayomi.tachidesk.server.impl.About
-import suwayomi.tachidesk.impl.Category
+import suwayomi.tachidesk.manga.impl.Category
-import suwayomi.tachidesk.impl.CategoryManga.addMangaToCategory
+import suwayomi.tachidesk.manga.impl.CategoryManga.addMangaToCategory
-import suwayomi.tachidesk.impl.CategoryManga.getCategoryMangaList
+import suwayomi.tachidesk.manga.impl.CategoryManga.getCategoryMangaList
-import suwayomi.tachidesk.impl.CategoryManga.getMangaCategories
+import suwayomi.tachidesk.manga.impl.CategoryManga.getMangaCategories
-import suwayomi.tachidesk.impl.CategoryManga.removeMangaFromCategory
+import suwayomi.tachidesk.manga.impl.CategoryManga.removeMangaFromCategory
-import suwayomi.tachidesk.impl.Chapter.getChapter
+import suwayomi.tachidesk.manga.impl.Chapter.getChapter
-import suwayomi.tachidesk.impl.Chapter.getChapterList
+import suwayomi.tachidesk.manga.impl.Chapter.getChapterList
-import suwayomi.tachidesk.impl.Chapter.modifyChapter
+import suwayomi.tachidesk.manga.impl.Chapter.modifyChapter
-import suwayomi.tachidesk.impl.Chapter.modifyChapterMeta
+import suwayomi.tachidesk.manga.impl.Chapter.modifyChapterMeta
-import suwayomi.tachidesk.impl.Library.addMangaToLibrary
+import suwayomi.tachidesk.manga.impl.Library.addMangaToLibrary
-import suwayomi.tachidesk.impl.Library.getLibraryMangas
+import suwayomi.tachidesk.manga.impl.Library.getLibraryMangas
-import suwayomi.tachidesk.impl.Library.removeMangaFromLibrary
+import suwayomi.tachidesk.manga.impl.Library.removeMangaFromLibrary
-import suwayomi.tachidesk.impl.Manga.getManga
+import suwayomi.tachidesk.manga.impl.Manga.getManga
-import suwayomi.tachidesk.impl.Manga.getMangaThumbnail
+import suwayomi.tachidesk.manga.impl.Manga.getMangaThumbnail
-import suwayomi.tachidesk.impl.Manga.modifyMangaMeta
+import suwayomi.tachidesk.manga.impl.Manga.modifyMangaMeta
-import suwayomi.tachidesk.impl.MangaList.getMangaList
+import suwayomi.tachidesk.manga.impl.MangaList.getMangaList
-import suwayomi.tachidesk.impl.Page.getPageImage
+import suwayomi.tachidesk.manga.impl.Page.getPageImage
-import suwayomi.tachidesk.impl.Search.sourceFilters
+import suwayomi.tachidesk.manga.impl.Search.sourceFilters
-import suwayomi.tachidesk.impl.Search.sourceGlobalSearch
+import suwayomi.tachidesk.manga.impl.Search.sourceGlobalSearch
-import suwayomi.tachidesk.impl.Search.sourceSearch
+import suwayomi.tachidesk.manga.impl.Search.sourceSearch
-import suwayomi.tachidesk.impl.Source.getSource
+import suwayomi.tachidesk.manga.impl.Source.getSource
-import suwayomi.tachidesk.impl.Source.getSourceList
+import suwayomi.tachidesk.manga.impl.Source.getSourceList
-import suwayomi.tachidesk.impl.backup.BackupFlags
+import suwayomi.tachidesk.manga.impl.backup.BackupFlags
-import suwayomi.tachidesk.impl.backup.legacy.LegacyBackupExport.createLegacyBackup
+import suwayomi.tachidesk.manga.impl.backup.legacy.LegacyBackupExport.createLegacyBackup
-import suwayomi.tachidesk.impl.backup.legacy.LegacyBackupImport.restoreLegacyBackup
+import suwayomi.tachidesk.manga.impl.backup.legacy.LegacyBackupImport.restoreLegacyBackup
-import suwayomi.tachidesk.impl.download.DownloadManager
+import suwayomi.tachidesk.manga.impl.download.DownloadManager
-import suwayomi.tachidesk.impl.extension.Extension.getExtensionIcon
+import suwayomi.tachidesk.manga.impl.extension.Extension.getExtensionIcon
-import suwayomi.tachidesk.impl.extension.Extension.installExtension
+import suwayomi.tachidesk.manga.impl.extension.Extension.installExtension
-import suwayomi.tachidesk.impl.extension.Extension.uninstallExtension
+import suwayomi.tachidesk.manga.impl.extension.Extension.uninstallExtension
-import suwayomi.tachidesk.impl.extension.Extension.updateExtension
+import suwayomi.tachidesk.manga.impl.extension.Extension.updateExtension
-import suwayomi.tachidesk.impl.extension.ExtensionsList.getExtensionList
+import suwayomi.tachidesk.manga.impl.extension.ExtensionsList.getExtensionList
 import java.text.SimpleDateFormat
 import java.util.Date
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -14,11 +14,11 @@ import org.jetbrains.exposed.sql.select
 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.manga.impl.CategoryManga.removeMangaFromCategory
-import suwayomi.tachidesk.model.dataclass.CategoryDataClass
+import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
-import suwayomi.tachidesk.model.table.CategoryMangaTable
+import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.model.table.CategoryTable
+import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.model.table.toDataClass
+import suwayomi.tachidesk.manga.model.table.toDataClass
 
 object Category {
     /**

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -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.manga.model.dataclass.CategoryDataClass
-import suwayomi.tachidesk.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.model.table.CategoryMangaTable
+import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.model.table.CategoryTable
+import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.model.table.toDataClass
+import suwayomi.tachidesk.manga.model.table.toDataClass
 
 object CategoryManga {
     fun addMangaToCategory(mangaId: Int, categoryId: Int) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -17,15 +17,15 @@ 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.impl.Manga.getManga
+import suwayomi.tachidesk.manga.impl.Manga.getManga
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.model.dataclass.ChapterDataClass
+import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
-import suwayomi.tachidesk.model.table.ChapterMetaTable
+import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
-import suwayomi.tachidesk.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.model.table.PageTable
+import suwayomi.tachidesk.manga.model.table.PageTable
-import suwayomi.tachidesk.model.table.toDataClass
+import suwayomi.tachidesk.manga.model.table.toDataClass
 import java.time.Instant
 
 object Chapter {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Library.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -13,12 +13,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.impl.Manga.getManga
+import suwayomi.tachidesk.manga.impl.Manga.getManga
-import suwayomi.tachidesk.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.model.table.CategoryMangaTable
+import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.model.table.CategoryTable
+import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.model.table.toDataClass
+import suwayomi.tachidesk.manga.model.table.toDataClass
 
 object Library {
     // TODO: `Category.isLanding` is to handle the default categories a new library manga gets,

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -18,18 +18,18 @@ import org.jetbrains.exposed.sql.update
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import org.kodein.di.instance
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
-import suwayomi.tachidesk.impl.MangaList.proxyThumbnailUrl
+import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
-import suwayomi.tachidesk.impl.Source.getSource
+import suwayomi.tachidesk.manga.impl.Source.getSource
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.impl.util.network.await
+import suwayomi.tachidesk.manga.impl.util.network.await
-import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.clearCachedImage
+import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.clearCachedImage
-import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse
+import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
-import suwayomi.tachidesk.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.model.table.MangaMetaTable
+import suwayomi.tachidesk.manga.model.table.MangaMetaTable
-import suwayomi.tachidesk.model.table.MangaStatus
+import suwayomi.tachidesk.manga.model.table.MangaStatus
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
 import java.io.InputStream
 
 object Manga {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/MangaList.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,13 +11,13 @@ import eu.kanade.tachiyomi.source.model.MangasPage
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.impl.Manga.getMangaMetaMap
+import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.model.dataclass.PagedMangaListDataClass
+import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
-import suwayomi.tachidesk.model.table.MangaStatus
+import suwayomi.tachidesk.manga.model.table.MangaStatus
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
 
 object MangaList {
     fun proxyThumbnailUrl(mangaId: Int): String {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -16,14 +16,14 @@ import org.jetbrains.exposed.sql.update
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import org.kodein.di.instance
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse
+import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
-import suwayomi.tachidesk.impl.util.storage.SafePath
+import suwayomi.tachidesk.manga.impl.util.storage.SafePath
-import suwayomi.tachidesk.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.model.table.PageTable
+import suwayomi.tachidesk.manga.model.table.PageTable
 import java.io.File
 import java.io.InputStream
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Search.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -7,10 +7,10 @@ package suwayomi.tachidesk.impl
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import suwayomi.tachidesk.impl.MangaList.processEntries
+import suwayomi.tachidesk.manga.impl.MangaList.processEntries
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.model.dataclass.PagedMangaListDataClass
+import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
 
 object Search {
     // TODO

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl
+package suwayomi.tachidesk.manga.impl
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,11 +11,11 @@ import mu.KotlinLogging
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.impl.extension.Extension.getExtensionIconUrl
+import suwayomi.tachidesk.manga.impl.extension.Extension.getExtensionIconUrl
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.model.dataclass.SourceDataClass
+import suwayomi.tachidesk.manga.model.dataclass.SourceDataClass
-import suwayomi.tachidesk.model.table.ExtensionTable
+import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.model.table.SourceTable
+import suwayomi.tachidesk.manga.model.table.SourceTable
 
 object Source {
     private val logger = KotlinLogging.logger {}

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/BackupFlags.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup
+package suwayomi.tachidesk.manga.impl.backup
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupBase.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.legacy
+package suwayomi.tachidesk.manga.impl.backup.legacy
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,16 +11,16 @@ import com.github.salomonbrys.kotson.registerTypeAdapter
 import com.github.salomonbrys.kotson.registerTypeHierarchyAdapter
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
-import suwayomi.tachidesk.impl.backup.legacy.models.DHistory
+import suwayomi.tachidesk.manga.impl.backup.legacy.models.DHistory
-import suwayomi.tachidesk.impl.backup.legacy.serializer.CategoryTypeAdapter
+import suwayomi.tachidesk.manga.impl.backup.legacy.serializer.CategoryTypeAdapter
-import suwayomi.tachidesk.impl.backup.legacy.serializer.ChapterTypeAdapter
+import suwayomi.tachidesk.manga.impl.backup.legacy.serializer.ChapterTypeAdapter
-import suwayomi.tachidesk.impl.backup.legacy.serializer.HistoryTypeAdapter
+import suwayomi.tachidesk.manga.impl.backup.legacy.serializer.HistoryTypeAdapter
-import suwayomi.tachidesk.impl.backup.legacy.serializer.MangaTypeAdapter
+import suwayomi.tachidesk.manga.impl.backup.legacy.serializer.MangaTypeAdapter
-import suwayomi.tachidesk.impl.backup.legacy.serializer.TrackTypeAdapter
+import suwayomi.tachidesk.manga.impl.backup.legacy.serializer.TrackTypeAdapter
-import suwayomi.tachidesk.impl.backup.models.CategoryImpl
+import suwayomi.tachidesk.manga.impl.backup.models.CategoryImpl
-import suwayomi.tachidesk.impl.backup.models.ChapterImpl
+import suwayomi.tachidesk.manga.impl.backup.models.ChapterImpl
-import suwayomi.tachidesk.impl.backup.models.MangaImpl
+import suwayomi.tachidesk.manga.impl.backup.models.MangaImpl
-import suwayomi.tachidesk.impl.backup.models.TrackImpl
+import suwayomi.tachidesk.manga.impl.backup.models.TrackImpl
 import java.util.Date
 
 open class LegacyBackupBase {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupExport.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.legacy
+package suwayomi.tachidesk.manga.impl.backup.legacy
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -14,18 +14,18 @@ import com.google.gson.JsonObject
 import eu.kanade.tachiyomi.source.LocalSource
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.impl.Category.getCategoryList
+import suwayomi.tachidesk.manga.impl.Category.getCategoryList
-import suwayomi.tachidesk.impl.CategoryManga.getMangaCategories
+import suwayomi.tachidesk.manga.impl.CategoryManga.getMangaCategories
-import suwayomi.tachidesk.impl.backup.BackupFlags
+import suwayomi.tachidesk.manga.impl.backup.BackupFlags
-import suwayomi.tachidesk.impl.backup.legacy.models.Backup
+import suwayomi.tachidesk.manga.impl.backup.legacy.models.Backup
-import suwayomi.tachidesk.impl.backup.legacy.models.Backup.CURRENT_VERSION
+import suwayomi.tachidesk.manga.impl.backup.legacy.models.Backup.CURRENT_VERSION
-import suwayomi.tachidesk.impl.backup.models.CategoryImpl
+import suwayomi.tachidesk.manga.impl.backup.models.CategoryImpl
-import suwayomi.tachidesk.impl.backup.models.ChapterImpl
+import suwayomi.tachidesk.manga.impl.backup.models.ChapterImpl
-import suwayomi.tachidesk.impl.backup.models.Manga
+import suwayomi.tachidesk.manga.impl.backup.models.Manga
-import suwayomi.tachidesk.impl.backup.models.MangaImpl
+import suwayomi.tachidesk.manga.impl.backup.models.MangaImpl
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
 
 object LegacyBackupExport : LegacyBackupBase() {
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupImport.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.legacy
+package suwayomi.tachidesk.manga.impl.backup.legacy
 
 import com.github.salomonbrys.kotson.fromJson
 import com.google.gson.JsonArray
@@ -13,22 +13,22 @@ 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.impl.Category.createCategory
+import suwayomi.tachidesk.manga.impl.Category.createCategory
-import suwayomi.tachidesk.impl.Category.getCategoryList
+import suwayomi.tachidesk.manga.impl.Category.getCategoryList
-import suwayomi.tachidesk.impl.backup.legacy.LegacyBackupValidator.ValidationResult
+import suwayomi.tachidesk.manga.impl.backup.legacy.LegacyBackupValidator.ValidationResult
-import suwayomi.tachidesk.impl.backup.legacy.LegacyBackupValidator.validate
+import suwayomi.tachidesk.manga.impl.backup.legacy.LegacyBackupValidator.validate
-import suwayomi.tachidesk.impl.backup.legacy.models.Backup
+import suwayomi.tachidesk.manga.impl.backup.legacy.models.Backup
-import suwayomi.tachidesk.impl.backup.legacy.models.DHistory
+import suwayomi.tachidesk.manga.impl.backup.legacy.models.DHistory
-import suwayomi.tachidesk.impl.backup.models.CategoryImpl
+import suwayomi.tachidesk.manga.impl.backup.models.CategoryImpl
-import suwayomi.tachidesk.impl.backup.models.Chapter
+import suwayomi.tachidesk.manga.impl.backup.models.Chapter
-import suwayomi.tachidesk.impl.backup.models.ChapterImpl
+import suwayomi.tachidesk.manga.impl.backup.models.ChapterImpl
-import suwayomi.tachidesk.impl.backup.models.Manga
+import suwayomi.tachidesk.manga.impl.backup.models.Manga
-import suwayomi.tachidesk.impl.backup.models.MangaImpl
+import suwayomi.tachidesk.manga.impl.backup.models.MangaImpl
-import suwayomi.tachidesk.impl.backup.models.Track
+import suwayomi.tachidesk.manga.impl.backup.models.Track
-import suwayomi.tachidesk.impl.backup.models.TrackImpl
+import suwayomi.tachidesk.manga.impl.backup.models.TrackImpl
-import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
+import suwayomi.tachidesk.manga.impl.util.GetHttpSource.getHttpSource
-import suwayomi.tachidesk.impl.util.lang.awaitSingle
+import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
 import java.io.InputStream
 import java.util.Date
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupValidator.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.legacy
+package suwayomi.tachidesk.manga.impl.backup.legacy
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -10,8 +10,8 @@ package suwayomi.tachidesk.impl.backup.legacy
 import com.google.gson.JsonObject
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.impl.backup.legacy.models.Backup
+import suwayomi.tachidesk.manga.impl.backup.legacy.models.Backup
-import suwayomi.tachidesk.model.table.SourceTable
+import suwayomi.tachidesk.manga.model.table.SourceTable
 
 object LegacyBackupValidator {
     data class ValidationResult(val missingSources: List<String>, val missingTrackers: List<String>)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/models/Backup.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.legacy.models
+package suwayomi.tachidesk.manga.impl.backup.legacy.models
 
 import java.text.SimpleDateFormat
 import java.util.Date

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/models/DHistory.kt

@@ -0,0 +1,3 @@
+package suwayomi.tachidesk.manga.impl.backup.legacy.models
+
+data class DHistory(val url: String, val lastRead: Long)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/serializer/CategoryTypeAdapter.kt

@@ -1,8 +1,8 @@
-package suwayomi.tachidesk.impl.backup.legacy.serializer
+package suwayomi.tachidesk.manga.impl.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
-import suwayomi.tachidesk.impl.backup.models.CategoryImpl
+import suwayomi.tachidesk.manga.impl.backup.models.CategoryImpl
 
 /**
  * JSON Serializer used to write / read [CategoryImpl] to / from json

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/serializer/ChapterTypeAdapter.kt

@@ -1,9 +1,9 @@
-package suwayomi.tachidesk.impl.backup.legacy.serializer
+package suwayomi.tachidesk.manga.impl.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonToken
-import suwayomi.tachidesk.impl.backup.models.ChapterImpl
+import suwayomi.tachidesk.manga.impl.backup.models.ChapterImpl
 
 /**
  * JSON Serializer used to write / read [ChapterImpl] to / from json

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/serializer/HistoryTypeAdapter.kt

@@ -1,8 +1,8 @@
-package suwayomi.tachidesk.impl.backup.legacy.serializer
+package suwayomi.tachidesk.manga.impl.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
-import suwayomi.tachidesk.impl.backup.legacy.models.DHistory
+import suwayomi.tachidesk.manga.impl.backup.legacy.models.DHistory
 
 /**
  * JSON Serializer used to write / read [DHistory] to / from json

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/serializer/MangaTypeAdapter.kt

@@ -1,8 +1,8 @@
-package suwayomi.tachidesk.impl.backup.legacy.serializer
+package suwayomi.tachidesk.manga.impl.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
-import suwayomi.tachidesk.impl.backup.models.MangaImpl
+import suwayomi.tachidesk.manga.impl.backup.models.MangaImpl
 
 /**
  * JSON Serializer used to write / read [MangaImpl] to / from json

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/serializer/TrackTypeAdapter.kt

@@ -1,9 +1,9 @@
-package suwayomi.tachidesk.impl.backup.legacy.serializer
+package suwayomi.tachidesk.manga.impl.backup.legacy.serializer
 
 import com.github.salomonbrys.kotson.typeAdapter
 import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonToken
-import suwayomi.tachidesk.impl.backup.models.TrackImpl
+import suwayomi.tachidesk.manga.impl.backup.models.TrackImpl
 
 /**
  * JSON Serializer used to write / read [TrackImpl] to / from json

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Category.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 import java.io.Serializable
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/CategoryImpl.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 class CategoryImpl : Category {
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Chapter.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 import eu.kanade.tachiyomi.source.model.SChapter
 import java.io.Serializable

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/ChapterImpl.kt

@@ -1,7 +1,7 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable
 
 class ChapterImpl : Chapter {
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/History.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 import java.io.Serializable
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/HistoryImpl.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 /**
  * Object containing the history statistics of a chapter

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/LibraryManga.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 class LibraryManga : MangaImpl() {
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Manga.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 import eu.kanade.tachiyomi.source.model.SManga
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaCategory.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 class MangaCategory {
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaChapter.kt

@@ -1,3 +1,3 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 class MangaChapter(val manga: Manga, val chapter: Chapter)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaChapterHistory.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 /**
  * Object containing manga, chapter and history

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaImpl.kt

@@ -1,7 +1,7 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.model.table.MangaTable
+import suwayomi.tachidesk.manga.model.table.MangaTable
 
 open class MangaImpl : Manga {
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Track.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 import java.io.Serializable
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/TrackImpl.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.backup.models
+package suwayomi.tachidesk.manga.impl.backup.models
 
 class TrackImpl : Track {
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.download
+package suwayomi.tachidesk.manga.impl.download
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -12,11 +12,11 @@ import io.javalin.websocket.WsMessageContext
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.impl.download.model.DownloadChapter
+import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
-import suwayomi.tachidesk.impl.download.model.DownloadState.Downloading
+import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Downloading
-import suwayomi.tachidesk.impl.download.model.DownloadStatus
+import suwayomi.tachidesk.manga.impl.download.model.DownloadStatus
-import suwayomi.tachidesk.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.model.table.toDataClass
+import suwayomi.tachidesk.manga.model.table.toDataClass
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/Downloader.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.download
+package suwayomi.tachidesk.manga.impl.download
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,14 +11,14 @@ import kotlinx.coroutines.runBlocking
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.impl.Chapter.getChapter
+import suwayomi.tachidesk.manga.impl.Chapter.getChapter
-import suwayomi.tachidesk.impl.Page.getPageImage
+import suwayomi.tachidesk.manga.impl.Page.getPageImage
-import suwayomi.tachidesk.impl.download.model.DownloadChapter
+import suwayomi.tachidesk.manga.impl.download.model.DownloadChapter
-import suwayomi.tachidesk.impl.download.model.DownloadState.Downloading
+import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Downloading
-import suwayomi.tachidesk.impl.download.model.DownloadState.Error
+import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Error
-import suwayomi.tachidesk.impl.download.model.DownloadState.Finished
+import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Finished
-import suwayomi.tachidesk.impl.download.model.DownloadState.Queued
+import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Queued
-import suwayomi.tachidesk.model.table.ChapterTable
+import suwayomi.tachidesk.manga.model.table.ChapterTable
 import java.util.concurrent.CopyOnWriteArrayList
 
 class Downloader(private val downloadQueue: CopyOnWriteArrayList<DownloadChapter>, val notifier: () -> Unit) : Thread() {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadChapter.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.download.model
+package suwayomi.tachidesk.manga.impl.download.model
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -7,12 +7,13 @@ package suwayomi.tachidesk.impl.download.model
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import suwayomi.tachidesk.model.dataclass.ChapterDataClass
+import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Queued
+import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 
 class DownloadChapter(
     val chapterIndex: Int,
     val mangaId: Int,
-    var state: DownloadState = DownloadState.Queued,
+    var state: DownloadState = Queued,
     var progress: Float = 0f,
     var tries: Int = 0,
     var chapter: ChapterDataClass? = null,

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadState.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.download.model
+package suwayomi.tachidesk.manga.impl.download.model
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/model/DownloadStatus.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.download.model
+package suwayomi.tachidesk.manga.impl.download.model
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.extension
+package suwayomi.tachidesk.manga.impl.extension
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -25,23 +25,23 @@ import org.jetbrains.exposed.sql.update
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import org.kodein.di.instance
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
-import suwayomi.tachidesk.impl.extension.ExtensionsList.extensionTableAsDataClass
+import suwayomi.tachidesk.manga.impl.extension.ExtensionsList.extensionTableAsDataClass
-import suwayomi.tachidesk.impl.extension.github.ExtensionGithubApi
+import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi
-import suwayomi.tachidesk.impl.util.PackageTools.EXTENSION_FEATURE
+import suwayomi.tachidesk.manga.impl.util.PackageTools.EXTENSION_FEATURE
-import suwayomi.tachidesk.impl.util.PackageTools.LIB_VERSION_MAX
+import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX
-import suwayomi.tachidesk.impl.util.PackageTools.LIB_VERSION_MIN
+import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN
-import suwayomi.tachidesk.impl.util.PackageTools.METADATA_NSFW
+import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_NSFW
-import suwayomi.tachidesk.impl.util.PackageTools.METADATA_SOURCE_CLASS
+import suwayomi.tachidesk.manga.impl.util.PackageTools.METADATA_SOURCE_CLASS
-import suwayomi.tachidesk.impl.util.PackageTools.dex2jar
+import suwayomi.tachidesk.manga.impl.util.PackageTools.dex2jar
-import suwayomi.tachidesk.impl.util.PackageTools.getPackageInfo
+import suwayomi.tachidesk.manga.impl.util.PackageTools.getPackageInfo
-import suwayomi.tachidesk.impl.util.PackageTools.getSignatureHash
+import suwayomi.tachidesk.manga.impl.util.PackageTools.getSignatureHash
-import suwayomi.tachidesk.impl.util.PackageTools.loadExtensionSources
+import suwayomi.tachidesk.manga.impl.util.PackageTools.loadExtensionSources
-import suwayomi.tachidesk.impl.util.PackageTools.trustedSignatures
+import suwayomi.tachidesk.manga.impl.util.PackageTools.trustedSignatures
-import suwayomi.tachidesk.impl.util.network.await
+import suwayomi.tachidesk.manga.impl.util.network.await
-import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse
+import suwayomi.tachidesk.manga.impl.util.storage.CachedImageResponse.getCachedImageResponse
-import suwayomi.tachidesk.model.table.ExtensionTable
+import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.model.table.SourceTable
+import suwayomi.tachidesk.manga.model.table.SourceTable
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.io.InputStream

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionsList.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.extension
+package suwayomi.tachidesk.manga.impl.extension
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -14,11 +14,11 @@ import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.impl.extension.Extension.getExtensionIconUrl
+import suwayomi.tachidesk.manga.impl.extension.Extension.getExtensionIconUrl
-import suwayomi.tachidesk.impl.extension.github.ExtensionGithubApi
+import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi
-import suwayomi.tachidesk.impl.extension.github.OnlineExtension
+import suwayomi.tachidesk.manga.impl.extension.github.OnlineExtension
-import suwayomi.tachidesk.model.dataclass.ExtensionDataClass
+import suwayomi.tachidesk.manga.model.dataclass.ExtensionDataClass
-import suwayomi.tachidesk.model.table.ExtensionTable
+import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import java.util.concurrent.ConcurrentHashMap
 
 object ExtensionsList {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/ExtensionGithubApi.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.extension.github
+package suwayomi.tachidesk.manga.impl.extension.github
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -13,10 +13,10 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonParser
 import eu.kanade.tachiyomi.network.NetworkHelper
 import okhttp3.Request
-import suwayomi.tachidesk.impl.util.PackageTools.LIB_VERSION_MAX
+import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MAX
-import suwayomi.tachidesk.impl.util.PackageTools.LIB_VERSION_MIN
+import suwayomi.tachidesk.manga.impl.util.PackageTools.LIB_VERSION_MIN
-import suwayomi.tachidesk.impl.util.network.UnzippingInterceptor
+import suwayomi.tachidesk.manga.impl.util.network.UnzippingInterceptor
-import suwayomi.tachidesk.model.dataclass.ExtensionDataClass
+import suwayomi.tachidesk.manga.model.dataclass.ExtensionDataClass
 import uy.kohesive.injekt.injectLazy
 
 object ExtensionGithubApi {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/OnlineExtension.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.extension.github
+package suwayomi.tachidesk.manga.impl.extension.github
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/GetHttpSource.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util
+package suwayomi.tachidesk.manga.impl.util
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -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.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
-import suwayomi.tachidesk.impl.util.PackageTools.loadExtensionSources
+import suwayomi.tachidesk.manga.impl.util.PackageTools.loadExtensionSources
-import suwayomi.tachidesk.model.table.ExtensionTable
+import suwayomi.tachidesk.manga.model.table.ExtensionTable
-import suwayomi.tachidesk.model.table.SourceTable
+import suwayomi.tachidesk.manga.model.table.SourceTable
 import java.util.concurrent.ConcurrentHashMap
 
 object GetHttpSource {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/PackageTools.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util
+package suwayomi.tachidesk.manga.impl.util
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -22,7 +22,7 @@ import org.kodein.di.conf.global
 import org.kodein.di.instance
 import org.w3c.dom.Element
 import org.w3c.dom.Node
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
 import xyz.nulldev.androidcompat.pm.InstalledPackage.Companion.toList
 import xyz.nulldev.androidcompat.pm.toPackageInfo
 import java.io.File

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/RxCoroutineBridge.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util.lang
+package suwayomi.tachidesk.manga.impl.util.lang
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/network/OkHttp.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util.network
+package suwayomi.tachidesk.manga.impl.util.network
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/network/UnzippingInterceptor.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util.network
+package suwayomi.tachidesk.manga.impl.util.network
 
 import okhttp3.Headers
 import okhttp3.Interceptor

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/CachedImageResponse.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util.storage
+package suwayomi.tachidesk.manga.impl.util.storage
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/ImageUtil.kt

@@ -1,9 +1,9 @@
-package suwayomi.tachidesk.impl.util.storage
+package suwayomi.tachidesk.manga.impl.util.storage
 
-import suwayomi.tachidesk.impl.util.storage.ImageUtil.ImageType.GIF
+import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil.ImageType.GIF
-import suwayomi.tachidesk.impl.util.storage.ImageUtil.ImageType.JPG
+import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil.ImageType.JPG
-import suwayomi.tachidesk.impl.util.storage.ImageUtil.ImageType.PNG
+import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil.ImageType.PNG
-import suwayomi.tachidesk.impl.util.storage.ImageUtil.ImageType.WEBP
+import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil.ImageType.WEBP
 import java.io.InputStream
 
 /*

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/OkioExtensions.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util.storage
+package suwayomi.tachidesk.manga.impl.util.storage
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/SafePath.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.impl.util.storage
+package suwayomi.tachidesk.manga.impl.util.storage
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/CategoryDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.dataclass
+package suwayomi.tachidesk.manga.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ChapterDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.dataclass
+package suwayomi.tachidesk.manga.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/ExtensionDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.dataclass
+package suwayomi.tachidesk.manga.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.dataclass
+package suwayomi.tachidesk.manga.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -7,7 +7,7 @@ package suwayomi.tachidesk.model.dataclass
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import suwayomi.tachidesk.model.table.MangaStatus
+import suwayomi.tachidesk.manga.model.table.MangaStatus
 
 data class MangaDataClass(
     val id: Int,

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/PageDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.dataclass
+package suwayomi.tachidesk.manga.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/SourceDataClass.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.dataclass
+package suwayomi.tachidesk.manga.model.dataclass
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryMangaTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -9,7 +9,7 @@ package suwayomi.tachidesk.model.table
 
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.model.dataclass.CategoryDataClass
+import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 
 object CategoryTable : IntIdTable() {
     val name = varchar("name", 64)

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterMetaTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ReferenceOption

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,8 +11,8 @@ import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ResultRow
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.impl.Chapter.getChapterMetaMap
+import suwayomi.tachidesk.manga.impl.Chapter.getChapterMetaMap
-import suwayomi.tachidesk.model.dataclass.ChapterDataClass
+import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 
 object ChapterTable : IntIdTable() {
     val url = varchar("url", 2048)
@@ -51,6 +51,6 @@ fun ChapterTable.toDataClass(chapterEntry: ResultRow) =
         chapterEntry[chapterIndex],
         chapterEntry[isDownloaded],
         chapterEntry[pageCount],
-        transaction { ChapterTable.select { ChapterTable.manga eq chapterEntry[manga].value }.count().toInt() },
+        transaction { ChapterTable.select { manga eq chapterEntry[manga].value }.count().toInt() },
         getChapterMetaMap(chapterEntry[id]),
     )

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ExtensionTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaMetaTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ReferenceOption

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -10,10 +10,10 @@ package suwayomi.tachidesk.model.table
 import eu.kanade.tachiyomi.source.model.SManga
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ResultRow
-import suwayomi.tachidesk.impl.Manga.getMangaMetaMap
+import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
-import suwayomi.tachidesk.impl.MangaList.proxyThumbnailUrl
+import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
-import suwayomi.tachidesk.model.dataclass.MangaDataClass
+import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.model.table.MangaStatus.Companion
+import suwayomi.tachidesk.manga.model.table.MangaStatus.Companion
 
 object MangaTable : IntIdTable() {
     val url = varchar("url", 2048)

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/PageTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/SourceTable.kt

@@ -1,4 +1,4 @@
-package suwayomi.tachidesk.model.table
+package suwayomi.tachidesk.manga.model.table
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt

@@ -1,4 +1,4 @@
-package suwayomi.server
+package suwayomi.tachidesk.server
 
 import io.javalin.Javalin
 import kotlinx.coroutines.CoroutineScope
@@ -6,9 +6,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.future.future
 import mu.KotlinLogging
-import suwayomi.anime.AnimeAPI
+import suwayomi.tachidesk.anime.AnimeAPI
-import suwayomi.server.util.Browser
+import suwayomi.tachidesk.server.util.Browser
-import suwayomi.tachidesk.TachideskAPI
+import suwayomi.tachidesk.manga.TachideskAPI
 import java.io.IOException
 import java.util.concurrent.CompletableFuture
 import kotlin.concurrent.thread

server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt

@@ -1,4 +1,4 @@
-package suwayomi.server
+package suwayomi.tachidesk.server
 
 /*
  * Copyright (C) Contributors to the Suwayomi project

server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt

@@ -1,4 +1,4 @@
-package suwayomi.server
+package suwayomi.tachidesk.server
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -13,9 +13,10 @@ 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.BuildConfig
-import suwayomi.server.util.AppMutex.handleAppMutex
+import suwayomi.tachidesk.server.database.databaseUp
-import suwayomi.server.util.SystemTray.systemTray
+import suwayomi.tachidesk.server.util.AppMutex.handleAppMutex
+import suwayomi.tachidesk.server.util.SystemTray.systemTray
 import xyz.nulldev.androidcompat.AndroidCompat
 import xyz.nulldev.androidcompat.AndroidCompatInitializer
 import xyz.nulldev.ts.config.ApplicationRootDir
@@ -64,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

server/src/main/kotlin/suwayomi/tachidesk/server/database/DBManager.kt

@@ -1,4 +1,4 @@
-package suwayomi.server.database
+package suwayomi.tachidesk.server.database
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -11,9 +11,9 @@ import org.jetbrains.exposed.sql.Database
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import org.kodein.di.instance
-import suwayomi.server.ApplicationDirs
+import suwayomi.tachidesk.server.ApplicationDirs
-import suwayomi.server.database.migration.lib.loadMigrationsFrom
+import suwayomi.tachidesk.server.database.migration.lib.loadMigrationsFrom
-import suwayomi.server.database.migration.lib.runMigrations
+import suwayomi.tachidesk.server.database.migration.lib.runMigrations
 
 object DBManager {
     val db by lazy {
@@ -27,6 +27,6 @@ fun databaseUp() {
     val db = DBManager.db
     db.useNestedTransactions = true
 
-    val migrations = loadMigrationsFrom("suwayomi.server.database.migration")
+    val migrations = loadMigrationsFrom("suwayomi.tachidesk.server.database.migration")
     runMigrations(migrations)
 }

server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0001_Initial.kt

@@ -1,4 +1,4 @@
-package suwayomi.server.database.migration
+package suwayomi.tachidesk.server.database.migration
 
 /*
  * Copyright (C) Contributors to the Suwayomi project
@@ -12,7 +12,7 @@ import org.jetbrains.exposed.dao.id.IdTable
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.SchemaUtils
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.server.database.migration.lib.Migration
+import suwayomi.tachidesk.server.database.migration.lib.Migration
 
 @Suppress("ClassName", "unused")
 class M0001_Initial : Migration() {