From 84b9b4db555053d42b7f21529bc9821280ff782f Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 13 Aug 2020 22:15:09 -0400 Subject: [PATCH] Cleanup --- app/src/main/java/exh/debug/DebugFunctions.kt | 86 +++++++++---------- .../java/exh/favorites/FavoritesSyncHelper.kt | 3 +- 2 files changed, 41 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/exh/debug/DebugFunctions.kt b/app/src/main/java/exh/debug/DebugFunctions.kt index 6f4cb8e48..f9a23d0d4 100644 --- a/app/src/main/java/exh/debug/DebugFunctions.kt +++ b/app/src/main/java/exh/debug/DebugFunctions.kt @@ -45,24 +45,26 @@ object DebugFunctions { EXHMigrations.upgrade(prefs) } + fun forceSetupJobs() { + prefs.eh_lastVersionCode().set(0) + EXHMigrations.upgrade(prefs) + } + fun resetAgedFlagInEXHManga() { runBlocking { val metadataManga = db.getFavoriteMangaWithMetadata().await() val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { - return@mapNotNull null - } - manga + null + } else manga }.toList() - for (manga in allManga) { - val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() - if (meta != null) { - // remove age flag - meta.aged = false - db.insertFlatMetadata(meta.flatten()).await() - } + allManga.forEach { manga -> + val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() ?: return@forEach + // remove age flag + meta.aged = false + db.insertFlatMetadata(meta.flatten()).await() } } } @@ -77,27 +79,24 @@ object DebugFunctions { val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { - return@mapNotNull null - } - manga + null + } else manga }.toList() - val eh = sourceManager.getOrStub(EH_SOURCE_ID) - val ex = sourceManager.getOrStub(EXH_SOURCE_ID) + val eh = sourceManager.get(EH_SOURCE_ID) + val ex = sourceManager.get(EXH_SOURCE_ID) - for (manga in allManga) { + allManga.forEach { manga -> throttleManager.throttle() - if (manga.source == EH_SOURCE_ID) { - eh.fetchMangaDetails(manga).map { networkManga -> - manga.copyFrom(networkManga) - manga.initialized = true - db.insertManga(manga).executeAsBlocking() - } - } else if (manga.source == EXH_SOURCE_ID) { - ex.fetchMangaDetails(manga).map { networkManga -> - manga.copyFrom(networkManga) - manga.initialized = true - db.insertManga(manga).executeAsBlocking() + ( + when (manga.source) { + EH_SOURCE_ID -> eh + EXH_SOURCE_ID -> ex + else -> return@forEach } + )?.fetchMangaDetails(manga)?.map { networkManga -> + manga.copyFrom(networkManga) + manga.initialized = true + db.insertManga(manga).executeAsBlocking() } } } @@ -110,17 +109,13 @@ object DebugFunctions { val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { - return@mapNotNull null - } - manga + null + } else manga }.toList() - for (manga in allManga) { - val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() - if (meta != null) { - // remove age flag - galleries += "Aged: ${meta.aged}\t Title: ${manga.title}" - } + allManga.forEach { manga -> + val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() ?: return@forEach + galleries += "Aged: ${meta.aged}\t Title: ${manga.title}" } } return galleries.joinToString(",\n") @@ -133,14 +128,13 @@ object DebugFunctions { val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { - return@mapNotNull null - } - manga + null + } else manga }.toList() - for (manga in allManga) { - val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() - if (meta != null && meta.aged) { + allManga.forEach { manga -> + val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise() ?: return@forEach + if (meta.aged) { // remove age flag agedAmount++ } @@ -241,8 +235,8 @@ object DebugFunctions { fun copyEHentaiSavedSearchesToExhentai() { runBlocking { val filterSerializer = FilterSerializer() - val source = sourceManager.getOrStub(EH_SOURCE_ID) as CatalogueSource - val newSource = sourceManager.getOrStub(EXH_SOURCE_ID) as CatalogueSource + val source = sourceManager.get(EH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking + val newSource = sourceManager.get(EXH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking val savedSearches = prefs.eh_savedSearches().get().mapNotNull { try { val id = it.substringBefore(':').toLong() @@ -301,8 +295,8 @@ object DebugFunctions { fun copyExhentaiSavedSearchesToEHentai() { runBlocking { val filterSerializer = FilterSerializer() - val source = sourceManager.getOrStub(EXH_SOURCE_ID) as CatalogueSource - val newSource = sourceManager.getOrStub(EH_SOURCE_ID) as CatalogueSource + val source = sourceManager.get(EXH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking + val newSource = sourceManager.get(EH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking val savedSearches = prefs.eh_savedSearches().get().mapNotNull { try { val id = it.substringBefore(':').toLong() diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt index cfdb6e502..4980c200b 100644 --- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt +++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt @@ -412,7 +412,7 @@ class FavoritesSyncHelper(val context: Context) { } } - fun needWarnThrottle() = + private fun needWarnThrottle() = throttleManager.throttleTime >= THROTTLE_WARN class IgnoredException : RuntimeException() @@ -422,7 +422,6 @@ class FavoritesSyncHelper(val context: Context) { } } -// TODO String resources sealed class FavoritesSyncStatus(val message: String) { class Error(message: String) : FavoritesSyncStatus(message) class Idle(context: Context) : FavoritesSyncStatus(context.getString(R.string.favorites_sync_waiting_for_start))