forks/peertube
1
0
Fork 0
Code Releases Activity

Be more robust with missing thumbnails/previews

Browse source
This commit is contained in:
Chocobozzz 2020-02-06 17:39:19 +01:00
parent a3b7421abb
commit 6872996d29
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server/lib/activitypub/videos.ts
View file

@ -340,9 +340,11 @@ async function updateVideoFromAP (options: {
if (thumbnailModel) await videoUpdated.addAndSaveThumbnail(thumbnailModel, t) if (thumbnailModel) await videoUpdated.addAndSaveThumbnail(thumbnailModel, t)
const previewUrl = videoUpdated.getPreview().getFileUrl(videoUpdated) if (videoUpdated.getPreview()) {
const previewModel = createPlaceholderThumbnail(previewUrl, video, ThumbnailType.PREVIEW, PREVIEWS_SIZE) const previewUrl = videoUpdated.getPreview().getFileUrl(videoUpdated)
await videoUpdated.addAndSaveThumbnail(previewModel, t) const previewModel = createPlaceholderThumbnail(previewUrl, video, ThumbnailType.PREVIEW, PREVIEWS_SIZE)
await videoUpdated.addAndSaveThumbnail(previewModel, t)
}
{ {
const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoUpdated, videoObject.url) const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoUpdated, videoObject.url)
@ -531,6 +533,10 @@ async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAc
const video = VideoModel.build(videoData) as MVideoThumbnail const video = VideoModel.build(videoData) as MVideoThumbnail
const promiseThumbnail = createVideoMiniatureFromUrl(getThumbnailFromIcons(videoObject).url, video, ThumbnailType.MINIATURE) const promiseThumbnail = createVideoMiniatureFromUrl(getThumbnailFromIcons(videoObject).url, video, ThumbnailType.MINIATURE)
.catch(err => {
logger.error('Cannot create miniature from url.', { err })
return undefined
})
let thumbnailModel: MThumbnail let thumbnailModel: MThumbnail
if (waitThumbnail === true) { if (waitThumbnail === true) {
@ -602,11 +608,15 @@ async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAc
}) })
if (waitThumbnail === false) { if (waitThumbnail === false) {
// Error is already caught above
// eslint-disable-next-line @typescript-eslint/no-floating-promises
promiseThumbnail.then(thumbnailModel => { promiseThumbnail.then(thumbnailModel => {
if (!thumbnailModel) return
thumbnailModel = videoCreated.id thumbnailModel = videoCreated.id
return thumbnailModel.save() return thumbnailModel.save()
}).catch(err => logger.error('Cannot create miniature from url.', { err })) })
} }
return { autoBlacklisted, videoCreated } return { autoBlacklisted, videoCreated }

4
server/models/video/video.ts
View file

@ -1937,6 +1937,10 @@ export class VideoModel extends Model<VideoModel> {
return this.uuid + '.jpg' return this.uuid + '.jpg'
} }
hasPreview () {
return !!this.getPreview()
}
getPreview () { getPreview () {
if (Array.isArray(this.Thumbnails) === false) return undefined if (Array.isArray(this.Thumbnails) === false) return undefined