Version adjustment + correct status updates

This commit is contained in:
Brage Skjønborg 2026-01-29 17:48:12 +01:00
parent 71359254f2
commit 8e2489c31e
10 changed files with 32 additions and 11 deletions

View File

@ -9,12 +9,11 @@ import no.iktdev.eventi.tasks.TaskPollerImplementation
import no.iktdev.eventi.tasks.TaskReporter import no.iktdev.eventi.tasks.TaskReporter
import no.iktdev.mediaprocessing.shared.database.stores.EventStore import no.iktdev.mediaprocessing.shared.database.stores.EventStore
import no.iktdev.mediaprocessing.shared.database.stores.TaskStore import no.iktdev.mediaprocessing.shared.database.stores.TaskStore
import org.springframework.boot.ApplicationArguments import org.springframework.boot.ApplicationArguments
import org.springframework.boot.ApplicationRunner import org.springframework.boot.ApplicationRunner
import org.springframework.stereotype.Component import org.springframework.stereotype.Component
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import java.util.UUID import java.util.*
@Component @Component
class PollerAdministrator( class PollerAdministrator(
@ -49,10 +48,16 @@ class DefaultTaskReporter() : TaskReporter {
TaskStore.heartbeat(taskId) TaskStore.heartbeat(taskId)
} }
override fun markConsumed(taskId: UUID) { override fun markCompleted(taskId: UUID) {
TaskStore.markConsumed(taskId, TaskStatus.Completed) TaskStore.markConsumed(taskId, TaskStatus.Completed)
} }
override fun markFailed(taskId: UUID) {
TaskStore.markConsumed(taskId, TaskStatus.Failed)
}
override fun updateProgress(taskId: UUID, progress: Int) { override fun updateProgress(taskId: UUID, progress: Int) {
// Not to be implemented for this application // Not to be implemented for this application
} }

View File

@ -107,7 +107,9 @@ class ConvertTaskListenerTest {
val overrideReporter = object : TaskReporter { val overrideReporter = object : TaskReporter {
override fun markClaimed(taskId: UUID, workerId: String) {} override fun markClaimed(taskId: UUID, workerId: String) {}
override fun updateLastSeen(taskId: UUID) {} override fun updateLastSeen(taskId: UUID) {}
override fun markConsumed(taskId: UUID) {} override fun markCompleted(taskId: UUID) {}
override fun markFailed(taskId: UUID) {}
override fun updateProgress(taskId: UUID, progress: Int) {} override fun updateProgress(taskId: UUID, progress: Int) {}
override fun log(taskId: UUID, message: String) {} override fun log(taskId: UUID, message: String) {}
override fun publishEvent(event: Event) { override fun publishEvent(event: Event) {

View File

@ -48,10 +48,14 @@ class DefaultTaskReporter() : TaskReporter {
TaskStore.heartbeat(taskId) TaskStore.heartbeat(taskId)
} }
override fun markConsumed(taskId: UUID) { override fun markCompleted(taskId: UUID) {
TaskStore.markConsumed(taskId, TaskStatus.Completed) TaskStore.markConsumed(taskId, TaskStatus.Completed)
} }
override fun markFailed(taskId: UUID) {
TaskStore.markConsumed(taskId, TaskStatus.Failed)
}
override fun updateProgress(taskId: UUID, progress: Int) { override fun updateProgress(taskId: UUID, progress: Int) {
// Not to be implemented for this application // Not to be implemented for this application
} }

View File

@ -38,7 +38,8 @@ class DownloadCoverTaskListenerTest: TestBase() {
private val overrideReporter = object : TaskReporter { private val overrideReporter = object : TaskReporter {
override fun markClaimed(taskId: UUID, workerId: String) {} override fun markClaimed(taskId: UUID, workerId: String) {}
override fun updateLastSeen(taskId: UUID) {} override fun updateLastSeen(taskId: UUID) {}
override fun markConsumed(taskId: UUID) {} override fun markCompleted(taskId: UUID) {}
override fun markFailed(taskId: UUID) {}
override fun updateProgress(taskId: UUID, progress: Int) {} override fun updateProgress(taskId: UUID, progress: Int) {}
override fun log(taskId: UUID, message: String) {} override fun log(taskId: UUID, message: String) {}
override fun publishEvent(event: Event) {} override fun publishEvent(event: Event) {}

View File

@ -44,7 +44,8 @@ class MediaStreamReadTaskListenerTest: TestBase() {
val overrideReporter = object : TaskReporter { val overrideReporter = object : TaskReporter {
override fun markClaimed(taskId: UUID, workerId: String) {} override fun markClaimed(taskId: UUID, workerId: String) {}
override fun updateLastSeen(taskId: UUID) {} override fun updateLastSeen(taskId: UUID) {}
override fun markConsumed(taskId: UUID) {} override fun markCompleted(taskId: UUID) {}
override fun markFailed(taskId: UUID) {}
override fun updateProgress(taskId: UUID, progress: Int) {} override fun updateProgress(taskId: UUID, progress: Int) {}
override fun log(taskId: UUID, message: String) {} override fun log(taskId: UUID, message: String) {}
override fun publishEvent(event: Event) { override fun publishEvent(event: Event) {

View File

@ -52,11 +52,16 @@ class DefaultTaskReporter() : TaskReporter {
TaskStore.heartbeat(taskId) TaskStore.heartbeat(taskId)
} }
override fun markConsumed(taskId: UUID) { override fun markCompleted(taskId: UUID) {
log.info { "Marking task $taskId as completed" } log.info { "Marking task $taskId as completed" }
TaskStore.markConsumed(taskId, TaskStatus.Completed) TaskStore.markConsumed(taskId, TaskStatus.Completed)
} }
override fun markFailed(taskId: UUID) {
log.info { "Marking task $taskId as failed" }
TaskStore.markConsumed(taskId, TaskStatus.Failed)
}
override fun updateProgress(taskId: UUID, progress: Int) { override fun updateProgress(taskId: UUID, progress: Int) {
// Not to be implemented for this application // Not to be implemented for this application
} }

View File

@ -38,7 +38,8 @@ class SubtitleTaskListenerTest {
val overrideReporter = object : TaskReporter { val overrideReporter = object : TaskReporter {
override fun markClaimed(taskId: UUID, workerId: String) {} override fun markClaimed(taskId: UUID, workerId: String) {}
override fun updateLastSeen(taskId: UUID) {} override fun updateLastSeen(taskId: UUID) {}
override fun markConsumed(taskId: UUID) {} override fun markCompleted(taskId: UUID) {}
override fun markFailed(taskId: UUID) {}
override fun updateProgress(taskId: UUID, progress: Int) {} override fun updateProgress(taskId: UUID, progress: Int) {}
override fun log(taskId: UUID, message: String) {} override fun log(taskId: UUID, message: String) {}
override fun publishEvent(event: Event) { override fun publishEvent(event: Event) {

View File

@ -40,7 +40,8 @@ class VideoTaskListenerTest {
val overrideReporter = object : TaskReporter { val overrideReporter = object : TaskReporter {
override fun markClaimed(taskId: UUID, workerId: String) {} override fun markClaimed(taskId: UUID, workerId: String) {}
override fun updateLastSeen(taskId: UUID) {} override fun updateLastSeen(taskId: UUID) {}
override fun markConsumed(taskId: UUID) {} override fun markCompleted(taskId: UUID) {}
override fun markFailed(taskId: UUID) {}
override fun updateProgress(taskId: UUID, progress: Int) {} override fun updateProgress(taskId: UUID, progress: Int) {}
override fun log(taskId: UUID, message: String) {} override fun log(taskId: UUID, message: String) {}
override fun publishEvent(event: Event) { override fun publishEvent(event: Event) {

View File

@ -1,5 +1,5 @@
[versions] [versions]
eventi = "1.0-rc30" eventi = "1.0-rc31"
exfl = "1.0-rc1" exfl = "1.0-rc1"
[libraries] [libraries]

View File

@ -180,6 +180,7 @@ object TaskStore: TaskStore {
it[claimed] = true it[claimed] = true
it[claimedBy] = workerId it[claimedBy] = workerId
it[lastCheckIn] = UtcNow() it[lastCheckIn] = UtcNow()
it[status] = TaskStatus.InProgress
} }
}.isSuccess }.isSuccess
} }