move databse to server package, move tables to a better place
This commit is contained in:
@@ -15,9 +15,9 @@ 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.database.table.CategoryMangaTable
|
||||
import suwayomi.tachidesk.model.database.table.CategoryTable
|
||||
import suwayomi.tachidesk.model.database.table.toDataClass
|
||||
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 {
|
||||
|
||||
@@ -14,10 +14,10 @@ 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.database.table.CategoryMangaTable
|
||||
import suwayomi.tachidesk.model.database.table.CategoryTable
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.database.table.toDataClass
|
||||
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
|
||||
|
||||
|
||||
@@ -19,10 +19,10 @@ 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.database.table.ChapterTable
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.database.table.PageTable
|
||||
import suwayomi.tachidesk.model.database.table.toDataClass
|
||||
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 {
|
||||
|
||||
@@ -14,10 +14,10 @@ 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.database.table.CategoryMangaTable
|
||||
import suwayomi.tachidesk.model.database.table.CategoryTable
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.database.table.toDataClass
|
||||
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 {
|
||||
|
||||
@@ -23,8 +23,8 @@ 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.database.table.MangaStatus
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.table.MangaStatus
|
||||
import suwayomi.tachidesk.model.table.MangaTable
|
||||
import suwayomi.tachidesk.model.dataclass.MangaDataClass
|
||||
import java.io.InputStream
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ 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.database.table.MangaStatus
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.table.MangaStatus
|
||||
import suwayomi.tachidesk.model.table.MangaTable
|
||||
import suwayomi.tachidesk.model.dataclass.MangaDataClass
|
||||
import suwayomi.tachidesk.model.dataclass.PagedMangaListDataClass
|
||||
|
||||
|
||||
@@ -21,9 +21,9 @@ import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
|
||||
import suwayomi.tachidesk.impl.util.lang.awaitSingle
|
||||
import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse
|
||||
import suwayomi.tachidesk.impl.util.storage.SafePath
|
||||
import suwayomi.tachidesk.model.database.table.ChapterTable
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.database.table.PageTable
|
||||
import suwayomi.tachidesk.model.table.ChapterTable
|
||||
import suwayomi.tachidesk.model.table.MangaTable
|
||||
import suwayomi.tachidesk.model.table.PageTable
|
||||
import java.io.File
|
||||
import java.io.InputStream
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ 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.database.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.database.table.SourceTable
|
||||
import suwayomi.tachidesk.model.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.table.SourceTable
|
||||
import suwayomi.tachidesk.model.dataclass.SourceDataClass
|
||||
|
||||
object Source {
|
||||
|
||||
@@ -24,8 +24,8 @@ import suwayomi.tachidesk.impl.backup.models.ChapterImpl
|
||||
import suwayomi.tachidesk.impl.backup.models.Manga
|
||||
import suwayomi.tachidesk.impl.backup.models.MangaImpl
|
||||
import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
|
||||
import suwayomi.tachidesk.model.database.table.ChapterTable
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.table.ChapterTable
|
||||
import suwayomi.tachidesk.model.table.MangaTable
|
||||
|
||||
object LegacyBackupExport : LegacyBackupBase() {
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import suwayomi.tachidesk.impl.backup.models.Track
|
||||
import suwayomi.tachidesk.impl.backup.models.TrackImpl
|
||||
import suwayomi.tachidesk.impl.util.GetHttpSource.getHttpSource
|
||||
import suwayomi.tachidesk.impl.util.lang.awaitSingle
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.table.MangaTable
|
||||
import java.io.InputStream
|
||||
import java.util.Date
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ 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.model.database.table.SourceTable
|
||||
import suwayomi.tachidesk.model.table.SourceTable
|
||||
|
||||
object LegacyBackupValidator {
|
||||
data class ValidationResult(val missingSources: List<String>, val missingTrackers: List<String>)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package suwayomi.tachidesk.impl.backup.models
|
||||
|
||||
import org.jetbrains.exposed.sql.ResultRow
|
||||
import suwayomi.tachidesk.model.database.table.ChapterTable
|
||||
import suwayomi.tachidesk.model.table.ChapterTable
|
||||
|
||||
class ChapterImpl : Chapter {
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package suwayomi.tachidesk.impl.backup.models
|
||||
|
||||
import org.jetbrains.exposed.sql.ResultRow
|
||||
import suwayomi.tachidesk.model.database.table.MangaTable
|
||||
import suwayomi.tachidesk.model.table.MangaTable
|
||||
|
||||
open class MangaImpl : Manga {
|
||||
|
||||
|
||||
@@ -40,8 +40,8 @@ import suwayomi.tachidesk.impl.util.PackageTools.loadExtensionSources
|
||||
import suwayomi.tachidesk.impl.util.PackageTools.trustedSignatures
|
||||
import suwayomi.tachidesk.impl.util.network.await
|
||||
import suwayomi.tachidesk.impl.util.storage.CachedImageResponse.getCachedImageResponse
|
||||
import suwayomi.tachidesk.model.database.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.database.table.SourceTable
|
||||
import suwayomi.tachidesk.model.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.table.SourceTable
|
||||
import uy.kohesive.injekt.injectLazy
|
||||
import java.io.File
|
||||
import java.io.InputStream
|
||||
|
||||
@@ -17,7 +17,7 @@ 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.database.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.dataclass.ExtensionDataClass
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ import org.kodein.di.conf.global
|
||||
import org.kodein.di.instance
|
||||
import suwayomi.server.ApplicationDirs
|
||||
import suwayomi.tachidesk.impl.util.PackageTools.loadExtensionSources
|
||||
import suwayomi.tachidesk.model.database.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.database.table.SourceTable
|
||||
import suwayomi.tachidesk.model.table.ExtensionTable
|
||||
import suwayomi.tachidesk.model.table.SourceTable
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
|
||||
object GetHttpSource {
|
||||
|
||||
Reference in New Issue
Block a user