Skip to content

Pr/issue 466 #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jackzzey wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Pr/issue 466 #513

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6492f5f
deleting unwanted files
May 7, 2026
0702f81
Revert TemplateManager changes, belongs in issue 493 PR
May 8, 2026
83e8f3b
Fix gitignore conflict
May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions backend/src/main/kotlin/dev/dres/mgmt/cache/CacheManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,9 @@ class CacheManager(private val config: Config, private val store: TransientEntit
fun asyncPreviewVideo(item: DbMediaItem, start: Long, end: Long): Future<Path> {
require(start >= 0) { "Start timestamp cannot be negative." }
require(end > start) { "End timestamp must be greater than start." }
val clampedEnd = if (item.durationMs != null) minOf(end, item.durationMs!!) else end
/** The output path generated by this [PreviewImageFromVideoRequest]. */
val output = this@CacheManager.cacheLocation.resolve("${item.mediaItemId}_${start}-${end}.mp4")
val output = this@CacheManager.cacheLocation.resolve("${item.mediaItemId}_${start}-${clampedEnd}.mp4")
if (Files.exists(output)) {
this.inTransit.remove(output)
return CompletedFuture(output)
Expand All @@ -183,13 +184,13 @@ class CacheManager(private val config: Config, private val store: TransientEntit
return try {
when(item.type()) {
MediaItemType.VIDEO -> {
if (start < item.durationMs!! && end <= item.durationMs!!) {
if (start < item.durationMs!!) {
val ret = this.executor.submit(
PreviewVideoFromVideoRequest(
item.pathToOriginal(),
output,
start,
end
clampedEnd
)
)
this@CacheManager.inTransit[output] = ret
Expand Down