|
43 | 43 | import org.appdevforall.k2go.kolibri.presentation.KolibriSeedService; |
44 | 44 | import org.appdevforall.k2go.kolibri.presentation.KolibriSeedState; |
45 | 45 | import org.appdevforall.k2go.kolibri.presentation.KolibriSeedingFragment; |
| 46 | +import org.appdevforall.k2go.setup.domain.RunSnapshot; |
| 47 | +import org.appdevforall.k2go.setup.domain.RunVerdict; |
| 48 | +import org.appdevforall.k2go.setup.domain.StreamState; |
46 | 49 | import org.appdevforall.k2go.system.data.PendingContent; |
47 | 50 | import org.appdevforall.k2go.system.domain.OperationDispatcher; |
48 | 51 | import org.appdevforall.k2go.system.domain.ContentType; |
@@ -795,19 +798,16 @@ private void render() { |
795 | 798 | int booksFailed = failedCount(booksSession ? BooksDownloadService.status() : null, BooksDownloadService.FAILED); |
796 | 799 | boolean forgejoSeedFailed = forgejoSeedInSession() |
797 | 800 | && org.appdevforall.k2go.forgejo.presentation.ForgejoSeedRepository.get().isFailed(); |
798 | | - org.appdevforall.k2go.setup.domain.RunVerdict verdict = |
799 | | - org.appdevforall.k2go.setup.domain.RunVerdict.of(new org.appdevforall.k2go.setup.domain.RunSnapshot.Builder() |
800 | | - .noRest(noRest).prootShown(prootShown).moduleShown(moduleShown).drained(drained) |
801 | | - .queueTerminalNotRunning(queueTerminalNotRunning).moduleServerSettled(moduleServerSettled) |
802 | | - .batchServerSlow(batchServerSlow).seedPendingRun(seedPendingRun) |
803 | | - .zim(new org.appdevforall.k2go.setup.domain.StreamState( |
804 | | - zimSession, zimSession && ZimDownloadService.isComplete(), zimFailed)) |
805 | | - .books(new org.appdevforall.k2go.setup.domain.StreamState( |
806 | | - booksSession, booksSession && BooksDownloadService.isComplete(), booksFailed)) |
807 | | - .kolibri(new org.appdevforall.k2go.setup.domain.StreamState( |
808 | | - kolibriState.hasSession(), kolibriState.hasSession() && kolibriState.isComplete(), kolibriState.failedCount())) |
809 | | - .prootFailed(prootFailed).forgejoSeedFailed(forgejoSeedFailed) |
810 | | - .build()); |
| 801 | + RunVerdict verdict = RunVerdict.of(new RunSnapshot.Builder() |
| 802 | + .noRest(noRest).prootShown(prootShown).moduleShown(moduleShown).drained(drained) |
| 803 | + .queueTerminalNotRunning(queueTerminalNotRunning).moduleServerSettled(moduleServerSettled) |
| 804 | + .batchServerSlow(batchServerSlow).seedPendingRun(seedPendingRun) |
| 805 | + .zim(new StreamState(zimSession, zimSession && ZimDownloadService.isComplete(), zimFailed)) |
| 806 | + .books(new StreamState(booksSession, booksSession && BooksDownloadService.isComplete(), booksFailed)) |
| 807 | + .kolibri(new StreamState(kolibriState.hasSession(), |
| 808 | + kolibriState.hasSession() && kolibriState.isComplete(), kolibriState.failedCount())) |
| 809 | + .prootFailed(prootFailed).forgejoSeedFailed(forgejoSeedFailed) |
| 810 | + .build()); |
811 | 811 | boolean allComplete = verdict.allComplete(); |
812 | 812 |
|
813 | 813 | // Status dot + line. While waiting, a long-stuck engine shows a softer "taking longer" |
|
0 commit comments