ActivityPub-federated video streaming platform using P2P directly in your web browser
Prevent creating storyboard/transcription
Chocobozzz09dfb4d8cdca
diff --git a/server/core/controllers/api/videos/source.ts b/server/core/controllers/api/videos/source.tsindex 51930cfba2..aec4688cee 100644--- a/server/core/controllers/api/videos/source.ts+++ b/server/core/controllers/api/videos/source.ts@@ -188,7 +188,7 @@ async function addVideoJobsAfterUpload (video: MVideoFullLight, videoFile: MVide}},- buildLocalStoryboardJobIfNeeded({ video, federate: false }),+ await buildLocalStoryboardJobIfNeeded({ video, federate: false }),{type: 'federate-video' as const,diff --git a/server/core/lib/video-captions.ts b/server/core/lib/video-captions.tsindex d885dc2f54..1e3edbbd05 100644--- a/server/core/lib/video-captions.ts+++ b/server/core/lib/video-captions.ts@@ -12,7 +12,7 @@ import { VideoCaptionModel } from '@server/models/video/video-caption.js'import { VideoJobInfoModel } from '@server/models/video/video-job-info.js'import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist.js'import { VideoModel } from '@server/models/video/video.js'-import { MStreamingPlaylist, MVideo, MVideoCaption, MVideoFullLight, MVideoUUID, MVideoUrl } from '@server/types/models/index.js'+import { MStreamingPlaylist, MVideo, MVideoCaption, MVideoFullLight, MVideoId, MVideoUUID, MVideoUrl } from '@server/types/models/index.js'import { MutexInterface } from 'async-mutex'import { ensureDir, remove } from 'fs-extra/esm'import { writeFile } from 'fs/promises'@@ -111,9 +111,14 @@ export async function regenerateTranscriptionTaskIfNeeded (video: MVideo) {}}-export async function createTranscriptionTaskIfNeeded (video: MVideoUUID & MVideoUrl) {+export async function createTranscriptionTaskIfNeeded (video: MVideoId & MVideoUUID & MVideoUrl) {if (CONFIG.VIDEO_TRANSCRIPTION.ENABLED !== true) return+ if (!await VideoModel.loadHasStream(video.id, VideoFileStream.AUDIO)) {+ logger.info(`Do not create transcription job for ${video.url} that doesn't have an audio stream`, lTags(video.uuid))+ return+ }+logger.info(`Creating transcription job for ${video.url}`, lTags(video.uuid))if (CONFIG.VIDEO_TRANSCRIPTION.REMOTE_RUNNERS.ENABLED === true) {diff --git a/server/core/lib/video-jobs.ts b/server/core/lib/video-jobs.tsindex e082f5be52..a0db46174a 100644--- a/server/core/lib/video-jobs.ts+++ b/server/core/lib/video-jobs.ts@@ -1,6 +1,14 @@-import { ManageVideoTorrentPayload, VideoPrivacy, VideoPrivacyType, VideoState, VideoStateType } from '@peertube/peertube-models'+import {+ ManageVideoTorrentPayload,+ VideoFileStream,+ VideoPrivacy,+ VideoPrivacyType,+ VideoState,+ VideoStateType+} from '@peertube/peertube-models'import { CONFIG } from '@server/initializers/config.js'import { VideoJobInfoModel } from '@server/models/video/video-job-info.js'+import { VideoModel } from '@server/models/video/video.js'import { MVideo, MVideoFile, MVideoFullLight, MVideoUUID } from '@server/types/models/index.js'import { CreateJobArgument, CreateJobOptions, JobQueue } from './job-queue/job-queue.js'import { VideoStoryboardJobHandler } from './runners/index.js'@@ -27,13 +35,19 @@ export async function buildMoveVideoJob (options: {}}-export function buildLocalStoryboardJobIfNeeded (options: {+// ---------------------------------------------------------------------------+// Storyboard+// ---------------------------------------------------------------------------++export async function buildLocalStoryboardJobIfNeeded (options: {video: MVideofederate: boolean}) {const { video, federate } = options- if (CONFIG.STORYBOARDS.ENABLED && !CONFIG.STORYBOARDS.REMOTE_RUNNERS.ENABLED) {+ const hasVideo = await VideoModel.loadHasStream(video.id, VideoFileStream.VIDEO)++ if (hasVideo && CONFIG.STORYBOARDS.ENABLED && !CONFIG.STORYBOARDS.REMOTE_RUNNERS.ENABLED) {return {type: 'generate-video-storyboard' as 'generate-video-storyboard',payload: {@@ -56,9 +70,10 @@ export function buildLocalStoryboardJobIfNeeded (options: {return undefined}-export function addRemoteStoryboardJobIfNeeded (video: MVideo) {+export async function addRemoteStoryboardJobIfNeeded (video: MVideo) {if (CONFIG.STORYBOARDS.ENABLED !== true) returnif (CONFIG.STORYBOARDS.REMOTE_RUNNERS.ENABLED !== true) return+ if (!await VideoModel.loadHasStream(video.id, VideoFileStream.VIDEO)) returnreturn new VideoStoryboardJobHandler().create({ videoUUID: video.uuid })}@@ -74,10 +89,14 @@ export async function addLocalOrRemoteStoryboardJobIfNeeded (options: {if (CONFIG.STORYBOARDS.REMOTE_RUNNERS.ENABLED === true) {await addRemoteStoryboardJobIfNeeded(video)} else {- await JobQueue.Instance.createJob(buildLocalStoryboardJobIfNeeded({ video, federate }))+ await JobQueue.Instance.createJob(await buildLocalStoryboardJobIfNeeded({ video, federate }))}}+// ---------------------------------------------------------------------------+// Multiple jobs creation+// ---------------------------------------------------------------------------+export async function addVideoJobsAfterCreation (options: {video: MVideovideoFile: MVideoFile@@ -95,7 +114,7 @@ export async function addVideoJobsAfterCreation (options: {}},- buildLocalStoryboardJobIfNeeded({ video, federate: false }),+ await buildLocalStoryboardJobIfNeeded({ video, federate: false }),{type: 'notify',diff --git a/server/core/lib/video-studio.ts b/server/core/lib/video-studio.tsindex 4dc713bc7c..a528fa44ef 100644--- a/server/core/lib/video-studio.ts+++ b/server/core/lib/video-studio.ts@@ -110,7 +110,7 @@ export async function onVideoStudioEnded (options: {await video.save()await JobQueue.Instance.createSequentialJobFlow(- buildLocalStoryboardJobIfNeeded({ video, federate: false }),+ await buildLocalStoryboardJobIfNeeded({ video, federate: false }),{type: 'federate-video' as 'federate-video',payload: {diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.tsindex 248e68d734..206d75c0c1 100644--- a/server/core/models/video/video.ts+++ b/server/core/models/video/video.ts@@ -1828,22 +1828,37 @@ export class VideoModel extends SequelizeModel<VideoModel> {// ---------------------------------------------------------------------------- getMaxFPS () {+ getMaxFPS<T extends MVideoWithFile> (this: T) {return this.getMaxQualityFile(VideoFileStream.VIDEO)?.fps || 0}- getMaxResolution () {+ getMaxResolution<T extends MVideoWithFile> (this: T) {return this.getMaxQualityFile(VideoFileStream.VIDEO)?.resolution || this.getMaxQualityFile(VideoFileStream.AUDIO)?.resolution}- hasAudio () {+ hasAudio<T extends MVideoWithFile> (this: T) {return !!this.getMaxQualityFile(VideoFileStream.AUDIO)}- hasVideo () {+ hasVideo<T extends MVideoWithFile> (this: T) {return !!this.getMaxQualityFile(VideoFileStream.VIDEO)}+ static loadHasStream (videoId: number, stream: VideoFileStreamType) {+ const query = 'SELECT 1 FROM "videoFile" WHERE "videoId" = $videoId AND ("streams" & $stream) = $stream ' ++ 'UNION ALL ' ++ 'SELECT 1 FROM "videoStreamingPlaylist" ' ++ 'INNER JOIN "videoFile" ON "videoFile"."videoStreamingPlaylistId" = "videoStreamingPlaylist"."id" ' ++ 'WHERE "videoStreamingPlaylist"."videoId" = $videoId AND ("videoFile"."streams" & $stream) = $stream ' ++ 'LIMIT 1'++ return doesExist({+ sequelize: this.sequelize,+ query,+ bind: { videoId, stream }+ })+ }+// ---------------------------------------------------------------------------getWebVideoFileMinResolution<T extends MVideoWithFile> (this: T, resolution: number): MVideoFileVideo {