import { ThumbnailType } from '../../shared/models/videos/thumbnail.type'
import { generateImageFromVideoFile } from '../helpers/ffmpeg-utils'
-import { processImage } from '../helpers/image-utils'
+import { generateImageFilename, processImage } from '../helpers/image-utils'
import { downloadImage } from '../helpers/requests'
import { CONFIG } from '../initializers/config'
import { ASSETS_PATH, PREVIEWS_SIZE, THUMBNAILS_SIZE } from '../initializers/constants'
import { ThumbnailModel } from '../models/video/thumbnail'
-import { MVideoFile, MVideoThumbnail } from '../types/models'
+import { MVideoFile, MVideoThumbnail, MVideoUUID } from '../types/models'
import { MThumbnail } from '../types/models/video/thumbnail'
import { MVideoPlaylistThumbnail } from '../types/models/video/video-playlist'
import { getVideoFilePath } from './video-paths'
-type ImageSize = { height: number, width: number }
+type ImageSize = { height?: number, width?: number }
function createPlaylistMiniatureFromExisting (options: {
inputPath: string
? null
: downloadUrl
- // If the thumbnail URL did not change
- const existingUrl = existingThumbnail
- ? existingThumbnail.fileUrl
- : null
-
- // If the thumbnail URL did not change and has a unique filename (introduced in 3.2), avoid thumbnail processing
- const thumbnailUrlChanged = !existingUrl || existingUrl !== downloadUrl || downloadUrl.endsWith(`${video.uuid}.jpg`)
+ const thumbnailUrlChanged = hasThumbnailUrlChanged(existingThumbnail, downloadUrl, video)
// Do not change the thumbnail filename if the file did not change
const filename = thumbnailUrlChanged
size: ImageSize
}) {
const { fileUrl, video, type, size } = options
- const { filename, height, width, existingThumbnail } = buildMetadataFromVideo(video, type, size)
+ const { filename: updatedFilename, height, width, existingThumbnail } = buildMetadataFromVideo(video, type, size)
+
+ const thumbnailUrlChanged = hasThumbnailUrlChanged(existingThumbnail, fileUrl, video)
const thumbnail = existingThumbnail || new ThumbnailModel()
+ // Do not change the thumbnail filename if the file did not change
+ const filename = thumbnailUrlChanged
+ ? updatedFilename
+ : existingThumbnail.filename
+
thumbnail.filename = filename
thumbnail.height = height
thumbnail.width = width
createPlaylistMiniatureFromExisting
}
+function hasThumbnailUrlChanged (existingThumbnail: MThumbnail, downloadUrl: string, video: MVideoUUID) {
+ const existingUrl = existingThumbnail
+ ? existingThumbnail.fileUrl
+ : null
+
+ // If the thumbnail URL did not change and has a unique filename (introduced in 3.1), avoid thumbnail processing
+ return !existingUrl || existingUrl !== downloadUrl || downloadUrl.endsWith(`${video.uuid}.jpg`)
+}
+
function buildMetadataFromPlaylist (playlist: MVideoPlaylistThumbnail, size: ImageSize) {
const filename = playlist.generateThumbnailName()
const basePath = CONFIG.STORAGE.THUMBNAILS_DIR
: undefined
if (type === ThumbnailType.MINIATURE) {
- const filename = video.generateThumbnailName()
+ const filename = generateImageFilename()
const basePath = CONFIG.STORAGE.THUMBNAILS_DIR
return {
}
if (type === ThumbnailType.PREVIEW) {
- const filename = video.generatePreviewName()
+ const filename = generateImageFilename()
const basePath = CONFIG.STORAGE.PREVIEWS_DIR
return {