diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt index fa03b1f93..4c03e0261 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupManager.kt @@ -6,16 +6,10 @@ import eu.kanade.data.DatabaseHandler import eu.kanade.data.toLong import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga -import eu.kanade.tachiyomi.data.database.models.toMangaInfo import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.track.TrackManager -import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceManager -import eu.kanade.tachiyomi.source.model.toSChapter -import eu.kanade.tachiyomi.source.online.all.EHentai -import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource -import exh.eh.EHentaiThrottleManager import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import data.Mangas as DbManga @@ -43,32 +37,6 @@ abstract class AbstractBackupManager(protected val context: Context) { return handler.awaitOneOrNull { mangasQueries.getMangaByUrlAndSource(url, source) } } - /** - * Fetches chapter information. - * - * @param source source of manga - * @param manga manga that needs updating - * @param chapters list of chapters in the backup - * @return Updated manga chapters. - */ - internal open suspend fun restoreChapters(source: Source, manga: Manga, chapters: List /* SY --> */, throttleManager: EHentaiThrottleManager /* SY <-- */): Pair, List> { - // SY --> - val fetchedChapters = if (source is EHentai) { - source.getChapterList(manga.toMangaInfo(), throttleManager::throttle) - .map { it.toSChapter() } - } else { - source.getChapterList(manga.toMangaInfo()) - .map { it.toSChapter() } - } - // SY <-- - val syncedChapters = syncChaptersWithSource(fetchedChapters, manga, source) - if (syncedChapters.first.isNotEmpty()) { - chapters.forEach { it.manga_id = manga.id } - updateChapters(chapters) - } - return syncedChapters - } - /** * Returns list containing manga from library * diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt index 403b17167..781cbf7f6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/AbstractBackupRestore.kt @@ -3,16 +3,12 @@ package eu.kanade.tachiyomi.data.backup import android.content.Context import android.net.Uri import eu.kanade.data.DatabaseHandler -import eu.kanade.data.chapter.NoChaptersException import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.data.database.models.Chapter import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.database.models.Track import eu.kanade.tachiyomi.data.library.CustomMangaManager import eu.kanade.tachiyomi.data.track.TrackManager -import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.util.system.createFileInCacheDir -import exh.eh.EHentaiThrottleManager import kotlinx.coroutines.Job import uy.kohesive.injekt.injectLazy import java.io.File @@ -36,10 +32,6 @@ abstract class AbstractBackupRestore(protected val co protected var restoreAmount = 0 protected var restoreProgress = 0 - // SY --> - protected val throttleManager = EHentaiThrottleManager() - // SY <-- - /** * Mapping of source ID to source name from backup data */ @@ -67,28 +59,6 @@ abstract class AbstractBackupRestore(protected val co return true } - /** - * Fetches chapter information. - * - * @param source source of manga - * @param manga manga that needs updating - * @return Updated manga chapters. - */ - internal suspend fun updateChapters(source: Source, manga: Manga, chapters: List): Pair, List> { - return try { - backupManager.restoreChapters(source, manga, chapters /* SY --> */, throttleManager /* SY <-- */) - } catch (e: Exception) { - // If there's any error, return empty update and continue. - val errorMessage = if (e is NoChaptersException) { - context.getString(R.string.no_chapters_error) - } else { - e.message - } - errors.add(Date() to "${manga.title} - $errorMessage") - Pair(emptyList(), emptyList()) - } - } - /** * Refreshes tracking information. * diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt index 1fc4d7246..95fd7f170 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt @@ -27,9 +27,6 @@ import java.util.Date class FullBackupRestore(context: Context, notifier: BackupNotifier) : AbstractBackupRestore(context, notifier) { override suspend fun performRestore(uri: Uri): Boolean { - // SY --> - throttleManager.resetThrottle() - // SY <-- backupManager = FullBackupManager(context) val backupString = context.contentResolver.openInputStream(uri)!!.source().gzip().buffer().use { it.readByteArray() }