From f162d32da098aa55f6de2367142faa166edb7c08 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 6 Jun 2023 15:59:51 +0200 Subject: Support lazy download thumbnails --- server/lib/job-queue/handlers/video-import.ts | 4 ++-- server/lib/job-queue/handlers/video-live-ending.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'server/lib/job-queue') diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index c1355dcef..436bf3175 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts @@ -39,7 +39,7 @@ import { VideoFileModel } from '../../../models/video/video-file' import { VideoImportModel } from '../../../models/video/video-import' import { federateVideoIfNeeded } from '../../activitypub/videos' import { Notifier } from '../../notifier' -import { generateVideoMiniature } from '../../thumbnail' +import { generateLocalVideoMiniature } from '../../thumbnail' import { JobQueue } from '../job-queue' async function processVideoImport (job: Job): Promise { @@ -274,7 +274,7 @@ async function generateMiniature (videoImportWithFiles: MVideoImportDefaultFiles } } - const miniatureModel = await generateVideoMiniature({ + const miniatureModel = await generateLocalVideoMiniature({ video: videoImportWithFiles.Video, videoFile, type: thumbnailType diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts index 95d4f5e64..ae886de35 100644 --- a/server/lib/job-queue/handlers/video-live-ending.ts +++ b/server/lib/job-queue/handlers/video-live-ending.ts @@ -7,7 +7,7 @@ import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' import { federateVideoIfNeeded } from '@server/lib/activitypub/videos' import { cleanupAndDestroyPermanentLive, cleanupTMPLiveFiles, cleanupUnsavedNormalLive } from '@server/lib/live' import { generateHLSMasterPlaylistFilename, generateHlsSha256SegmentsFilename, getLiveReplayBaseDirectory } from '@server/lib/paths' -import { generateVideoMiniature } from '@server/lib/thumbnail' +import { generateLocalVideoMiniature } from '@server/lib/thumbnail' import { generateHlsPlaylistResolutionFromTS } from '@server/lib/transcoding/hls-transcoding' import { VideoPathManager } from '@server/lib/video-path-manager' import { moveToNextState } from '@server/lib/video-state' @@ -143,7 +143,7 @@ async function saveReplayToExternalVideo (options: { await remove(replayDirectory) for (const type of [ ThumbnailType.MINIATURE, ThumbnailType.PREVIEW ]) { - const image = await generateVideoMiniature({ video: replayVideo, videoFile: replayVideo.getMaxQualityFile(), type }) + const image = await generateLocalVideoMiniature({ video: replayVideo, videoFile: replayVideo.getMaxQualityFile(), type }) await replayVideo.addAndSaveThumbnail(image) } @@ -198,7 +198,7 @@ async function replaceLiveByReplay (options: { // Regenerate the thumbnail & preview? if (videoWithFiles.getMiniature().automaticallyGenerated === true) { - const miniature = await generateVideoMiniature({ + const miniature = await generateLocalVideoMiniature({ video: videoWithFiles, videoFile: videoWithFiles.getMaxQualityFile(), type: ThumbnailType.MINIATURE @@ -207,7 +207,7 @@ async function replaceLiveByReplay (options: { } if (videoWithFiles.getPreview().automaticallyGenerated === true) { - const preview = await generateVideoMiniature({ + const preview = await generateLocalVideoMiniature({ video: videoWithFiles, videoFile: videoWithFiles.getMaxQualityFile(), type: ThumbnailType.PREVIEW -- cgit v1.2.3