From e8d41f83c25d92ca3b850da034ebeb2cba7b6089 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Thu, 27 May 2021 02:21:53 +0430 Subject: [PATCH] move databse to server package, move tables to a better place --- .../{tachidesk/model => server}/database/DBManager.kt | 8 ++++---- .../model => server}/database/migration/M0001_Initial.kt | 4 ++-- .../database/migration/M0002_ChapterTableIndexRename.kt | 4 ++-- .../database/migration/M0003_DefaultCategory.kt | 4 ++-- .../model => server}/database/migration/lib/LICENSE | 0 .../model => server}/database/migration/lib/Migration.kt | 2 +- .../database/migration/lib/MigrationEntity.kt | 2 +- .../database/migration/lib/runMigrations.kt | 4 ++-- .../src/main/kotlin/suwayomi/tachidesk/impl/Category.kt | 6 +++--- .../main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt | 8 ++++---- server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt | 8 ++++---- server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt | 8 ++++---- server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt | 4 ++-- .../src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt | 4 ++-- server/src/main/kotlin/suwayomi/tachidesk/impl/Page.kt | 6 +++--- server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt | 4 ++-- .../tachidesk/impl/backup/legacy/LegacyBackupExport.kt | 4 ++-- .../tachidesk/impl/backup/legacy/LegacyBackupImport.kt | 2 +- .../tachidesk/impl/backup/legacy/LegacyBackupValidator.kt | 2 +- .../suwayomi/tachidesk/impl/backup/models/ChapterImpl.kt | 2 +- .../suwayomi/tachidesk/impl/backup/models/MangaImpl.kt | 2 +- .../kotlin/suwayomi/tachidesk/impl/extension/Extension.kt | 4 ++-- .../suwayomi/tachidesk/impl/extension/ExtensionsList.kt | 2 +- .../kotlin/suwayomi/tachidesk/impl/util/GetHttpSource.kt | 4 ++-- .../suwayomi/tachidesk/model/dataclass/MangaDataClass.kt | 2 +- .../model/{database => }/table/CategoryMangaTable.kt | 2 +- .../tachidesk/model/{database => }/table/CategoryTable.kt | 2 +- .../tachidesk/model/{database => }/table/ChapterTable.kt | 2 +- .../model/{database => }/table/ExtensionTable.kt | 2 +- .../tachidesk/model/{database => }/table/MangaTable.kt | 4 ++-- .../tachidesk/model/{database => }/table/PageTable.kt | 2 +- .../tachidesk/model/{database => }/table/SourceTable.kt | 2 +- 32 files changed, 58 insertions(+), 58 deletions(-) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/DBManager.kt (75%) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/migration/M0001_Initial.kt (97%) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/migration/M0002_ChapterTableIndexRename.kt (87%) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/migration/M0003_DefaultCategory.kt (87%) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/migration/lib/LICENSE (100%) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/migration/lib/Migration.kt (93%) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/migration/lib/MigrationEntity.kt (95%) rename server/src/main/kotlin/suwayomi/{tachidesk/model => server}/database/migration/lib/runMigrations.kt (96%) rename server/src/main/kotlin/suwayomi/tachidesk/model/{database => }/table/CategoryMangaTable.kt (90%) rename server/src/main/kotlin/suwayomi/tachidesk/model/{database => }/table/CategoryTable.kt (94%) rename server/src/main/kotlin/suwayomi/tachidesk/model/{database => }/table/ChapterTable.kt (96%) rename server/src/main/kotlin/suwayomi/tachidesk/model/{database => }/table/ExtensionTable.kt (96%) rename server/src/main/kotlin/suwayomi/tachidesk/model/{database => }/table/MangaTable.kt (94%) rename server/src/main/kotlin/suwayomi/tachidesk/model/{database => }/table/PageTable.kt (91%) rename server/src/main/kotlin/suwayomi/tachidesk/model/{database => }/table/SourceTable.kt (92%) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/DBManager.kt b/server/src/main/kotlin/suwayomi/server/database/DBManager.kt similarity index 75% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/DBManager.kt rename to server/src/main/kotlin/suwayomi/server/database/DBManager.kt index 9aea0074..4d927688 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/DBManager.kt +++ b/server/src/main/kotlin/suwayomi/server/database/DBManager.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database +package suwayomi.server.database /* * Copyright (C) Contributors to the Suwayomi project @@ -12,8 +12,8 @@ import org.kodein.di.DI import org.kodein.di.conf.global import org.kodein.di.instance import suwayomi.server.ApplicationDirs -import suwayomi.tachidesk.model.database.migration.lib.loadMigrationsFrom -import suwayomi.tachidesk.model.database.migration.lib.runMigrations +import suwayomi.server.database.migration.lib.loadMigrationsFrom +import suwayomi.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.tachidesk.model.database.migration") + val migrations = loadMigrationsFrom("suwayomi.server.database.migration") runMigrations(migrations) } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0001_Initial.kt b/server/src/main/kotlin/suwayomi/server/database/migration/M0001_Initial.kt similarity index 97% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0001_Initial.kt rename to server/src/main/kotlin/suwayomi/server/database/migration/M0001_Initial.kt index ab8f00ad..4ba50774 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0001_Initial.kt +++ b/server/src/main/kotlin/suwayomi/server/database/migration/M0001_Initial.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.migration +package suwayomi.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.tachidesk.model.database.migration.lib.Migration +import suwayomi.server.database.migration.lib.Migration @Suppress("ClassName", "unused") class M0001_Initial : Migration() { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0002_ChapterTableIndexRename.kt b/server/src/main/kotlin/suwayomi/server/database/migration/M0002_ChapterTableIndexRename.kt similarity index 87% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0002_ChapterTableIndexRename.kt rename to server/src/main/kotlin/suwayomi/server/database/migration/M0002_ChapterTableIndexRename.kt index 0ffc0656..ea20b54e 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0002_ChapterTableIndexRename.kt +++ b/server/src/main/kotlin/suwayomi/server/database/migration/M0002_ChapterTableIndexRename.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.migration +package suwayomi.server.database.migration /* * Copyright (C) Contributors to the Suwayomi project @@ -9,7 +9,7 @@ package suwayomi.tachidesk.model.database.migration import org.jetbrains.exposed.sql.transactions.TransactionManager import org.jetbrains.exposed.sql.vendors.currentDialect -import suwayomi.tachidesk.model.database.migration.lib.Migration +import suwayomi.server.database.migration.lib.Migration @Suppress("ClassName", "unused") class M0002_ChapterTableIndexRename : Migration() { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0003_DefaultCategory.kt b/server/src/main/kotlin/suwayomi/server/database/migration/M0003_DefaultCategory.kt similarity index 87% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0003_DefaultCategory.kt rename to server/src/main/kotlin/suwayomi/server/database/migration/M0003_DefaultCategory.kt index 503bc42b..2c5104b5 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/M0003_DefaultCategory.kt +++ b/server/src/main/kotlin/suwayomi/server/database/migration/M0003_DefaultCategory.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.migration +package suwayomi.server.database.migration /* * Copyright (C) Contributors to the Suwayomi project @@ -9,7 +9,7 @@ package suwayomi.tachidesk.model.database.migration import org.jetbrains.exposed.sql.transactions.TransactionManager import org.jetbrains.exposed.sql.vendors.currentDialect -import suwayomi.tachidesk.model.database.migration.lib.Migration +import suwayomi.server.database.migration.lib.Migration @Suppress("ClassName", "unused") class M0003_DefaultCategory : Migration() { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/LICENSE b/server/src/main/kotlin/suwayomi/server/database/migration/lib/LICENSE similarity index 100% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/LICENSE rename to server/src/main/kotlin/suwayomi/server/database/migration/lib/LICENSE diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/Migration.kt b/server/src/main/kotlin/suwayomi/server/database/migration/lib/Migration.kt similarity index 93% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/Migration.kt rename to server/src/main/kotlin/suwayomi/server/database/migration/lib/Migration.kt index 88eb1059..4310c1ba 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/Migration.kt +++ b/server/src/main/kotlin/suwayomi/server/database/migration/lib/Migration.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.migration.lib +package suwayomi.server.database.migration.lib /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/MigrationEntity.kt b/server/src/main/kotlin/suwayomi/server/database/migration/lib/MigrationEntity.kt similarity index 95% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/MigrationEntity.kt rename to server/src/main/kotlin/suwayomi/server/database/migration/lib/MigrationEntity.kt index 44be601c..6d96a75c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/MigrationEntity.kt +++ b/server/src/main/kotlin/suwayomi/server/database/migration/lib/MigrationEntity.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.migration.lib +package suwayomi.server.database.migration.lib /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/runMigrations.kt b/server/src/main/kotlin/suwayomi/server/database/migration/lib/runMigrations.kt similarity index 96% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/runMigrations.kt rename to server/src/main/kotlin/suwayomi/server/database/migration/lib/runMigrations.kt index 2a299e06..c226c1c7 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/migration/lib/runMigrations.kt +++ b/server/src/main/kotlin/suwayomi/server/database/migration/lib/runMigrations.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.migration.lib +package suwayomi.server.database.migration.lib /* * Copyright (C) Contributors to the Suwayomi project @@ -63,7 +63,7 @@ fun runMigrations(migrations: List, database: Database = TransactionM @OptIn(ExperimentalPathApi::class) private fun getTopLevelClasses(packageName: String): List> { - ServerConfig::class.java.getResource("/" + "suwayomi.tachidesk.model.database.migration".replace('.', '/')) + ServerConfig::class.java.getResource("/" + "suwayomi.server.database.migration".replace('.', '/')) val path = "/" + packageName.replace('.', '/') val uri = ServerConfig::class.java.getResource(path).toURI() diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt index a16ffea0..07323bb9 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Category.kt @@ -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 { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt index 50a8b92f..b5fc39c7 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/CategoryManga.kt @@ -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 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt index 95d6e1e2..2ddc7530 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Chapter.kt @@ -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 { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt index 053a392a..da1b8def 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Library.kt @@ -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 { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt index 797ebced..448d8e1c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Manga.kt @@ -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 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt index bec7138d..5a64b6e8 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/MangaList.kt @@ -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 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Page.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Page.kt index 18f71ae8..8a249884 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Page.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Page.kt @@ -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 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt index b405bd63..4eca2184 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/Source.kt @@ -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 { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupExport.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupExport.kt index c873e392..3a0458cf 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupExport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupExport.kt @@ -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() { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupImport.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupImport.kt index 27c280f2..4d525b00 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupImport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupImport.kt @@ -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 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupValidator.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupValidator.kt index 2140a548..fc809059 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupValidator.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/legacy/LegacyBackupValidator.kt @@ -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, val missingTrackers: List) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/ChapterImpl.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/ChapterImpl.kt index eaaae6cf..264413ef 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/ChapterImpl.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/ChapterImpl.kt @@ -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 { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/MangaImpl.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/MangaImpl.kt index 6db0b50d..2c50f1f3 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/MangaImpl.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/backup/models/MangaImpl.kt @@ -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 { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/Extension.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/Extension.kt index 9e00bb26..053d27ee 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/Extension.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/Extension.kt @@ -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 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 a17b777d..61421019 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/ExtensionsList.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/extension/ExtensionsList.kt @@ -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 diff --git a/server/src/main/kotlin/suwayomi/tachidesk/impl/util/GetHttpSource.kt b/server/src/main/kotlin/suwayomi/tachidesk/impl/util/GetHttpSource.kt index 40f86510..a32cc0b1 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/impl/util/GetHttpSource.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/impl/util/GetHttpSource.kt @@ -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 { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/dataclass/MangaDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/dataclass/MangaDataClass.kt index 48821ce8..7ed07ff7 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/dataclass/MangaDataClass.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/dataclass/MangaDataClass.kt @@ -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.database.table.MangaStatus +import suwayomi.tachidesk.model.table.MangaStatus data class MangaDataClass( val id: Int, diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/CategoryMangaTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/CategoryMangaTable.kt similarity index 90% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/table/CategoryMangaTable.kt rename to server/src/main/kotlin/suwayomi/tachidesk/model/table/CategoryMangaTable.kt index f7a922a9..32abed11 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/CategoryMangaTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/CategoryMangaTable.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.table +package suwayomi.tachidesk.model.table /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/CategoryTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/CategoryTable.kt similarity index 94% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/table/CategoryTable.kt rename to server/src/main/kotlin/suwayomi/tachidesk/model/table/CategoryTable.kt index 9914fe15..2adab48d 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/CategoryTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/CategoryTable.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.table +package suwayomi.tachidesk.model.table /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/ChapterTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/ChapterTable.kt similarity index 96% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/table/ChapterTable.kt rename to server/src/main/kotlin/suwayomi/tachidesk/model/table/ChapterTable.kt index acdf453d..85022044 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/ChapterTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/ChapterTable.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.table +package suwayomi.tachidesk.model.table /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/ExtensionTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/ExtensionTable.kt similarity index 96% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/table/ExtensionTable.kt rename to server/src/main/kotlin/suwayomi/tachidesk/model/table/ExtensionTable.kt index c3119049..6dbf09d6 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/ExtensionTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/ExtensionTable.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.table +package suwayomi.tachidesk.model.table /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/MangaTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt similarity index 94% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/table/MangaTable.kt rename to server/src/main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt index 2a27c804..be0280bc 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/MangaTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/MangaTable.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.table +package suwayomi.tachidesk.model.table /* * Copyright (C) Contributors to the Suwayomi project @@ -11,7 +11,7 @@ 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.database.table.MangaStatus.Companion +import suwayomi.tachidesk.model.table.MangaStatus.Companion import suwayomi.tachidesk.model.dataclass.MangaDataClass object MangaTable : IntIdTable() { diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/PageTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/PageTable.kt similarity index 91% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/table/PageTable.kt rename to server/src/main/kotlin/suwayomi/tachidesk/model/table/PageTable.kt index 555254db..f285d6e8 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/PageTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/PageTable.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.table +package suwayomi.tachidesk.model.table /* * Copyright (C) Contributors to the Suwayomi project diff --git a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/SourceTable.kt b/server/src/main/kotlin/suwayomi/tachidesk/model/table/SourceTable.kt similarity index 92% rename from server/src/main/kotlin/suwayomi/tachidesk/model/database/table/SourceTable.kt rename to server/src/main/kotlin/suwayomi/tachidesk/model/table/SourceTable.kt index a981ca8f..b11d1d91 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/model/database/table/SourceTable.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/model/table/SourceTable.kt @@ -1,4 +1,4 @@ -package suwayomi.tachidesk.model.database.table +package suwayomi.tachidesk.model.table /* * Copyright (C) Contributors to the Suwayomi project