Skip to content

refactor(backend): extract a shared ffmpeg-gate helper for the extract* RPCs #96

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

Merged
twangodev merged 3 commits into from
Jun 30, 2026
Merged

refactor(backend): extract a shared ffmpeg-gate helper for the extract* RPCs #96

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30c65a4
refactor(backend): extract a shared ffmpeg-gate helper for the extrac…
twangodev Jun 29, 2026
14359b1
refactor(backend): drop redundant explicit type args on extract* help…
twangodev Jun 29, 2026
733a7f5
Merge remote-tracking branch 'origin/main' into refactor/mediaaccesso…
twangodev Jun 30, 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
30 changes: 15 additions & 15 deletions backend/src/main/kotlin/dev/twango/jetplay/rpc/MediaAccessorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,24 +108,24 @@ class MediaAccessorImpl : MediaAccessor {
send(TranscodeEvent.Done)
}

// Shared shell for the extract* RPCs: ffmpeg gate, then file resolve, then a guarded extract.
private suspend fun <T> withFfmpegResolvedFile(
fileId: VirtualFileId,
projectId: ProjectId,
default: T,
extract: (File) -> T,
): T = withContext(Dispatchers.IO) {
if (!FfmpegAvailability.available) return@withContext default
val file = resolveFile(fileId, projectId) ?: return@withContext default
runCatching { extract(file) }.getOrDefault(default)
}

override suspend fun extractWaveform(fileId: VirtualFileId, projectId: ProjectId): List<Double> =
withContext(Dispatchers.IO) {
if (!FfmpegAvailability.available) return@withContext emptyList()
val file = resolveFile(fileId, projectId) ?: return@withContext emptyList()
runCatching { WaveformExtractor.extract(file) }.getOrDefault(emptyList())
}
withFfmpegResolvedFile(fileId, projectId, emptyList()) { WaveformExtractor.extract(it) }

override suspend fun extractMediaInfo(fileId: VirtualFileId, projectId: ProjectId): MediaInfo? =
withContext(Dispatchers.IO) {
if (!FfmpegAvailability.available) return@withContext null
val file = resolveFile(fileId, projectId) ?: return@withContext null
runCatching { MediaInfoExtractor.extract(file) }.getOrNull()
}
withFfmpegResolvedFile(fileId, projectId, null) { MediaInfoExtractor.extract(it) }

override suspend fun extractSpectrogram(fileId: VirtualFileId, projectId: ProjectId): Spectrogram? =
withContext(Dispatchers.IO) {
if (!FfmpegAvailability.available) return@withContext null
val file = resolveFile(fileId, projectId) ?: return@withContext null
runCatching { SpectrogramExtractor.extract(file) }.getOrNull()
}
withFfmpegResolvedFile(fileId, projectId, null) { SpectrogramExtractor.extract(it) }
}
Loading