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

Cleanup

Browse Source
This commit is contained in:
Jobobby04 2020-08-13 22:15:09 -04:00
parent a5c10dbf28
commit 84b9b4db55
2 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
app/src/main/java/exh/debug/DebugFunctions.kt
View File

@ -45,24 +45,26 @@ object DebugFunctions {
EXHMigrations.upgrade(prefs) EXHMigrations.upgrade(prefs)
} }
fun forceSetupJobs() {
prefs.eh_lastVersionCode().set(0)
EXHMigrations.upgrade(prefs)
}
fun resetAgedFlagInEXHManga() { fun resetAgedFlagInEXHManga() {
runBlocking { runBlocking {
val metadataManga = db.getFavoriteMangaWithMetadata().await() val metadataManga = db.getFavoriteMangaWithMetadata().await()
val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
return@mapNotNull null null
} } else manga
manga
}.toList() }.toList()
for (manga in allManga) { allManga.forEach { manga ->
val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise<EHentaiSearchMetadata>() val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise<EHentaiSearchMetadata>() ?: return@forEach
if (meta != null) { // remove age flag
// remove age flag meta.aged = false
meta.aged = false db.insertFlatMetadata(meta.flatten()).await()
db.insertFlatMetadata(meta.flatten()).await()
}
} }
} }
} }
@ -77,27 +79,24 @@ object DebugFunctions {
val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
return@mapNotNull null null
} } else manga
manga
}.toList() }.toList()
val eh = sourceManager.getOrStub(EH_SOURCE_ID) val eh = sourceManager.get(EH_SOURCE_ID)
val ex = sourceManager.getOrStub(EXH_SOURCE_ID) val ex = sourceManager.get(EXH_SOURCE_ID)
for (manga in allManga) { allManga.forEach { manga ->
throttleManager.throttle() throttleManager.throttle()
if (manga.source == EH_SOURCE_ID) { (
eh.fetchMangaDetails(manga).map { networkManga -> when (manga.source) {
manga.copyFrom(networkManga) EH_SOURCE_ID -> eh
manga.initialized = true EXH_SOURCE_ID -> ex
db.insertManga(manga).executeAsBlocking() else -> return@forEach
}
} else if (manga.source == EXH_SOURCE_ID) {
ex.fetchMangaDetails(manga).map { networkManga ->
manga.copyFrom(networkManga)
manga.initialized = true
db.insertManga(manga).executeAsBlocking()
} }
)?.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 -> val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
return@mapNotNull null null
} } else manga
manga
}.toList() }.toList()
for (manga in allManga) { allManga.forEach { manga ->
val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise<EHentaiSearchMetadata>() val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise<EHentaiSearchMetadata>() ?: return@forEach
if (meta != null) { galleries += "Aged: ${meta.aged}\t Title: ${manga.title}"
// remove age flag
galleries += "Aged: ${meta.aged}\t Title: ${manga.title}"
}
} }
} }
return galleries.joinToString(",\n") return galleries.joinToString(",\n")
@ -133,14 +128,13 @@ object DebugFunctions {
val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga -> val allManga = metadataManga.asFlow().cancellable().mapNotNull { manga ->
if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) { if (manga.source != EH_SOURCE_ID && manga.source != EXH_SOURCE_ID) {
return@mapNotNull null null
} } else manga
manga
}.toList() }.toList()
for (manga in allManga) { allManga.forEach { manga ->
val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise<EHentaiSearchMetadata>() val meta = db.getFlatMetadataForManga(manga.id!!).await()?.raise<EHentaiSearchMetadata>() ?: return@forEach
if (meta != null && meta.aged) { if (meta.aged) {
// remove age flag // remove age flag
agedAmount++ agedAmount++
} }
@ -241,8 +235,8 @@ object DebugFunctions {
fun copyEHentaiSavedSearchesToExhentai() { fun copyEHentaiSavedSearchesToExhentai() {
runBlocking { runBlocking {
val filterSerializer = FilterSerializer() val filterSerializer = FilterSerializer()
val source = sourceManager.getOrStub(EH_SOURCE_ID) as CatalogueSource val source = sourceManager.get(EH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking
val newSource = sourceManager.getOrStub(EXH_SOURCE_ID) as CatalogueSource val newSource = sourceManager.get(EXH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking
val savedSearches = prefs.eh_savedSearches().get().mapNotNull { val savedSearches = prefs.eh_savedSearches().get().mapNotNull {
try { try {
val id = it.substringBefore(':').toLong() val id = it.substringBefore(':').toLong()
@ -301,8 +295,8 @@ object DebugFunctions {
fun copyExhentaiSavedSearchesToEHentai() { fun copyExhentaiSavedSearchesToEHentai() {
runBlocking { runBlocking {
val filterSerializer = FilterSerializer() val filterSerializer = FilterSerializer()
val source = sourceManager.getOrStub(EXH_SOURCE_ID) as CatalogueSource val source = sourceManager.get(EXH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking
val newSource = sourceManager.getOrStub(EH_SOURCE_ID) as CatalogueSource val newSource = sourceManager.get(EH_SOURCE_ID) as? CatalogueSource ?: return@runBlocking
val savedSearches = prefs.eh_savedSearches().get().mapNotNull { val savedSearches = prefs.eh_savedSearches().get().mapNotNull {
try { try {
val id = it.substringBefore(':').toLong() val id = it.substringBefore(':').toLong()

3
app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
View File

@ -412,7 +412,7 @@ class FavoritesSyncHelper(val context: Context) {
} }
} }
fun needWarnThrottle() = private fun needWarnThrottle() =
throttleManager.throttleTime >= THROTTLE_WARN throttleManager.throttleTime >= THROTTLE_WARN
class IgnoredException : RuntimeException() class IgnoredException : RuntimeException()
@ -422,7 +422,6 @@ class FavoritesSyncHelper(val context: Context) {
} }
} }
// TODO String resources
sealed class FavoritesSyncStatus(val message: String) { sealed class FavoritesSyncStatus(val message: String) {
class Error(message: String) : FavoritesSyncStatus(message) class Error(message: String) : FavoritesSyncStatus(message)
class Idle(context: Context) : FavoritesSyncStatus(context.getString(R.string.favorites_sync_waiting_for_start)) class Idle(context: Context) : FavoritesSyncStatus(context.getString(R.string.favorites_sync_waiting_for_start))