X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideos.ts;h=dd02141eeac07f96eb0d5526e7cfbcadb6f44ad8;hb=156c50af3085468a47b8ae73fe8cfcae46b42398;hp=5aabd3e0d1cfcf9185e39626b8bee24aace2d299;hpb=4157cdb13748cb6e8ce7081d062a8778554cc5a7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 5aabd3e0d..dd02141ee 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -107,7 +107,7 @@ function getOrCreateVideoChannelFromVideoObject (videoObject: VideoTorrentObject const channel = videoObject.attributedTo.find(a => a.type === 'Group') if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url) - return getOrCreateActorAndServerAndModel(channel.id) + return getOrCreateActorAndServerAndModel(channel.id, 'all') } type SyncParam = { @@ -157,18 +157,26 @@ async function syncVideoExternalAttributes (video: VideoModel, fetchedVideo: Vid async function getOrCreateVideoAndAccountAndChannel (options: { videoObject: VideoTorrentObject | string, syncParam?: SyncParam, - fetchType?: VideoFetchByUrlType + fetchType?: VideoFetchByUrlType, + refreshViews?: boolean }) { // Default params const syncParam = options.syncParam || { likes: true, dislikes: true, shares: true, comments: true, thumbnail: true, refreshVideo: false } const fetchType = options.fetchType || 'all' + const refreshViews = options.refreshViews || false // Get video url const videoUrl = typeof options.videoObject === 'string' ? options.videoObject : options.videoObject.id let videoFromDatabase = await fetchVideoByUrl(videoUrl, fetchType) if (videoFromDatabase) { - const p = retryTransactionWrapper(refreshVideoIfNeeded, videoFromDatabase, fetchType, syncParam) + const refreshOptions = { + video: videoFromDatabase, + fetchedType: fetchType, + syncParam, + refreshViews + } + const p = refreshVideoIfNeeded(refreshOptions) if (syncParam.refreshVideo === true) videoFromDatabase = await p return { video: videoFromDatabase } @@ -185,88 +193,100 @@ async function getOrCreateVideoAndAccountAndChannel (options: { return { video } } -async function updateVideoFromAP ( +async function updateVideoFromAP (options: { video: VideoModel, videoObject: VideoTorrentObject, account: AccountModel, channel: VideoChannelModel, + updateViews: boolean, overrideTo?: string[] -) { - logger.debug('Updating remote video "%s".', videoObject.uuid) +}) { + logger.debug('Updating remote video "%s".', options.videoObject.uuid) let videoFieldsSave: any try { - const updatedVideo: VideoModel = await sequelizeTypescript.transaction(async t => { + await sequelizeTypescript.transaction(async t => { const sequelizeOptions = { transaction: t } - videoFieldsSave = video.toJSON() + videoFieldsSave = options.video.toJSON() // Check actor has the right to update the video - const videoChannel = video.VideoChannel - if (videoChannel.Account.id !== account.id) { - throw new Error('Account ' + account.Actor.url + ' does not own video channel ' + videoChannel.Actor.url) + const videoChannel = options.video.VideoChannel + if (videoChannel.Account.id !== options.account.id) { + throw new Error('Account ' + options.account.Actor.url + ' does not own video channel ' + videoChannel.Actor.url) } - const to = overrideTo ? overrideTo : videoObject.to - const videoData = await videoActivityObjectToDBAttributes(channel, videoObject, to) - video.set('name', videoData.name) - video.set('uuid', videoData.uuid) - video.set('url', videoData.url) - video.set('category', videoData.category) - video.set('licence', videoData.licence) - video.set('language', videoData.language) - video.set('description', videoData.description) - video.set('support', videoData.support) - video.set('nsfw', videoData.nsfw) - video.set('commentsEnabled', videoData.commentsEnabled) - video.set('waitTranscoding', videoData.waitTranscoding) - video.set('state', videoData.state) - video.set('duration', videoData.duration) - video.set('createdAt', videoData.createdAt) - video.set('publishedAt', videoData.publishedAt) - video.set('views', videoData.views) - video.set('privacy', videoData.privacy) - video.set('channelId', videoData.channelId) - - await video.save(sequelizeOptions) + const to = options.overrideTo ? options.overrideTo : options.videoObject.to + const videoData = await videoActivityObjectToDBAttributes(options.channel, options.videoObject, to) + options.video.set('name', videoData.name) + options.video.set('uuid', videoData.uuid) + options.video.set('url', videoData.url) + options.video.set('category', videoData.category) + options.video.set('licence', videoData.licence) + options.video.set('language', videoData.language) + options.video.set('description', videoData.description) + options.video.set('support', videoData.support) + options.video.set('nsfw', videoData.nsfw) + options.video.set('commentsEnabled', videoData.commentsEnabled) + options.video.set('downloadingEnabled', videoData.downloadingEnabled) + options.video.set('waitTranscoding', videoData.waitTranscoding) + options.video.set('state', videoData.state) + options.video.set('duration', videoData.duration) + options.video.set('createdAt', videoData.createdAt) + options.video.set('publishedAt', videoData.publishedAt) + options.video.set('privacy', videoData.privacy) + options.video.set('channelId', videoData.channelId) + + if (options.updateViews === true) options.video.set('views', videoData.views) + await options.video.save(sequelizeOptions) // Don't block on request - generateThumbnailFromUrl(video, videoObject.icon) - .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err })) - - // Remove old video files - const videoFileDestroyTasks: Bluebird[] = [] - for (const videoFile of video.VideoFiles) { - videoFileDestroyTasks.push(videoFile.destroy(sequelizeOptions)) + generateThumbnailFromUrl(options.video, options.videoObject.icon) + .catch(err => logger.warn('Cannot generate thumbnail of %s.', options.videoObject.id, { err })) + + { + const videoFileAttributes = videoFileActivityUrlToDBAttributes(options.video, options.videoObject) + const newVideoFiles = videoFileAttributes.map(a => new VideoFileModel(a)) + + // Remove video files that do not exist anymore + const destroyTasks = options.video.VideoFiles + .filter(f => !newVideoFiles.find(newFile => newFile.hasSameUniqueKeysThan(f))) + .map(f => f.destroy(sequelizeOptions)) + await Promise.all(destroyTasks) + + // Update or add other one + const upsertTasks = videoFileAttributes.map(a => { + return VideoFileModel.upsert(a, { returning: true, transaction: t }) + .then(([ file ]) => file) + }) + + options.video.VideoFiles = await Promise.all(upsertTasks) } - await Promise.all(videoFileDestroyTasks) - const videoFileAttributes = videoFileActivityUrlToDBAttributes(video, videoObject) - const tasks = videoFileAttributes.map(f => VideoFileModel.create(f, sequelizeOptions)) - await Promise.all(tasks) - - // Update Tags - const tags = videoObject.tag.map(tag => tag.name) - const tagInstances = await TagModel.findOrCreateTags(tags, t) - await video.$set('Tags', tagInstances, sequelizeOptions) + { + // Update Tags + const tags = options.videoObject.tag.map(tag => tag.name) + const tagInstances = await TagModel.findOrCreateTags(tags, t) + await options.video.$set('Tags', tagInstances, sequelizeOptions) + } - // Update captions - await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(video.id, t) + { + // Update captions + await VideoCaptionModel.deleteAllCaptionsOfRemoteVideo(options.video.id, t) - const videoCaptionsPromises = videoObject.subtitleLanguage.map(c => { - return VideoCaptionModel.insertOrReplaceLanguage(video.id, c.identifier, t) - }) - await Promise.all(videoCaptionsPromises) + const videoCaptionsPromises = options.videoObject.subtitleLanguage.map(c => { + return VideoCaptionModel.insertOrReplaceLanguage(options.video.id, c.identifier, t) + }) + options.video.VideoCaptions = await Promise.all(videoCaptionsPromises) + } }) - logger.info('Remote video with uuid %s updated', videoObject.uuid) - - return updatedVideo + logger.info('Remote video with uuid %s updated', options.videoObject.uuid) } catch (err) { - if (video !== undefined && videoFieldsSave !== undefined) { - resetSequelizeInstance(video, videoFieldsSave) + if (options.video !== undefined && videoFieldsSave !== undefined) { + resetSequelizeInstance(options.video, videoFieldsSave) } // This is just a debug because we will retry the insert @@ -339,32 +359,48 @@ async function createVideo (videoObject: VideoTorrentObject, channelActor: Actor return videoCreated } -async function refreshVideoIfNeeded (videoArg: VideoModel, fetchedType: VideoFetchByUrlType, syncParam: SyncParam): Promise { - // We need more attributes if the argument video was fetched with not enough joints - const video = fetchedType === 'all' ? videoArg : await VideoModel.loadByUrlAndPopulateAccount(videoArg.url) +async function refreshVideoIfNeeded (options: { + video: VideoModel, + fetchedType: VideoFetchByUrlType, + syncParam: SyncParam, + refreshViews: boolean +}): Promise { + if (!options.video.isOutdated()) return options.video - if (!video.isOutdated()) return video + // We need more attributes if the argument video was fetched with not enough joints + const video = options.fetchedType === 'all' ? options.video : await VideoModel.loadByUrlAndPopulateAccount(options.video.url) try { const { response, videoObject } = await fetchRemoteVideo(video.url) if (response.statusCode === 404) { + logger.info('Cannot refresh remote video %s: video does not exist anymore. Deleting it.', video.url) + // Video does not exist anymore await video.destroy() return undefined } if (videoObject === undefined) { - logger.warn('Cannot refresh remote video: invalid body.') + logger.warn('Cannot refresh remote video %s: invalid body.', video.url) return video } const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject) const account = await AccountModel.load(channelActor.VideoChannel.accountId) - await updateVideoFromAP(video, videoObject, account, channelActor.VideoChannel) - await syncVideoExternalAttributes(video, videoObject, syncParam) + const updateOptions = { + video, + videoObject, + account, + channel: channelActor.VideoChannel, + updateViews: options.refreshViews + } + await retryTransactionWrapper(updateVideoFromAP, updateOptions) + await syncVideoExternalAttributes(video, videoObject, options.syncParam) + + return video } catch (err) { - logger.warn('Cannot refresh video.', { err }) + logger.warn('Cannot refresh video %s.', options.video.url, { err }) return video } } @@ -406,6 +442,7 @@ async function videoActivityObjectToDBAttributes ( support, nsfw: videoObject.sensitive, commentsEnabled: videoObject.commentsEnabled, + downloadingEnabled: videoObject.downloadingEnabled, waitTranscoding: videoObject.waitTranscoding, state: videoObject.state, channelId: videoChannel.id, @@ -422,11 +459,11 @@ async function videoActivityObjectToDBAttributes ( } } -function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObject: VideoTorrentObject) { +function videoFileActivityUrlToDBAttributes (video: VideoModel, videoObject: VideoTorrentObject) { const fileUrls = videoObject.url.filter(u => isActivityVideoUrlObject(u)) as ActivityVideoUrlObject[] if (fileUrls.length === 0) { - throw new Error('Cannot find video files for ' + videoCreated.url) + throw new Error('Cannot find video files for ' + video.url) } const attributes: VideoFileModel[] = [] @@ -448,8 +485,8 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObje infoHash: parsed.infoHash, resolution: fileUrl.height, size: fileUrl.size, - videoId: videoCreated.id, - fps: fileUrl.fps + videoId: video.id, + fps: fileUrl.fps || -1 } as VideoFileModel attributes.push(attribute) }