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

Updated check

Browse Source
This commit is contained in:
bskjon 2024-07-02 01:44:49 +02:00
parent 2020022b13
commit 423c6707e9
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/processer/src/main/kotlin/no/iktdev/mediaprocessing/processer/ffmpeg/FfmpegRunner.kt
View File

@ -39,7 +39,6 @@ class FfmpegRunner(
}
fun run(progress: Boolean = false) {
log.info { "Starting ffmpeg on file $inputFile" }
val args = FfmpegArgumentsBuilder()
.inputFile(inputFile)
.outputFile(outputFile)
@ -47,6 +46,8 @@ class FfmpegRunner(
.allowOverwrite(ProcesserEnv.allowOverwrite)
.withProgress(progress)
.build()
log.info { "Starting ffmpeg on file $inputFile with arguments:\n\t ${args.joinToString(" ")}" }
job = scope.launch {
execute(args)
}

6
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/PersistentEventManager.kt
View File

@ -106,12 +106,6 @@ class PersistentEventManager(private val dataSource: DataSource) {
//region Database write
val digest = MessageDigest.getInstance("MD5")
@OptIn(ExperimentalStdlibApi::class)
private fun getIntegrityOfData(data : String) : String {
return digest.digest(data.toByteArray(kotlin.text.Charsets.UTF_8))
.toHexString()
}
/**
* Stores the kafka event and its data in the database as PersistentMessage

9
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/TasksManager.kt
View File

@ -12,6 +12,7 @@ import no.iktdev.mediaprocessing.shared.kafka.dto.Status
import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.javatime.CurrentDateTime
import java.security.MessageDigest
import java.time.LocalDateTime
class TasksManager(private val dataSource: DataSource) {
@ -128,12 +129,20 @@ class TasksManager(private val dataSource: DataSource) {
it[tasks.eventId] = eventId
it[tasks.task] = task.name
it[tasks.data] = data
it[tasks.integrity] = getIntegrityOfData(data)
}
}
}
}
val digest = MessageDigest.getInstance("MD5")
@OptIn(ExperimentalStdlibApi::class)
private fun getIntegrityOfData(data : String) : String {
return digest.digest(data.toByteArray(kotlin.text.Charsets.UTF_8))
.toHexString()
}
fun Query?.toTaskTypeGroup(): Map<TaskType, List<Task>> {
val dz = TaskDoz()
val res = this?.mapNotNull { dz.deserializeTask(it) }?.groupBy { it.task } ?: emptyMap()

3
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/tasks.kt
View File

@ -17,8 +17,9 @@ object tasks: IntIdTable() {
val data: Column<String> = text("data")
val created: Column<LocalDateTime> = datetime("created").defaultExpression(CurrentDateTime)
val lastCheckIn: Column<LocalDateTime?> = datetime("lastCheckIn").nullable()
val integrity: Column<String> = varchar("integrity", 100)
init {
uniqueIndex(referenceId, eventId, task)
uniqueIndex(referenceId, task, integrity)
}
}