null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-07-16 22:06:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(backup/creator): Backup should be created after backup file path is validated

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-08-03 21:33:50 +07:00
parent 24784d6e78
commit ad3bb53519
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,33 +38,23 @@ class BackupCreator(
private val preferences: PreferencesHelper = Injekt.get() private val preferences: PreferencesHelper = Injekt.get()
private val storageManager: StorageManager by injectLazy() private val storageManager: StorageManager by injectLazy()
@Suppress("RedundantSuspendModifier")
private suspend fun getDatabaseManga(includeReadManga: Boolean) = db.inTransactionReturn {
db.getFavoriteMangas().executeAsBlocking() +
if (includeReadManga) {
db.getReadNotInLibraryMangas().executeAsBlocking()
} else {
emptyList()
}
}
/** /**
* Create backup Json file from database * Create backup Json file from database
* *
* @param uri path of Uri * @param uri path of Uri
* @param isAutoBackup backup called from scheduled backup job * @param isAutoBackup backup called from scheduled backup job
*/ */
@Suppress("RedundantSuspendModifier")
suspend fun createBackup(uri: Uri, options: BackupOptions, isAutoBackup: Boolean): String { suspend fun createBackup(uri: Uri, options: BackupOptions, isAutoBackup: Boolean): String {
val databaseManga = db.inTransactionReturn {
db.getFavoriteMangas().executeAsBlocking() +
if (options.readManga) {
db.getReadNotInLibraryMangas().executeAsBlocking()
} else {
emptyList()
}
}
val backupManga = mangaBackupCreator(databaseManga, options)
val backup = Backup(
backupManga = backupManga,
backupCategories = categoriesBackupCreator(options),
backupBrokenSources = emptyList(),
backupSources = sourcesBackupCreator(backupManga),
backupPreferences = preferenceBackupCreator.backupAppPreferences(options),
backupSourcePreferences = preferenceBackupCreator.backupSourcePreferences(options),
)
var file: UniFile? = null var file: UniFile? = null
try { try {
file = if (isAutoBackup) { file = if (isAutoBackup) {
@ -89,6 +79,16 @@ class BackupCreator(
throw IllegalStateException("Failed to get handle on file") throw IllegalStateException("Failed to get handle on file")
} }
val backupManga = mangaBackupCreator(getDatabaseManga(options.readManga), options)
val backup = Backup(
backupManga = backupManga,
backupCategories = categoriesBackupCreator(options),
backupBrokenSources = emptyList(),
backupSources = sourcesBackupCreator(backupManga),
backupPreferences = preferenceBackupCreator.backupAppPreferences(options),
backupSourcePreferences = preferenceBackupCreator.backupSourcePreferences(options),
)
val byteArray = parser.encodeToByteArray(Backup.serializer(), backup) val byteArray = parser.encodeToByteArray(Backup.serializer(), backup)
if (byteArray.isEmpty()) { if (byteArray.isEmpty()) {
throw IllegalStateException(context.getString(MR.strings.empty_backup_error)) throw IllegalStateException(context.getString(MR.strings.empty_backup_error))