diff --git a/build.gradle.kts b/build.gradle.kts index 26649187..974f331f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -79,10 +79,6 @@ configure(projects) { // to get application content root implementation("net.harawata:appdirs:1.2.1") - // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon - // note: watch https://github.com/ThexXTURBOXx/dex2jar for future development - implementation("com.github.DexPatcher.dex2jar:dex-tools:v2.1-20190905-lanchon") - // APK parser implementation("net.dongliu:apk-parser:2.6.10") diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 6a53416a..580cc52e 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -63,6 +63,10 @@ dependencies { implementation("com.github.salomonbrys.kotson:kotson:2.5.0") + // dex2jar: https://github.com/DexPatcher/dex2jar/releases/tag/v2.1-20190905-lanchon + // note: watch https://github.com/ThexXTURBOXx/dex2jar for future developments + implementation("com.github.DexPatcher.dex2jar:dex-tools:v2.1-20190905-lanchon") + // asm for fixing SimpleDateFormat (must match Dex2Jar version) implementation("org.ow2.asm:asm-debug-all:5.0.3") diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt index 4c0f1ce4..8b7d74d6 100644 --- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SManga.kt @@ -62,7 +62,7 @@ interface SManga : Serializable { } } -//fun SManga.toMangaInfo(): MangaInfo { +// fun SManga.toMangaInfo(): MangaInfo { // return MangaInfo( // key = this.url, // title = this.title, @@ -73,9 +73,9 @@ interface SManga : Serializable { // status = this.status, // cover = this.thumbnail_url ?: "" // ) -//} +// } // -//fun MangaInfo.toSManga(): SManga { +// fun MangaInfo.toSManga(): SManga { // val mangaInfo = this // return SManga.create().apply { // url = mangaInfo.key @@ -87,5 +87,4 @@ interface SManga : Serializable { // status = mangaInfo.status // thumbnail_url = mangaInfo.cover // } -//} - +// } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/AbstractBackupValidator.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/AbstractBackupValidator.kt index a207de49..e5459448 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/AbstractBackupValidator.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/AbstractBackupValidator.kt @@ -9,4 +9,4 @@ package suwayomi.tachidesk.manga.impl.backup abstract class AbstractBackupValidator { data class ValidationResult(val missingSources: List, val missingTrackers: List) -} \ No newline at end of file +} diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupValidator.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupValidator.kt index f57ba9ff..7e3e2721 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupValidator.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/legacy/LegacyBackupValidator.kt @@ -14,7 +14,7 @@ import suwayomi.tachidesk.manga.impl.backup.AbstractBackupValidator import suwayomi.tachidesk.manga.impl.backup.legacy.models.Backup import suwayomi.tachidesk.manga.model.table.SourceTable -object LegacyBackupValidator: AbstractBackupValidator() { +object LegacyBackupValidator : AbstractBackupValidator() { /** * Checks for critical backup file data. diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Manga.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Manga.kt index d4109284..b20782b5 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Manga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Manga.kt @@ -1,9 +1,8 @@ package suwayomi.tachidesk.manga.impl.backup.models import eu.kanade.tachiyomi.source.model.SManga -//import eu.kanade.tachiyomi.ui.reader.setting.OrientationType -//import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType - +// import eu.kanade.tachiyomi.ui.reader.setting.OrientationType +// import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType // substitute for eu.kanade.tachiyomi.ui.reader.setting.OrientationType object OrientationType { @@ -15,7 +14,6 @@ object ReadingModeType { const val MASK = 0x00000007 } - interface Manga : SManga { var id: Long? @@ -129,7 +127,7 @@ interface Manga : SManga { } } -//fun Manga.toMangaInfo(): MangaInfo { +// fun Manga.toMangaInfo(): MangaInfo { // return MangaInfo( // artist = this.artist ?: "", // author = this.author ?: "", @@ -140,4 +138,4 @@ interface Manga : SManga { // status = this.status, // title = this.title // ) -//} +// } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaImpl.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaImpl.kt index a0f6f8fe..123d78e6 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaImpl.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaImpl.kt @@ -72,7 +72,7 @@ open class MangaImpl : Manga { url = mangaRecord[MangaTable.url] title = mangaRecord[MangaTable.title] source = mangaRecord[MangaTable.sourceReference] - viewer_flags = 0 // TODO: implement + viewer_flags = 0 // TODO: implement chapter_flags = 0 // TODO: implement } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupBase.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupBase.kt index 66c15327..5fd47f9c 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupBase.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupBase.kt @@ -13,4 +13,4 @@ open class ProtoBackupBase { var sourceMapping: Map = emptyMap() val parser = ProtoBuf -} \ No newline at end of file +} diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt index 84d574d1..09d54ac0 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt @@ -15,7 +15,7 @@ import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSerializer import java.io.ByteArrayOutputStream -object ProtoBackupExport: ProtoBackupBase() { +object ProtoBackupExport : ProtoBackupBase() { suspend fun createBackup(flags: BackupFlags): ByteArray { // Create root object var backup: Backup? = null @@ -38,4 +38,4 @@ object ProtoBackupExport: ProtoBackupBase() { return byteStream.toByteArray() } -} \ No newline at end of file +} diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt index 1c88e0ea..8f901da1 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt @@ -20,7 +20,7 @@ import java.io.InputStream private val logger = KotlinLogging.logger {} -object ProtoBackupImport: ProtoBackupBase() { +object ProtoBackupImport : ProtoBackupBase() { var restoreAmount = 0 suspend fun performRestore(sourceStream: InputStream): ValidationResult { @@ -59,7 +59,6 @@ object ProtoBackupImport: ProtoBackupBase() { // showRestoreProgress(restoreProgress, restoreAmount, context.getString(R.string.categories)) } - private fun restoreManga(backupManga: BackupManga, backupCategories: List) { // TODO // val manga = backupManga.getMangaImpl() // val chapters = backupManga.getChaptersImpl() @@ -77,4 +76,4 @@ object ProtoBackupImport: ProtoBackupBase() { // restoreProgress += 1 // showRestoreProgress(restoreProgress, restoreAmount, manga.title) } -} \ No newline at end of file +} diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt index 2f4deae2..0d8f925a 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt @@ -13,7 +13,7 @@ import suwayomi.tachidesk.manga.impl.backup.AbstractBackupValidator import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup import suwayomi.tachidesk.manga.model.table.SourceTable -object ProtoBackupValidator: AbstractBackupValidator() { +object ProtoBackupValidator : AbstractBackupValidator() { fun validate(backup: Backup): ValidationResult { if (backup.backupManga.isEmpty()) { throw Exception("Backup does not contain any manga.") @@ -42,4 +42,4 @@ object ProtoBackupValidator: AbstractBackupValidator() { return ValidationResult(missingSources, missingTrackers) } -} \ No newline at end of file +}