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

UTC + new version

Browse Source
This commit is contained in:
Brage Skjønborg 2026-01-22 19:04:14 +01:00
parent c5ab426e23
commit 4eb19a51c4
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

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

5
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/Utils.kt
View File

@ -10,6 +10,7 @@ import java.io.FileInputStream
import java.io.RandomAccessFile
import java.net.InetAddress
import java.security.MessageDigest
import java.time.Clock
import java.time.LocalDateTime
import java.util.zip.CRC32
@ -218,3 +219,7 @@ fun File.resolveConflict(): File {
val LocalDateTimeEpoch: LocalDateTime =
LocalDateTime.of(1970, 1, 1, 0, 0, 0)
fun UtcNow(): LocalDateTime {
return LocalDateTime.now(Clock.systemUTC())
}

3
shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/EventStore.kt
View File

@ -4,6 +4,7 @@ import no.iktdev.eventi.ZDS
import no.iktdev.eventi.models.Event
import no.iktdev.eventi.models.store.PersistedEvent
import no.iktdev.eventi.stores.EventStore
import no.iktdev.mediaprocessing.shared.common.UtcNow
import no.iktdev.mediaprocessing.shared.database.tables.EventsTable
import no.iktdev.mediaprocessing.shared.database.withTransaction
import org.jetbrains.exposed.sql.insert
@ -59,7 +60,7 @@ object EventStore: EventStore {
it[EventsTable.eventId] = event.eventId.toString()
it[EventsTable.event] = eventName
it[EventsTable.data] = asData
it[EventsTable.persistedAt] = LocalDateTime.now()
it[EventsTable.persistedAt] = UtcNow()
}
}
}

10
shared/database/src/main/kotlin/no/iktdev/mediaprocessing/shared/database/stores/TaskStore.kt
View File

@ -5,12 +5,12 @@ import no.iktdev.eventi.models.Task
import no.iktdev.eventi.models.store.PersistedTask
import no.iktdev.eventi.models.store.TaskStatus
import no.iktdev.eventi.stores.TaskStore
import no.iktdev.mediaprocessing.shared.common.UtcNow
import no.iktdev.mediaprocessing.shared.common.dto.PagedTasks
import no.iktdev.mediaprocessing.shared.database.tables.TasksTable
import no.iktdev.mediaprocessing.shared.database.withTransaction
import org.jetbrains.exposed.sql.*
import java.time.Duration
import java.time.LocalDateTime
import java.util.*
object TaskStore: TaskStore {
@ -59,7 +59,7 @@ object TaskStore: TaskStore {
it[TasksTable.task] = taskName
it[status] = TaskStatus.Pending
it[data] = asData
it[persistedAt] = LocalDateTime.now()
it[persistedAt] = UtcNow()
}
}
}
@ -160,7 +160,7 @@ object TaskStore: TaskStore {
}) {
it[claimed] = true
it[claimedBy] = workerId
it[lastCheckIn] = LocalDateTime.now()
it[lastCheckIn] = UtcNow()
}
}.isSuccess
}
@ -168,7 +168,7 @@ object TaskStore: TaskStore {
override fun heartbeat(taskId: UUID) {
withTransaction {
TasksTable.update({ TasksTable.taskId eq taskId.toString() }) {
it[lastCheckIn] = LocalDateTime.now()
it[lastCheckIn] = UtcNow()
}
}
}
@ -183,7 +183,7 @@ object TaskStore: TaskStore {
}
override fun releaseExpiredTasks(timeout: Duration) {
val now = LocalDateTime.now()
val now = UtcNow()
val expirationTime = now.minus(timeout)
withTransaction {
TasksTable.update({

4
shared/ffmpeg/src/main/kotlin/no/iktdev/mediaprocessing/ffmpeg/FFmpeg.kt
View File

@ -7,9 +7,9 @@ import no.iktdev.exfl.using
import no.iktdev.mediaprocessing.ffmpeg.arguments.MpegArgument
import no.iktdev.mediaprocessing.ffmpeg.decoder.FfmpegDecodedProgress
import no.iktdev.mediaprocessing.ffmpeg.decoder.FfmpegProgressDecoder
import no.iktdev.mediaprocessing.ffmpeg.util.UtcNow
import java.io.File
import java.io.FileOutputStream
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
open class FFmpeg(val executable: String, val logDir: File) {
@ -20,7 +20,7 @@ open class FFmpeg(val executable: String, val logDir: File) {
private val outputCache = mutableListOf<String>()
//region Log File formatting
val currentDateTime = LocalDateTime.now()
val currentDateTime = UtcNow()
val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd.HH.mm")
val formattedDateTime = currentDateTime.format(formatter)
//endregion

8
shared/ffmpeg/src/main/kotlin/no/iktdev/mediaprocessing/ffmpeg/util/Utils.kt Normal file
View File

@ -0,0 +1,8 @@
package no.iktdev.mediaprocessing.ffmpeg.util
import java.time.Clock
import java.time.LocalDateTime
fun UtcNow(): LocalDateTime {
return LocalDateTime.now(Clock.systemUTC())
}