diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt index d9ee2018..3b54ecd5 100644 --- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt +++ b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt @@ -9,9 +9,12 @@ import no.iktdev.exfl.observable.ObservableMap import no.iktdev.exfl.observable.Observables import no.iktdev.exfl.observable.observableMapOf import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig +import no.iktdev.mediaprocessing.shared.common.SharedConfig import no.iktdev.mediaprocessing.shared.common.database.EventsDatabase import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager +import no.iktdev.mediaprocessing.shared.common.database.cal.RunnerManager import no.iktdev.mediaprocessing.shared.common.database.cal.TasksManager +import no.iktdev.mediaprocessing.shared.common.getAppVersion import no.iktdev.mediaprocessing.shared.common.toEventsDatabase import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerItem import org.springframework.boot.autoconfigure.SpringBootApplication @@ -19,10 +22,8 @@ import org.springframework.boot.runApplication import org.springframework.context.ApplicationContext import org.springframework.context.annotation.Bean - -private val logger = KotlinLogging.logger {} -val ioCoroutine = CoroutinesIO() -val defaultCoroutine = CoroutinesDefault() +val log = KotlinLogging.logger {} +lateinit var eventDatabase: EventsDatabase lateinit var eventsManager: EventsManager @@ -35,26 +36,13 @@ class UIApplication { } } -lateinit var eventsDatabase: EventsDatabase -lateinit var taskManager: TasksManager - - -private var context: ApplicationContext? = null - -@Suppress("unused") -fun getContext(): ApplicationContext? { - return context -} +val ioCoroutine = CoroutinesIO() +val defaultCoroutine = CoroutinesDefault() fun main(args: Array) { - eventsDatabase = EventsDatabase().also { - eventsManager = EventsManager(it.database) - } - - ioCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener { override fun onUpdated(value: Throwable) { @@ -66,10 +54,15 @@ fun main(args: Array) { value.printStackTrace() } }) - context = runApplication(*args) + eventDatabase = EventsDatabase().also { + eventsManager = EventsManager(it.database) + } + + + runApplication(*args) + log.info { "App Version: ${getAppVersion()}" } } - diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/AvailableEventsService.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/AvailableEventsService.kt deleted file mode 100644 index 75dd2479..00000000 --- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/AvailableEventsService.kt +++ /dev/null @@ -1,23 +0,0 @@ -package no.iktdev.mediaprocessing.ui.service - -import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager -import no.iktdev.mediaprocessing.ui.eventsManager -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.scheduling.annotation.EnableScheduling -import org.springframework.scheduling.annotation.Scheduled -import org.springframework.stereotype.Service - -@Service -@EnableScheduling -class AvailableEventsService( - @Autowired eventsManager: EventsManager -) { - - fun pullAvailableEvents() { - eventsManager.readAvailableEvents().onEach { - - } - } - - -} \ No newline at end of file diff --git a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt index f4d3b824..eb586794 100644 --- a/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt +++ b/apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt @@ -5,7 +5,7 @@ import no.iktdev.mediaprocessing.shared.common.contract.dto.EventRequest import no.iktdev.mediaprocessing.shared.common.database.tables.files import no.iktdev.mediaprocessing.shared.common.database.tables.filesProcessed import no.iktdev.mediaprocessing.ui.UIEnv -import no.iktdev.mediaprocessing.ui.eventsDatabase +import no.iktdev.mediaprocessing.ui.eventDatabase import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.selectAll import org.springframework.beans.factory.annotation.Autowired @@ -24,7 +24,7 @@ class UnprocessedFilesTopic( @Autowired private val template: SimpMessagingTemplate?, @Autowired private val coordinatorTemplate: RestTemplate, ) { - fun pullUnprocessedFiles(): List = withTransaction(eventsDatabase.database) { + fun pullUnprocessedFiles(): List = withTransaction(eventDatabase.database) { files.select { files.checksum notInSubQuery filesProcessed.slice(filesProcessed.checksum).selectAll() }.mapNotNull {