copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Fix: Pinned sources were not restored from backup (#787)

Browse source 
* Fix: Pinned sources were not restored from backup

* improve code readability

* rename migrateSourceIds function
This commit is contained in:
Cuong-Tran 2025-03-25 15:22:03 +07:00 committed by GitHub
parent 0828057650
commit 259a00ebaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/PreferenceRestorer.kt
View file

@ -113,7 +113,11 @@ class PreferenceRestorer(
// KMK -->
when (key) {
SourcePreferences.PINNED_SOURCES_PREF_KEY ->
EXHMigrations.migratePinnedSources(value.value)
restorePinnedSourcesPreference(
key,
value.value,
preferenceStore,
)
else ->
// KMK <--
preferenceStore.getStringSet(key).set(value.value)
@ -151,4 +155,15 @@ class PreferenceRestorer(
}
return true
}
private fun restorePinnedSourcesPreference(
key: String,
value: Set<String>,
preferenceStore: PreferenceStore,
) {
if (value.isEmpty()) return
val valueToSet = EXHMigrations.migrateSourceIds(value)
preferenceStore.getStringSet(key).set(valueToSet)
}
}

26
app/src/main/java/exh/EXHMigrations.kt
View file

@ -140,29 +140,29 @@ object EXHMigrations {
/**
* Migrate old source ID of delegated sources in old backup
*/
fun migratePinnedSources(pinnedSources: Set<String>): Set<String> {
var pinned = pinnedSources
if (NHENTAI_OLD_ID.toString() in pinned) {
pinned = pinned.minus(NHENTAI_OLD_ID.toString())
fun migrateSourceIds(oldSourceIds: Set<String>): Set<String> {
var newSourceIds = oldSourceIds
if (NHENTAI_OLD_ID.toString() in newSourceIds) {
newSourceIds = newSourceIds.minus(NHENTAI_OLD_ID.toString())
.plus(NHENTAI_SOURCE_ID.toString())
}
if (TSUMINO_OLD_ID.toString() in pinned) {
pinned = pinned.minus(TSUMINO_OLD_ID.toString())
if (TSUMINO_OLD_ID.toString() in newSourceIds) {
newSourceIds = newSourceIds.minus(TSUMINO_OLD_ID.toString())
.plus(TSUMINO_SOURCE_ID.toString())
}
if (HBROWSE_OLD_ID.toString() in pinned) {
pinned = pinned.minus(HBROWSE_OLD_ID.toString())
if (HBROWSE_OLD_ID.toString() in newSourceIds) {
newSourceIds = newSourceIds.minus(HBROWSE_OLD_ID.toString())
.plus(HBROWSE_SOURCE_ID.toString())
}
if (EH_OLD_ID.toString() in pinned) {
pinned = pinned.minus(EH_OLD_ID.toString())
if (EH_OLD_ID.toString() in newSourceIds) {
newSourceIds = newSourceIds.minus(EH_OLD_ID.toString())
.plus(EH_SOURCE_ID.toString())
}
if (EXH_OLD_ID.toString() in pinned) {
pinned = pinned.minus(EXH_OLD_ID.toString())
if (EXH_OLD_ID.toString() in newSourceIds) {
newSourceIds = newSourceIds.minus(EXH_OLD_ID.toString())
.plus(EXH_SOURCE_ID.toString())
}
return pinned
return newSourceIds
}
// KMK -->