let videoFieldsSave: any
try {
- const updatedVideo: VideoModel = await sequelizeTypescript.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = {
transaction: t
}
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)
await Promise.all(destroyTasks)
// Update or add other one
- const upsertTasks = videoFileAttributes.map(a => VideoFileModel.upsert(a, sequelizeOptions))
- await Promise.all(upsertTasks)
+ const upsertTasks = videoFileAttributes.map(a => {
+ return VideoFileModel.upsert<VideoFileModel>(a, { returning: true, transaction: t })
+ .then(([ file ]) => file)
+ })
+
+ options.video.VideoFiles = await Promise.all(upsertTasks)
}
{
const videoCaptionsPromises = options.videoObject.subtitleLanguage.map(c => {
return VideoCaptionModel.insertOrReplaceLanguage(options.video.id, c.identifier, t)
})
- await Promise.all(videoCaptionsPromises)
+ options.video.VideoCaptions = await Promise.all(videoCaptionsPromises)
}
})
logger.info('Remote video with uuid %s updated', options.videoObject.uuid)
-
- return updatedVideo
} catch (err) {
if (options.video !== undefined && videoFieldsSave !== undefined) {
resetSequelizeInstance(options.video, videoFieldsSave)
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
}
}
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
}
}
support,
nsfw: videoObject.sensitive,
commentsEnabled: videoObject.commentsEnabled,
+ downloadingEnabled: videoObject.downloadingEnabled,
waitTranscoding: videoObject.waitTranscoding,
state: videoObject.state,
channelId: videoChannel.id,
}
}
-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[] = []
infoHash: parsed.infoHash,
resolution: fileUrl.height,
size: fileUrl.size,
- videoId: videoCreated.id,
+ videoId: video.id,
fps: fileUrl.fps || -1
} as VideoFileModel
attributes.push(attribute)