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

Cleanup backup/restore related code

Browse Source 
(cherry picked from commit c201b341a716b90d378dcda4bd9b8ac4a343d4fc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
This commit is contained in:
AntsyLich 2024-07-30 04:59:16 +06:00 committed by Jobobby04
parent a62dd5821a
commit e303b88b90
11 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt
View File

@ -61,24 +61,22 @@ class BackupCreator(
suspend fun backup(uri: Uri, options: BackupOptions): String { suspend fun backup(uri: Uri, options: BackupOptions): String {
var file: UniFile? = null var file: UniFile? = null
try { try {
file = ( file = if (isAutoBackup) {
if (isAutoBackup) { // Get dir of file and create
// Get dir of file and create val dir = UniFile.fromUri(context, uri)
val dir = UniFile.fromUri(context, uri)
// Delete older backups // Delete older backups
dir?.listFiles { _, filename -> FILENAME_REGEX.matches(filename) } dir?.listFiles { _, filename -> FILENAME_REGEX.matches(filename) }
.orEmpty() .orEmpty()
.sortedByDescending { it.name } .sortedByDescending { it.name }
.drop(MAX_AUTO_BACKUPS - 1) .drop(MAX_AUTO_BACKUPS - 1)
.forEach { it.delete() } .forEach { it.delete() }
// Create new file to place backup // Create new file to place backup
dir?.createFile(getFilename()) dir?.createFile(getFilename())
} else { } else {
UniFile.fromUri(context, uri) UniFile.fromUri(context, uri)
} }
)
if (file == null || !file.isFile) { if (file == null || !file.isFile) {
throw IllegalStateException(context.stringResource(MR.strings.create_backup_file_error)) throw IllegalStateException(context.stringResource(MR.strings.create_backup_file_error))
@ -100,7 +98,7 @@ class BackupCreator(
backupPreferences = backupAppPreferences(options), backupPreferences = backupAppPreferences(options),
backupSourcePreferences = backupSourcePreferences(options), backupSourcePreferences = backupSourcePreferences(options),
// SY --> // SY -->
backupSavedSearches = backupSavedSearches(), backupSavedSearches = backupSavedSearches(options),
// SY <-- // SY <--
) )
@ -137,34 +135,36 @@ class BackupCreator(
suspend fun backupCategories(options: BackupOptions): List<BackupCategory> { suspend fun backupCategories(options: BackupOptions): List<BackupCategory> {
if (!options.categories) return emptyList() if (!options.categories) return emptyList()
return categoriesBackupCreator.backupCategories() return categoriesBackupCreator()
} }
suspend fun backupMangas(mangas: List<Manga>, options: BackupOptions): List<BackupManga> { suspend fun backupMangas(mangas: List<Manga>, options: BackupOptions): List<BackupManga> {
if (!options.libraryEntries) return emptyList() if (!options.libraryEntries) return emptyList()
return mangaBackupCreator.backupMangas(mangas, options) return mangaBackupCreator(mangas, options)
} }
fun backupSources(mangas: List<BackupManga>): List<BackupSource> { fun backupSources(mangas: List<BackupManga>): List<BackupSource> {
return sourcesBackupCreator.backupSources(mangas) return sourcesBackupCreator(mangas)
} }
fun backupAppPreferences(options: BackupOptions): List<BackupPreference> { fun backupAppPreferences(options: BackupOptions): List<BackupPreference> {
if (!options.appSettings) return emptyList() if (!options.appSettings) return emptyList()
return preferenceBackupCreator.backupAppPreferences(includePrivatePreferences = options.privateSettings) return preferenceBackupCreator.createApp(includePrivatePreferences = options.privateSettings)
} }
fun backupSourcePreferences(options: BackupOptions): List<BackupSourcePreferences> { fun backupSourcePreferences(options: BackupOptions): List<BackupSourcePreferences> {
if (!options.sourceSettings) return emptyList() if (!options.sourceSettings) return emptyList()
return preferenceBackupCreator.backupSourcePreferences(includePrivatePreferences = options.privateSettings) return preferenceBackupCreator.createSource(includePrivatePreferences = options.privateSettings)
} }
// SY --> // SY -->
suspend fun backupSavedSearches(): List<BackupSavedSearch> { suspend fun backupSavedSearches(options: BackupOptions): List<BackupSavedSearch> {
return savedSearchBackupCreator.backupSavedSearches() if (!options.savedSearches) return emptyList()
return savedSearchBackupCreator()
} }
// SY <-- // SY <--

8
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt
View File

@ -17,6 +17,7 @@ data class BackupOptions(
// SY --> // SY -->
val customInfo: Boolean = true, val customInfo: Boolean = true,
val readEntries: Boolean = true, val readEntries: Boolean = true,
val savedSearches: Boolean = true,
// SY <-- // SY <--
) { ) {
@ -32,6 +33,7 @@ data class BackupOptions(
// SY --> // SY -->
customInfo, customInfo,
readEntries, readEntries,
savedSearches,
// SY <-- // SY <--
) )
@ -80,6 +82,11 @@ data class BackupOptions(
setter = { options, enabled -> options.copy(readEntries = enabled) }, setter = { options, enabled -> options.copy(readEntries = enabled) },
enabled = { it.libraryEntries }, enabled = { it.libraryEntries },
), ),
Entry(
label = SYMR.strings.saved_searches,
getter = BackupOptions::savedSearches,
setter = { options, enabled -> options.copy(savedSearches = enabled) },
),
// SY <-- // SY <--
) )
@ -114,6 +121,7 @@ data class BackupOptions(
// SY --> // SY -->
customInfo = array[8], customInfo = array[8],
readEntries = array[9], readEntries = array[9],
savedSearches = array[10],
// SY <-- // SY <--
) )
} }

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/CategoriesBackupCreator.kt
View File

@ -11,7 +11,7 @@ class CategoriesBackupCreator(
private val getCategories: GetCategories = Injekt.get(), private val getCategories: GetCategories = Injekt.get(),
) { ) {
suspend fun backupCategories(): List<BackupCategory> { suspend operator fun invoke(): List<BackupCategory> {
return getCategories.await() return getCategories.await()
.filterNot(Category::isSystemCategory) .filterNot(Category::isSystemCategory)
.map(backupCategoryMapper) .map(backupCategoryMapper)

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/MangaBackupCreator.kt
View File

@ -34,7 +34,7 @@ class MangaBackupCreator(
// SY <-- // SY <--
) { ) {
suspend fun backupMangas(mangas: List<Manga>, options: BackupOptions): List<BackupManga> { suspend operator fun invoke(mangas: List<Manga>, options: BackupOptions): List<BackupManga> {
return mangas.map { return mangas.map {
backupManga(it, options) backupManga(it, options)
} }

4
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/PreferenceBackupCreator.kt
View File

@ -22,12 +22,12 @@ class PreferenceBackupCreator(
private val preferenceStore: PreferenceStore = Injekt.get(), private val preferenceStore: PreferenceStore = Injekt.get(),
) { ) {
fun backupAppPreferences(includePrivatePreferences: Boolean): List<BackupPreference> { fun createApp(includePrivatePreferences: Boolean): List<BackupPreference> {
return preferenceStore.getAll().toBackupPreferences() return preferenceStore.getAll().toBackupPreferences()
.withPrivatePreferences(includePrivatePreferences) .withPrivatePreferences(includePrivatePreferences)
} }
fun backupSourcePreferences(includePrivatePreferences: Boolean): List<BackupSourcePreferences> { fun createSource(includePrivatePreferences: Boolean): List<BackupSourcePreferences> {
return sourceManager.getCatalogueSources() return sourceManager.getCatalogueSources()
.filterIsInstance<ConfigurableSource>() .filterIsInstance<ConfigurableSource>()
.map { .map {

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/creators/SavedSearchBackupCreator.kt
View File

@ -10,7 +10,7 @@ class SavedSearchBackupCreator(
private val handler: DatabaseHandler = Injekt.get() private val handler: DatabaseHandler = Injekt.get()
) { ) {
suspend fun backupSavedSearches(): List<BackupSavedSearch> { suspend operator fun invoke(): List<BackupSavedSearch> {
return handler.awaitList { saved_searchQueries.selectAll(backupSavedSearchMapper) } return handler.awaitList { saved_searchQueries.selectAll(backupSavedSearchMapper) }
} }
} }

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

@ -11,7 +11,7 @@ class SourcesBackupCreator(
private val sourceManager: SourceManager = Injekt.get(), private val sourceManager: SourceManager = Injekt.get(),
) { ) {
fun backupSources(mangas: List<BackupManga>): List<BackupSource> { operator fun invoke(mangas: List<BackupManga>): List<BackupSource> {
return mangas return mangas
.asSequence() .asSequence()
.map(BackupManga::source) .map(BackupManga::source)

8
app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt
View File

@ -117,7 +117,7 @@ class BackupRestorer(
private fun CoroutineScope.restoreCategories(backupCategories: List<BackupCategory>) = launch { private fun CoroutineScope.restoreCategories(backupCategories: List<BackupCategory>) = launch {
ensureActive() ensureActive()
categoriesRestorer.restoreCategories(backupCategories) categoriesRestorer(backupCategories)
restoreProgress += 1 restoreProgress += 1
notifier.showRestoreProgress( notifier.showRestoreProgress(
@ -153,7 +153,7 @@ class BackupRestorer(
ensureActive() ensureActive()
try { try {
mangaRestorer.restoreManga(it, backupCategories) mangaRestorer.restore(it, backupCategories)
} catch (e: Exception) { } catch (e: Exception) {
val sourceName = sourceMapping[it.source] ?: it.source.toString() val sourceName = sourceMapping[it.source] ?: it.source.toString()
errors.add(Date() to "${it.title} [$sourceName]: ${e.message}") errors.add(Date() to "${it.title} [$sourceName]: ${e.message}")
@ -166,7 +166,7 @@ class BackupRestorer(
private fun CoroutineScope.restoreAppPreferences(preferences: List<BackupPreference>) = launch { private fun CoroutineScope.restoreAppPreferences(preferences: List<BackupPreference>) = launch {
ensureActive() ensureActive()
preferenceRestorer.restoreAppPreferences(preferences) preferenceRestorer.restoreApp(preferences)
restoreProgress += 1 restoreProgress += 1
notifier.showRestoreProgress( notifier.showRestoreProgress(
@ -179,7 +179,7 @@ class BackupRestorer(
private fun CoroutineScope.restoreSourcePreferences(preferences: List<BackupSourcePreferences>) = launch { private fun CoroutineScope.restoreSourcePreferences(preferences: List<BackupSourcePreferences>) = launch {
ensureActive() ensureActive()
preferenceRestorer.restoreSourcePreferences(preferences) preferenceRestorer.restoreSource(preferences)
restoreProgress += 1 restoreProgress += 1
notifier.showRestoreProgress( notifier.showRestoreProgress(

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/CategoriesRestorer.kt
View File

@ -13,7 +13,7 @@ class CategoriesRestorer(
private val libraryPreferences: LibraryPreferences = Injekt.get(), private val libraryPreferences: LibraryPreferences = Injekt.get(),
) { ) {
suspend fun restoreCategories(backupCategories: List<BackupCategory>) { suspend operator fun invoke(backupCategories: List<BackupCategory>) {
if (backupCategories.isNotEmpty()) { if (backupCategories.isNotEmpty()) {
val dbCategories = getCategories.await() val dbCategories = getCategories.await()
val dbCategoriesByName = dbCategories.associateBy { it.name } val dbCategoriesByName = dbCategories.associateBy { it.name }

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/restorers/MangaRestorer.kt
View File

@ -68,7 +68,7 @@ class MangaRestorer(
) )
} }
suspend fun restoreManga( suspend fun restore(
backupManga: BackupManga, backupManga: BackupManga,
backupCategories: List<BackupCategory>, backupCategories: List<BackupCategory>,
) { ) {

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

@ -22,14 +22,14 @@ class PreferenceRestorer(
private val preferenceStore: PreferenceStore = Injekt.get(), private val preferenceStore: PreferenceStore = Injekt.get(),
) { ) {
fun restoreAppPreferences(preferences: List<BackupPreference>) { fun restoreApp(preferences: List<BackupPreference>) {
restorePreferences(preferences, preferenceStore) restorePreferences(preferences, preferenceStore)
LibraryUpdateJob.setupTask(context) LibraryUpdateJob.setupTask(context)
BackupCreateJob.setupTask(context) BackupCreateJob.setupTask(context)
} }
fun restoreSourcePreferences(preferences: List<BackupSourcePreferences>) { fun restoreSource(preferences: List<BackupSourcePreferences>) {
preferences.forEach { preferences.forEach {
val sourcePrefs = AndroidPreferenceStore(context, sourcePreferences(it.sourceKey)) val sourcePrefs = AndroidPreferenceStore(context, sourcePreferences(it.sourceKey))
restorePreferences(it.prefs, sourcePrefs) restorePreferences(it.prefs, sourcePrefs)