Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,12 @@ class PreferenceManagerImpl(
.apply()
.also { onPreferencesChanged() }

override var backgroundProcessCount: Int
get() = preferences.getInt(KEY_BACKGROUND_PROCESS_COUNT, 0)
set(value) = preferences.edit()
.putInt(KEY_BACKGROUND_PROCESS_COUNT, value)
.apply()

override var galleryGrid: Grid
get() = preferences.getInt(KEY_GALLERY_GRID, 0).let { Grid.entries[it] }
set(value) = preferences.edit()
Expand Down Expand Up @@ -273,6 +279,7 @@ class PreferenceManagerImpl(
const val KEY_DESIGN_COLOR_TOKEN = "key_design_color_token_theme"
const val KEY_DESIGN_DARK_TOKEN = "key_design_dark_color_token_theme"
const val KEY_BACKGROUND_GENERATION = "key_background_generation"
const val KEY_BACKGROUND_PROCESS_COUNT = "key_background_process_count"
const val KEY_GALLERY_GRID = "key_gallery_grid"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ interface PreferenceManager {
var designColorToken: String
var designDarkThemeToken: String
var backgroundGeneration: Boolean
var backgroundProcessCount: Int
var galleryGrid: Grid

fun observe(): Flowable<Settings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ internal class TextToImageTask(
workerParameters: WorkerParameters,
pushNotificationManager: PushNotificationManager,
activityIntentProvider: ActivityIntentProvider,
preferenceManager: PreferenceManager,
observeHordeProcessStatusUseCase: ObserveHordeProcessStatusUseCase,
observeLocalDiffusionProcessStatusUseCase: ObserveLocalDiffusionProcessStatusUseCase,
private val preferenceManager: PreferenceManager,
private val backgroundWorkObserver: BackgroundWorkObserver,
private val textToImageUseCase: TextToImageUseCase,
private val fileProviderDescriptor: FileProviderDescriptor,
Expand All @@ -45,12 +45,26 @@ internal class TextToImageTask(
override val genericNotificationId: Int = NOTIFICATION_TEXT_TO_IMAGE_GENERIC

override fun createWork(): Single<Result> {
// Workaround for LocalDiffusion provider:
//
// If LocalDiffusion process previously died, prevent WorkManager to go to infinite
// task repeat loop.
if (preferenceManager.backgroundProcessCount > 0) {
handleProcess()
handleError(Throwable("Background process count > 0"))
compositeDisposable.clear()
return Single.just(Result.failure())
}

preferenceManager.backgroundProcessCount++
handleStart()
backgroundWorkObserver.refreshStatus()
backgroundWorkObserver.dismissResult()

return try {
val file = File(fileProviderDescriptor.workCacheDirPath, Constants.FILE_TEXT_TO_IMAGE)
if (!file.exists()) {
preferenceManager.backgroundProcessCount--
handleError(Throwable("File is null."))
compositeDisposable.clear()
return Single.just(Result.failure())
Expand All @@ -60,6 +74,7 @@ internal class TextToImageTask(
val payload = bytes.toTextToImagePayload()

if (payload == null) {
preferenceManager.backgroundProcessCount--
handleError(Throwable("Payload is null."))
compositeDisposable.clear()
return Single.just(Result.failure())
Expand All @@ -71,15 +86,18 @@ internal class TextToImageTask(
textToImageUseCase(payload)
.doOnSubscribe { handleProcess() }
.map { result ->
preferenceManager.backgroundProcessCount--
handleSuccess(result)
Result.success()
}
.onErrorReturn { t ->
preferenceManager.backgroundProcessCount--
handleError(t)
Result.failure()
}
.doFinally { compositeDisposable.clear() }
} catch (e: Exception) {
preferenceManager.backgroundProcessCount--
handleError(e)
compositeDisposable.clear()
Single.just(Result.failure())
Expand Down