From 4fae2b1f300c1f027629569817262f60873a663a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 28 Jun 2022 14:57:51 +0200 Subject: Rename video full loading --- server/lib/job-queue/handlers/activitypub-http-fetcher.ts | 2 +- server/lib/job-queue/handlers/video-file-import.ts | 2 +- server/lib/job-queue/handlers/video-import.ts | 2 +- server/lib/job-queue/handlers/video-live-ending.ts | 4 ++-- server/lib/job-queue/handlers/video-studio-edition.ts | 2 +- server/lib/job-queue/handlers/video-transcoding.ts | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'server/lib/job-queue/handlers') diff --git a/server/lib/job-queue/handlers/activitypub-http-fetcher.ts b/server/lib/job-queue/handlers/activitypub-http-fetcher.ts index 128e14f94..de533de6c 100644 --- a/server/lib/job-queue/handlers/activitypub-http-fetcher.ts +++ b/server/lib/job-queue/handlers/activitypub-http-fetcher.ts @@ -17,7 +17,7 @@ async function processActivityPubHttpFetcher (job: Job) { const payload = job.data as ActivitypubHttpFetcherPayload let video: MVideoFullLight - if (payload.videoId) video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoId) + if (payload.videoId) video = await VideoModel.loadFull(payload.videoId) const fetcherType: { [ id in FetchType ]: (items: any[]) => Promise } = { 'activity': items => processActivities(items, { outboxUrl: payload.uri, fromFetch: true }), diff --git a/server/lib/job-queue/handlers/video-file-import.ts b/server/lib/job-queue/handlers/video-file-import.ts index 110176d81..1c600e2a7 100644 --- a/server/lib/job-queue/handlers/video-file-import.ts +++ b/server/lib/job-queue/handlers/video-file-import.ts @@ -18,7 +18,7 @@ async function processVideoFileImport (job: Job) { const payload = job.data as VideoFileImportPayload logger.info('Processing video file import in job %d.', job.id) - const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID) + const video = await VideoModel.loadFull(payload.videoUUID) // No video, maybe deleted? if (!video) { logger.info('Do not process job %d, video does not exist.', job.id) diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index d59a1b12f..40804e82e 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts @@ -219,7 +219,7 @@ async function processFile (downloader: () => Promise, videoImport: MVid if (previewModel) await video.addAndSaveThumbnail(previewModel, t) // Now we can federate the video (reload from database, we need more attributes) - const videoForFederation = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t) + const videoForFederation = await VideoModel.loadFull(video.uuid, t) await federateVideoIfNeeded(videoForFederation, true, t) // Update video import object diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts index b2c42664a..0e1bfb240 100644 --- a/server/lib/job-queue/handlers/video-live-ending.ts +++ b/server/lib/job-queue/handlers/video-live-ending.ts @@ -144,7 +144,7 @@ async function replaceLiveByReplay (options: { await liveSession.save() // Remove old HLS playlist video files - const videoWithFiles = await VideoModel.loadAndPopulateAccountAndServerAndTags(liveVideo.id) + const videoWithFiles = await VideoModel.loadFull(liveVideo.id) const hlsPlaylist = videoWithFiles.getHLSPlaylist() await VideoFileModel.removeHLSFilesOfVideoId(hlsPlaylist.id) @@ -241,7 +241,7 @@ async function cleanupLiveAndFederate (options: { } try { - const fullVideo = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.id) + const fullVideo = await VideoModel.loadFull(video.id) return federateVideoIfNeeded(fullVideo, false, undefined) } catch (err) { logger.warn('Cannot federate live after cleanup', { videoId: video.id, err }) diff --git a/server/lib/job-queue/handlers/video-studio-edition.ts b/server/lib/job-queue/handlers/video-studio-edition.ts index cf3064a7a..434d0ffe8 100644 --- a/server/lib/job-queue/handlers/video-studio-edition.ts +++ b/server/lib/job-queue/handlers/video-studio-edition.ts @@ -44,7 +44,7 @@ async function processVideoStudioEdition (job: Job) { logger.info('Process video studio edition of %s in job %d.', payload.videoUUID, job.id, lTags) - const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID) + const video = await VideoModel.loadFull(payload.videoUUID) // No video, maybe deleted? if (!video) { diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts index 95ee6b384..5afca65ca 100644 --- a/server/lib/job-queue/handlers/video-transcoding.ts +++ b/server/lib/job-queue/handlers/video-transcoding.ts @@ -42,7 +42,7 @@ async function processVideoTranscoding (job: Job) { const payload = job.data as VideoTranscodingPayload logger.info('Processing transcoding job %d.', job.id, lTags(payload.videoUUID)) - const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID) + const video = await VideoModel.loadFull(payload.videoUUID) // No video, maybe deleted? if (!video) { logger.info('Do not process job %d, video does not exist.', job.id, lTags(payload.videoUUID)) @@ -180,7 +180,7 @@ async function onVideoFirstWebTorrentTranscoding ( const { resolution, isPortraitMode, audioStream } = await videoArg.probeMaxQualityFile() // Maybe the video changed in database, refresh it - const videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoArg.uuid) + const videoDatabase = await VideoModel.loadFull(videoArg.uuid) // Video does not exist anymore if (!videoDatabase) return undefined -- cgit v1.2.3