iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted ui

Browse Source
This commit is contained in:
bskjon 2025-02-23 02:55:06 +01:00
parent 28a09dd2f1
commit 18d72c4159
3 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/UIApplication.kt
View File

@ -9,9 +9,12 @@ import no.iktdev.exfl.observable.ObservableMap
import no.iktdev.exfl.observable.Observables import no.iktdev.exfl.observable.Observables
import no.iktdev.exfl.observable.observableMapOf import no.iktdev.exfl.observable.observableMapOf
import no.iktdev.mediaprocessing.shared.common.DatabaseEnvConfig 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.EventsDatabase
import no.iktdev.mediaprocessing.shared.common.database.cal.EventsManager 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.database.cal.TasksManager
import no.iktdev.mediaprocessing.shared.common.getAppVersion
import no.iktdev.mediaprocessing.shared.common.toEventsDatabase import no.iktdev.mediaprocessing.shared.common.toEventsDatabase
import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerItem import no.iktdev.mediaprocessing.ui.dto.explore.ExplorerItem
import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.autoconfigure.SpringBootApplication
@ -19,10 +22,8 @@ import org.springframework.boot.runApplication
import org.springframework.context.ApplicationContext import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Bean
val log = KotlinLogging.logger {}
private val logger = KotlinLogging.logger {} lateinit var eventDatabase: EventsDatabase
val ioCoroutine = CoroutinesIO()
val defaultCoroutine = CoroutinesDefault()
lateinit var eventsManager: EventsManager lateinit var eventsManager: EventsManager
@ -35,26 +36,13 @@ class UIApplication {
} }
} }
lateinit var eventsDatabase: EventsDatabase
lateinit var taskManager: TasksManager val ioCoroutine = CoroutinesIO()
val defaultCoroutine = CoroutinesDefault()
private var context: ApplicationContext? = null
@Suppress("unused")
fun getContext(): ApplicationContext? {
return context
}
fun main(args: Array<String>) { fun main(args: Array<String>) {
eventsDatabase = EventsDatabase().also {
eventsManager = EventsManager(it.database)
}
ioCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> { ioCoroutine.addListener(listener = object: Observables.ObservableValue.ValueListener<Throwable> {
override fun onUpdated(value: Throwable) { override fun onUpdated(value: Throwable) {
@ -66,10 +54,15 @@ fun main(args: Array<String>) {
value.printStackTrace() value.printStackTrace()
} }
}) })
context = runApplication<UIApplication>(*args)
eventDatabase = EventsDatabase().also {
eventsManager = EventsManager(it.database)
}
runApplication<UIApplication>(*args)
log.info { "App Version: ${getAppVersion()}" }
} }

23
apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/service/AvailableEventsService.kt
View File

@ -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 {
}
}
}

4
apps/ui/src/main/kotlin/no/iktdev/mediaprocessing/ui/socket/UnprocessedFilesTopic.kt
View File

@ -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.files
import no.iktdev.mediaprocessing.shared.common.database.tables.filesProcessed import no.iktdev.mediaprocessing.shared.common.database.tables.filesProcessed
import no.iktdev.mediaprocessing.ui.UIEnv 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.select
import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.selectAll
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -24,7 +24,7 @@ class UnprocessedFilesTopic(
@Autowired private val template: SimpMessagingTemplate?, @Autowired private val template: SimpMessagingTemplate?,
@Autowired private val coordinatorTemplate: RestTemplate, @Autowired private val coordinatorTemplate: RestTemplate,
) { ) {
fun pullUnprocessedFiles(): List<FileInfo> = withTransaction(eventsDatabase.database) { fun pullUnprocessedFiles(): List<FileInfo> = withTransaction(eventDatabase.database) {
files.select { files.select {
files.checksum notInSubQuery filesProcessed.slice(filesProcessed.checksum).selectAll() files.checksum notInSubQuery filesProcessed.slice(filesProcessed.checksum).selectAll()
}.mapNotNull { }.mapNotNull {