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

Implement lenient sync

Browse Source
This commit is contained in:
NerdNumber9 2018-02-23 18:57:19 -05:00
parent c54d26d6ba
commit 117214c671
5 changed files with 79 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
View File

@ -125,6 +125,8 @@ object PreferenceKeys {
const val eh_readOnlySync = "eh_sync_read_only"
const val eh_lenientSync = "eh_lenient_sync"
const val eh_useOrigImages = "eh_useOrigImages"
const val eh_ehSettingsProfile = "eh_ehSettingsProfile"

2
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
View File

@ -217,6 +217,8 @@ class PreferencesHelper(val context: Context) {
fun eh_readOnlySync() = rxPrefs.getBoolean(Keys.eh_readOnlySync, false)
fun eh_lenientSync() = rxPrefs.getBoolean(Keys.eh_lenientSync, false)
fun eh_showSettingsUploadWarning() = rxPrefs.getBoolean(Keys.eh_showSettingsUploadWarning, true)
// <-- EH
}

14
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -619,6 +619,20 @@ class LibraryController(
}
?.show()
}
is FavoritesSyncStatus.CompleteWithErrors -> {
releaseSyncLocks()
favSyncDialog?.dismiss()
favSyncDialog = buildDialog()
?.title("Favorites sync complete with errors")
?.content("Errors occurred during the sync process that were ignored:\n${status.message}")
?.cancelable(false)
?.positiveText("Ok")
?.onPositive { _, _ ->
presenter.favoritesSync.status.onNext(FavoritesSyncStatus.Idle())
}
?.show()
}
is FavoritesSyncStatus.Processing,
is FavoritesSyncStatus.Initializing -> {
takeSyncLocks()

10
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt
View File

@ -135,6 +135,7 @@ class SettingsEhController : SettingsController() {
title = "Disable favorites uploading"
summary = "Favorites are only downloaded from ExHentai. Any changes to favorites in the app will not be uploaded. Prevents accidental loss of favorites on ExHentai. Note that removals will still be downloaded (if you remove a favorites on ExHentai, it will be removed in the app as well)."
key = PreferenceKeys.eh_readOnlySync
defaultValue = false
}
preference {
@ -148,9 +149,16 @@ class SettingsEhController : SettingsController() {
}
}
switchPreference {
title = "Ignore sync errors when possible"
summary = "Do not abort immediately when encountering errors during the sync process. Errors will still be displayed when the sync is complete. Can cause loss of favorites in some cases. Useful when syncing large libraries."
key = PreferenceKeys.eh_lenientSync
defaultValue = false
}
preference {
title = "Force sync state reset"
summary = "Performs a full resynchronization on the next sync. Removals will not be synced. All favorites in the app will be re-uploaded to ExHentai and all favorites on ExHentai will be redownloaded into the app. Useful for repairing sync after sync has been interrupted."
summary = "Performs a full resynchronization on the next sync. Removals will not be synced. All favorites in the app will be re-uploaded to ExHentai and all favorites on ExHentai will be re-downloaded into the app. Useful for repairing sync after sync has been interrupted."
onClick {
activity?.let {

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

@ -80,6 +80,8 @@ class FavoritesSyncHelper(val context: Context) {
return
}
val errorList = mutableListOf<String>()
try {
//Take wake + wifi locks
ignore { wakeLock?.release() }
@ -107,12 +109,12 @@ class FavoritesSyncHelper(val context: Context) {
//Apply remote categories
status.onNext(FavoritesSyncStatus.Processing("Updating category names"))
applyRemoteCategories(favorites.second)
applyRemoteCategories(errorList, favorites.second)
//Apply change sets
applyChangeSetToLocal(remoteChanges)
applyChangeSetToLocal(errorList, remoteChanges)
if(localChanges != null)
applyChangeSetToRemote(localChanges)
applyChangeSetToRemote(errorList, localChanges)
status.onNext(FavoritesSyncStatus.Processing("Cleaning up"))
storage.snapshotEntries(realm)
@ -144,10 +146,13 @@ class FavoritesSyncHelper(val context: Context) {
}
}
status.onNext(FavoritesSyncStatus.Idle())
if(errorList.isEmpty())
status.onNext(FavoritesSyncStatus.Idle())
else
status.onNext(FavoritesSyncStatus.CompleteWithErrors(errorList))
}
private fun applyRemoteCategories(categories: List<String>) {
private fun applyRemoteCategories(errorList: MutableList<String>, categories: List<String>) {
val localCategories = db.getCategories().executeAsBlocking()
val newLocalCategories = localCategories.toMutableList()
@ -189,7 +194,7 @@ class FavoritesSyncHelper(val context: Context) {
db.insertCategories(newLocalCategories).executeAsBlocking()
}
private fun addGalleryRemote(gallery: FavoriteEntry) {
private fun addGalleryRemote(errorList: MutableList<String>, gallery: FavoriteEntry) {
val url = "${exh.baseUrl}/gallerypopups.php?gid=${gallery.gid}&t=${gallery.token}&act=addfav"
val request = Request.Builder()
@ -203,8 +208,14 @@ class FavoritesSyncHelper(val context: Context) {
.build()
if(!explicitlyRetryExhRequest(10, request)) {
status.onNext(FavoritesSyncStatus.Error("Unable to add gallery to remote server: '${gallery.title}' (GID: ${gallery.gid})!"))
throw IgnoredException()
val errorString = "Unable to add gallery to remote server: '${gallery.title}' (GID: ${gallery.gid})!"
if(prefs.eh_lenientSync().getOrDefault()) {
errorList += errorString
} else {
status.onNext(FavoritesSyncStatus.Error(errorString))
throw IgnoredException()
}
}
}
@ -227,7 +238,7 @@ class FavoritesSyncHelper(val context: Context) {
return success
}
private fun applyChangeSetToRemote(changeSet: ChangeSet) {
private fun applyChangeSetToRemote(errorList: MutableList<String>, changeSet: ChangeSet) {
//Apply removals
if(changeSet.removed.isNotEmpty()) {
status.onNext(FavoritesSyncStatus.Processing("Removing ${changeSet.removed.size} galleries from remote server"))
@ -247,10 +258,14 @@ class FavoritesSyncHelper(val context: Context) {
.build()
if(!explicitlyRetryExhRequest(10, request)) {
status.onNext(FavoritesSyncStatus.Error("Unable to delete galleries from the remote servers!"))
val errorString = "Unable to delete galleries from the remote servers!"
//It is still safe to stop here so crash
throw IgnoredException()
if(prefs.eh_lenientSync().getOrDefault()) {
errorList += errorString
} else {
status.onNext(FavoritesSyncStatus.Error(errorString))
throw IgnoredException()
}
}
}
@ -262,11 +277,11 @@ class FavoritesSyncHelper(val context: Context) {
throttle()
addGalleryRemote(it)
addGalleryRemote(errorList, it)
}
}
private fun applyChangeSetToLocal(changeSet: ChangeSet) {
private fun applyChangeSetToLocal(errorList: MutableList<String>, changeSet: ChangeSet) {
val removedManga = mutableListOf<Manga>()
//Apply removals
@ -287,10 +302,12 @@ class FavoritesSyncHelper(val context: Context) {
}
}
db.deleteOldMangasCategories(removedManga).executeAsBlocking()
// Can't do too many DB OPs in one go
removedManga.chunked(10).forEach {
db.deleteOldMangasCategories(it).executeAsBlocking()
}
val insertedMangaCategories = mutableListOf<MangaCategory>()
val insertedMangaCategoriesMangas = mutableListOf<Manga>()
val insertedMangaCategories = mutableListOf<Pair<MangaCategory, Manga>>()
val categories = db.getCategories().executeAsBlocking()
//Apply additions
@ -307,19 +324,29 @@ class FavoritesSyncHelper(val context: Context) {
EXH_SOURCE_ID)
if(result is GalleryAddEvent.Fail) {
status.onNext(FavoritesSyncStatus.Error("Failed to add gallery to local database: " + when (result) {
val errorString = "Failed to add gallery to local database: " + when (result) {
is GalleryAddEvent.Fail.Error -> "'${it.title}' ${result.logMessage}"
is GalleryAddEvent.Fail.UnknownType -> "'${it.title}' (${result.galleryUrl}) is not a valid gallery!"
}))
throw IgnoredException()
}
if(prefs.eh_lenientSync().getOrDefault()) {
errorList += errorString
} else {
status.onNext(FavoritesSyncStatus.Error(errorString))
throw IgnoredException()
}
} else if(result is GalleryAddEvent.Success) {
insertedMangaCategories += MangaCategory.create(result.manga,
categories[it.category])
insertedMangaCategoriesMangas += result.manga
categories[it.category]) to result.manga
}
}
db.setMangaCategories(insertedMangaCategories, insertedMangaCategoriesMangas)
// Can't do too many DB OPs in one go
insertedMangaCategories.chunked(10).map {
Pair(it.map { it.first }, it.map { it.second })
}.forEach {
db.setMangaCategories(it.first, it.second)
}
}
fun throttle() {
@ -341,7 +368,7 @@ class FavoritesSyncHelper(val context: Context) {
}
fun needWarnThrottle()
= throttleTime >= THROTTLE_WARN
= throttleTime >= THROTTLE_WARN
class IgnoredException : RuntimeException()
@ -360,4 +387,5 @@ sealed class FavoritesSyncStatus(val message: String) {
(message + "\n\nSync is currently throttling (to avoid being banned from ExHentai) and may take a long time to complete.")
else
message)
class CompleteWithErrors(messages: List<String>) : FavoritesSyncStatus(messages.joinToString("\n"))
}