null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(backup/creator): Some clean up

Browse source 
* Don't try to auto backup if restorer is running
* Return early if file path is null
* Set to foreground before attempting to create a backup
* Added separate function to retrieve auto backup directory instead
  using injectLazy
This commit is contained in:
Ahmad Ansori Palembani 2024-09-20 07:20:16 +07:00
parent e248de76d7
commit 775829e28b
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreatorJob.kt
View file

@ -15,13 +15,14 @@ import androidx.work.workDataOf
import co.touchlab.kermit.Logger import co.touchlab.kermit.Logger
import com.hippo.unifile.UniFile import com.hippo.unifile.UniFile
import eu.kanade.tachiyomi.data.backup.BackupNotifier import eu.kanade.tachiyomi.data.backup.BackupNotifier
import eu.kanade.tachiyomi.data.backup.restore.BackupRestoreJob
import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.data.notification.Notifications
import eu.kanade.tachiyomi.util.system.e import eu.kanade.tachiyomi.util.system.e
import eu.kanade.tachiyomi.util.system.localeContext import eu.kanade.tachiyomi.util.system.localeContext
import eu.kanade.tachiyomi.util.system.tryToSetForeground
import eu.kanade.tachiyomi.util.system.notificationManager import eu.kanade.tachiyomi.util.system.notificationManager
import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import yokai.domain.backup.BackupPreferences import yokai.domain.backup.BackupPreferences
import yokai.domain.storage.StorageManager import yokai.domain.storage.StorageManager
import java.util.concurrent.* import java.util.concurrent.*
@ -29,17 +30,25 @@ import java.util.concurrent.*
class BackupCreatorJob(private val context: Context, workerParams: WorkerParameters) : class BackupCreatorJob(private val context: Context, workerParams: WorkerParameters) :
CoroutineWorker(context, workerParams) { CoroutineWorker(context, workerParams) {
val notifier = BackupNotifier(context.localeContext)
override suspend fun doWork(): Result { override suspend fun doWork(): Result {
val storageManager: StorageManager by injectLazy() val isAutoBackup = inputData.getBoolean(IS_AUTO_BACKUP_KEY, true)
val notifier = BackupNotifier(context.localeContext)
val uri = inputData.getString(LOCATION_URI_KEY)?.toUri() ?: storageManager.getAutomaticBackupsDirectory()?.uri if (isAutoBackup && BackupRestoreJob.isRunning(context)) return Result.retry()
val uri = inputData.getString(LOCATION_URI_KEY)?.toUri()
?: getAutomaticBackupLocation()
?: return Result.failure()
tryToSetForeground()
val options = inputData.getBooleanArray(BACKUP_FLAGS_KEY)?.let { BackupOptions.fromBooleanArray(it) } val options = inputData.getBooleanArray(BACKUP_FLAGS_KEY)?.let { BackupOptions.fromBooleanArray(it) }
?: BackupOptions() ?: BackupOptions()
val isAutoBackup = inputData.getBoolean(IS_AUTO_BACKUP_KEY, true)
notifier.showBackupProgress() notifier.showBackupProgress()
return try { return try {
val location = BackupCreator(context).createBackup(uri!!, options, isAutoBackup) val location = BackupCreator(context).createBackup(uri, options, isAutoBackup)
if (!isAutoBackup) notifier.showBackupComplete(UniFile.fromUri(context, location.toUri())!!) if (!isAutoBackup) notifier.showBackupComplete(UniFile.fromUri(context, location.toUri())!!)
Result.success() Result.success()
} catch (e: Exception) { } catch (e: Exception) {
@ -51,6 +60,11 @@ class BackupCreatorJob(private val context: Context, workerParams: WorkerParamet
} }
} }
private fun getAutomaticBackupLocation(): Uri? {
val storageManager = Injekt.get<StorageManager>()
return storageManager.getAutomaticBackupsDirectory()?.uri
}
companion object { companion object {
fun isManualJobRunning(context: Context): Boolean { fun isManualJobRunning(context: Context): Boolean {
val list = WorkManager.getInstance(context).getWorkInfosByTag(TAG_MANUAL).get() val list = WorkManager.getInstance(context).getWorkInfosByTag(TAG_MANUAL).get()