let videoFieldsSave: any
try {
- const updatedVideo: VideoModel = await sequelizeTypescript.transaction(async t => {
+ await sequelizeTypescript.transaction(async t => {
const sequelizeOptions = {
transaction: t
}
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)
channel: channelActor.VideoChannel,
updateViews: options.refreshViews
}
- const videoUpdated = await retryTransactionWrapper(updateVideoFromAP, updateOptions)
- await syncVideoExternalAttributes(videoUpdated, videoObject, options.syncParam)
+ await retryTransactionWrapper(updateVideoFromAP, updateOptions)
+ await syncVideoExternalAttributes(video, videoObject, options.syncParam)
- return videoUpdated
+ return video
} catch (err) {
- logger.warn('Cannot refresh video.', { err })
+ logger.warn('Cannot refresh video %s.', options.video.url, { err })
return video
}
}
}
}
-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)