From fd6a74a83594bfb59e28bf9cae71a39884ebcc2f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 11 Jun 2021 14:33:16 +0200 Subject: Refactor schedule update --- server/lib/schedulers/update-videos-scheduler.ts | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'server/lib/schedulers/update-videos-scheduler.ts') diff --git a/server/lib/schedulers/update-videos-scheduler.ts b/server/lib/schedulers/update-videos-scheduler.ts index 3e75babcb..e61d4c2ac 100644 --- a/server/lib/schedulers/update-videos-scheduler.ts +++ b/server/lib/schedulers/update-videos-scheduler.ts @@ -7,6 +7,7 @@ import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants' import { Notifier } from '../notifier' import { sequelizeTypescript } from '../../initializers/database' import { MVideoFullLight } from '@server/types/models' +import { VideoModel } from '@server/models/video/video' export class UpdateVideosScheduler extends AbstractScheduler { @@ -25,12 +26,13 @@ export class UpdateVideosScheduler extends AbstractScheduler { private async updateVideos () { if (!await ScheduleVideoUpdateModel.areVideosToUpdate()) return undefined - const publishedVideos = await sequelizeTypescript.transaction(async t => { - const schedules = await ScheduleVideoUpdateModel.listVideosToUpdate(t) - const publishedVideos: MVideoFullLight[] = [] + const schedules = await ScheduleVideoUpdateModel.listVideosToUpdate() + const publishedVideos: MVideoFullLight[] = [] + + for (const schedule of schedules) { + await sequelizeTypescript.transaction(async t => { + const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(schedule.videoId, t) - for (const schedule of schedules) { - const video = schedule.Video logger.info('Executing scheduled video update on %s.', video.uuid) if (schedule.privacy) { @@ -42,16 +44,13 @@ export class UpdateVideosScheduler extends AbstractScheduler { await federateVideoIfNeeded(video, isNewVideo, t) if (wasConfidentialVideo) { - const videoToPublish: MVideoFullLight = Object.assign(video, { ScheduleVideoUpdate: schedule, UserVideoHistories: [] }) - publishedVideos.push(videoToPublish) + publishedVideos.push(video) } } await schedule.destroy({ transaction: t }) - } - - return publishedVideos - }) + }) + } for (const v of publishedVideos) { Notifier.Instance.notifyOnNewVideoIfNeeded(v) -- cgit v1.2.3