Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded backup stuff, now almost everything is from stable

Browse Source
This commit is contained in:
Jobobby04 2020-05-04 20:33:09 -04:00
parent d6f0c0837b
commit 9bfe4ed829
2 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
View File

@ -33,7 +33,6 @@ import eu.kanade.tachiyomi.data.notification.Notifications
import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.util.system.isServiceRunning import eu.kanade.tachiyomi.util.system.isServiceRunning
import exh.BackupEntry
import exh.EXHMigrations import exh.EXHMigrations
import exh.eh.EHentaiThrottleManager import exh.eh.EHentaiThrottleManager
import java.io.File import java.io.File
@ -217,18 +216,9 @@ class BackupRestoreService : Service() {
val mangasJson = json.get(MANGAS).asJsonArray val mangasJson = json.get(MANGAS).asJsonArray
val validManga = mangasJson.filter { val validManga = mangasJson.filter {
val tmanga = backupManager.parser.fromJson<MangaImpl>(it.asJsonObject.get(MANGA)) var manga = backupManager.parser.fromJson<MangaImpl>(it.asJsonObject.get(MANGA))
// EXH --> // EXH -->
val migrated = EXHMigrations.migrateBackupEntry( manga = EXHMigrations.migrateBackupEntry(manga)
BackupEntry(
tmanga,
backupManager.parser.fromJson<List<ChapterImpl>>(JsonArray()),
backupManager.parser.fromJson<List<String>>(JsonArray()),
backupManager.parser.fromJson<List<DHistory>>(JsonArray()),
backupManager.parser.fromJson<List<TrackImpl>>(JsonArray())
)
)
val (manga, _, _, _, _) = migrated
val sourced = backupManager.sourceManager.get(manga.source) != null val sourced = backupManager.sourceManager.get(manga.source) != null
if (!sourced) { if (!sourced) {
restoreAmount -= 1 restoreAmount -= 1
@ -269,20 +259,20 @@ class BackupRestoreService : Service() {
private fun restoreManga(mangaJson: JsonObject) { private fun restoreManga(mangaJson: JsonObject) {
db.inTransaction { db.inTransaction {
val tmanga = backupManager.parser.fromJson<MangaImpl>(mangaJson.get(MANGA)) var manga = backupManager.parser.fromJson<MangaImpl>(mangaJson.get(MANGA))
val tchapters = backupManager.parser.fromJson<List<ChapterImpl>>( val chapters = backupManager.parser.fromJson<List<ChapterImpl>>(
mangaJson.get(CHAPTERS) mangaJson.get(CHAPTERS)
?: JsonArray() ?: JsonArray()
) )
val tcategories = backupManager.parser.fromJson<List<String>>( val categories = backupManager.parser.fromJson<List<String>>(
mangaJson.get(CATEGORIES) mangaJson.get(CATEGORIES)
?: JsonArray() ?: JsonArray()
) )
val thistory = backupManager.parser.fromJson<List<DHistory>>( val history = backupManager.parser.fromJson<List<DHistory>>(
mangaJson.get(HISTORY) mangaJson.get(HISTORY)
?: JsonArray() ?: JsonArray()
) )
val ttracks = backupManager.parser.fromJson<List<TrackImpl>>( val tracks = backupManager.parser.fromJson<List<TrackImpl>>(
mangaJson.get(TRACK) mangaJson.get(TRACK)
?: JsonArray() ?: JsonArray()
) )
@ -292,16 +282,7 @@ class BackupRestoreService : Service() {
} }
// EXH --> // EXH -->
val migrated = EXHMigrations.migrateBackupEntry( manga = EXHMigrations.migrateBackupEntry(manga)
BackupEntry(
tmanga,
tchapters,
tcategories,
thistory,
ttracks
)
)
val (manga, chapters, categories, history, tracks) = migrated
// <-- EXH // <-- EXH
try { try {

7
app/src/main/java/exh/EXHMigrations.kt
View File

@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.data.backup.models.DHistory
import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.database.models.MangaImpl
import eu.kanade.tachiyomi.data.database.models.Track import eu.kanade.tachiyomi.data.database.models.Track
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@ -59,9 +60,7 @@ object EXHMigrations {
return false return false
} }
fun migrateBackupEntry(backupEntry: BackupEntry): BackupEntry { fun migrateBackupEntry(manga: MangaImpl): MangaImpl {
val (manga, chapters, categories, history, tracks) = backupEntry
// Migrate HentaiCafe source IDs // Migrate HentaiCafe source IDs
if (manga.source == 6908L) { if (manga.source == 6908L) {
manga.source = HENTAI_CAFE_SOURCE_ID manga.source = HENTAI_CAFE_SOURCE_ID
@ -97,7 +96,7 @@ object EXHMigrations {
manga.source = EH_SOURCE_ID manga.source = EH_SOURCE_ID
} }
return backupEntry return manga
} }
private fun backupDatabase(context: Context, oldMigrationVersion: Int) { private fun backupDatabase(context: Context, oldMigrationVersion: Int) {