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

Fix library is backed up when disabled and make categories backup/restore independent

Browse source 
(cherry picked from commit 56fb4f62a152e87a71892aa68c78cac51a2c8596)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/RestoreOptions.kt
This commit is contained in:
AntsyLich 2024-07-30 04:47:57 +06:00 committed by Cuong-Tran
parent b1cd9d2085
commit 2500317134
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
9 changed files with 47 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
View file

@ -6,7 +6,6 @@ import android.content.Intent
import android.net.Uri
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.collectAsState
@ -69,7 +68,7 @@ class CreateBackupScreen : Screen() {
LazyColumnWithAction(
contentPadding = contentPadding,
actionLabel = stringResource(MR.strings.action_create),
actionEnabled = state.options.anyEnabled(),
actionEnabled = state.options.canCreate(),
onClickAction = {
if (!BackupCreateJob.isManualJobRunning(context)) {
try {
@ -104,7 +103,7 @@ class CreateBackupScreen : Screen() {
}
@Composable
private fun ColumnScope.Options(
private fun Options(
options: ImmutableList<BackupOptions.Entry>,
state: CreateBackupScreenModel.State,
model: CreateBackupScreenModel,

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/data/RestoreBackupScreen.kt
View file

@ -63,7 +63,7 @@ class RestoreBackupScreen(
LazyColumnWithAction(
contentPadding = contentPadding,
actionLabel = stringResource(MR.strings.action_restore),
actionEnabled = state.canRestore && state.options.anyEnabled(),
actionEnabled = state.canRestore && state.options.canRestore(),
onClickAction = {
model.startRestore()
navigator.pop()

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/data/SyncSettingsSelector.kt
View file

@ -49,7 +49,7 @@ class SyncSettingsSelector : Screen() {
LazyColumnWithAction(
contentPadding = contentPadding,
actionLabel = stringResource(SYMR.strings.label_sync),
actionEnabled = state.options.anyEnabled(),
actionEnabled = state.options.canCreate(),
onClickAction = {
if (!SyncDataJob.isRunning(context)) {
model.syncNow(context)

7
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
View file

@ -95,10 +95,11 @@ class BackupCreator(
} else {
emptyList()
} + getMergedManga.await() // SY <--
val backupManga = backupMangas(databaseManga, options)
val backup = Backup(
backupManga = backupMangas(databaseManga, options),
backupManga = backupManga,
backupCategories = backupCategories(options),
backupSources = backupSources(databaseManga),
backupSources = backupSources(backupManga),
backupPreferences = backupAppPreferences(options),
backupSourcePreferences = backupSourcePreferences(options),
// SY -->
@ -149,7 +150,7 @@ class BackupCreator(
return mangaBackupCreator.backupMangas(mangas, options)
}
fun backupSources(mangas: List<Manga>): List<BackupSource> {
fun backupSources(mangas: List<BackupManga>): List<BackupSource> {
return sourcesBackupCreator.backupSources(mangas)
}

13
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt
View file

@ -35,7 +35,7 @@ data class BackupOptions(
// SY <--
)
fun anyEnabled() = libraryEntries || appSettings || sourceSettings
fun canCreate() = libraryEntries || categories || appSettings || sourceSettings
companion object {
val libraryOptions = persistentListOf(
@ -44,12 +44,6 @@ data class BackupOptions(
getter = BackupOptions::libraryEntries,
setter = { options, enabled -> options.copy(libraryEntries = enabled) },
),
Entry(
label = MR.strings.categories,
getter = BackupOptions::categories,
setter = { options, enabled -> options.copy(categories = enabled) },
enabled = { it.libraryEntries },
),
Entry(
label = MR.strings.chapters,
getter = BackupOptions::chapters,
@ -68,6 +62,11 @@ data class BackupOptions(
setter = { options, enabled -> options.copy(history = enabled) },
enabled = { it.libraryEntries },
),
Entry(
label = MR.strings.categories,
getter = BackupOptions::categories,
setter = { options, enabled -> options.copy(categories = enabled) },
),
// SY -->
Entry(
label = SYMR.strings.custom_entry_info,

6
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SourcesBackupCreator.kt
View file

@ -1,8 +1,8 @@
package eu.kanade.tachiyomi.data.backup.create.creators
import eu.kanade.tachiyomi.data.backup.models.BackupManga
import eu.kanade.tachiyomi.data.backup.models.BackupSource
import eu.kanade.tachiyomi.source.Source
import tachiyomi.domain.manga.model.Manga
import tachiyomi.domain.source.service.SourceManager
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@ -11,10 +11,10 @@ class SourcesBackupCreator(
private val sourceManager: SourceManager = Injekt.get(),
) {
fun backupSources(mangas: List<Manga>): List<BackupSource> {
fun backupSources(mangas: List<BackupManga>): List<BackupSource> {
return mangas
.asSequence()
.map(Manga::source)
.map(BackupManga::source)
.distinct()
.map(sourceManager::getOrStub)
.map { it.toBackupSource() }

13
app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt
View file

@ -79,8 +79,11 @@ class BackupRestorer(
val backupMaps = backup.backupSources + backup.backupBrokenSources.map { it.toBackupSource() }
sourceMapping = backupMaps.associate { it.sourceId to it.name }
if (options.library) {
restoreAmount += backup.backupManga.size + 1 // +1 for categories
if (options.libraryEntries) {
restoreAmount += backup.backupManga.size
}
if (options.categories) {
restoreAmount += 1
}
// SY -->
if (options.savedSearches) {
@ -95,7 +98,7 @@ class BackupRestorer(
}
coroutineScope {
if (options.library) {
if (options.categories) {
restoreCategories(backup.backupCategories)
}
// SY -->
@ -114,8 +117,8 @@ class BackupRestorer(
if (options.sourceSettings) {
restoreSourcePreferences(backup.backupSourcePreferences)
}
if (options.library) {
restoreManga(backup.backupManga, backup.backupCategories)
if (options.libraryEntries) {
restoreManga(backup.backupManga, if (options.categories) backup.backupCategories else emptyList())
}
// TODO: optionally trigger online library + tracker update

27
app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/RestoreOptions.kt
View file

@ -6,7 +6,8 @@ import tachiyomi.i18n.MR
import tachiyomi.i18n.kmk.KMR
data class RestoreOptions(
val library: Boolean = true,
val libraryEntries: Boolean = true,
val categories: Boolean = true,
val appSettings: Boolean = true,
val sourceSettings: Boolean = true,
// SY -->
@ -15,7 +16,8 @@ data class RestoreOptions(
) {
fun asBooleanArray() = booleanArrayOf(
library,
libraryEntries,
categories,
appSettings,
sourceSettings,
// SY -->
@ -23,14 +25,20 @@ data class RestoreOptions(
// SY <--
)
fun anyEnabled() = library || appSettings || sourceSettings /* SY --> */ || savedSearches /* SY <-- */
fun canRestore() = libraryEntries || categories || appSettings || sourceSettings /* SY --> */ ||
savedSearches /* SY <-- */
companion object {
val options = persistentListOf(
Entry(
label = MR.strings.label_library,
getter = RestoreOptions::library,
setter = { options, enabled -> options.copy(library = enabled) },
getter = RestoreOptions::libraryEntries,
setter = { options, enabled -> options.copy(libraryEntries = enabled) },
),
Entry(
label = MR.strings.categories,
getter = RestoreOptions::categories,
setter = { options, enabled -> options.copy(categories = enabled) },
),
Entry(
label = MR.strings.app_settings,
@ -52,11 +60,12 @@ data class RestoreOptions(
)
fun fromBooleanArray(array: BooleanArray) = RestoreOptions(
library = array[0],
appSettings = array[1],
sourceSettings = array[2],
libraryEntries = array[0],
categories = array[1],
appSettings = array[2],
sourceSettings = array[3],
// SY -->
savedSearches = array[3]
savedSearches = array[4]
// SY <--
)
}

11
app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt
View file

@ -95,10 +95,11 @@ class SyncManager(
)
logcat(LogPriority.DEBUG) { "Begin create backup" }
val backupManga = backupCreator.backupMangas(databaseManga, backupOptions)
val backup = Backup(
backupManga = backupCreator.backupMangas(databaseManga, backupOptions),
backupManga = backupManga,
backupCategories = backupCreator.backupCategories(backupOptions),
backupSources = backupCreator.backupSources(databaseManga),
backupSources = backupCreator.backupSources(backupManga),
backupPreferences = backupCreator.backupAppPreferences(backupOptions),
backupSourcePreferences = backupCreator.backupSourcePreferences(backupOptions),
@ -199,11 +200,7 @@ class SyncManager(
context,
backupUri,
sync = true,
options = RestoreOptions(
appSettings = true,
sourceSettings = true,
library = true,
),
options = RestoreOptions(),
)
// update the sync timestamp