diff options
author | Chocobozzz <me@florianbigard.com> | 2022-08-10 11:51:13 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-08-10 14:32:00 +0200 |
commit | a3b472a12ec6e57dbe2f650419f8064864686eab (patch) | |
tree | f36559488e34493c029b686772e986902150a647 /server/lib/job-queue/handlers | |
parent | 0567049a9819d67070aa6d548a75a7e632a4aaa4 (diff) | |
download | PeerTube-a3b472a12ec6e57dbe2f650419f8064864686eab.tar.gz PeerTube-a3b472a12ec6e57dbe2f650419f8064864686eab.tar.zst PeerTube-a3b472a12ec6e57dbe2f650419f8064864686eab.zip |
Add ability to list imports of a channel sync
Diffstat (limited to 'server/lib/job-queue/handlers')
-rw-r--r-- | server/lib/job-queue/handlers/video-channel-import.ts | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/server/lib/job-queue/handlers/video-channel-import.ts b/server/lib/job-queue/handlers/video-channel-import.ts index 9bdb2d269..9aaad659e 100644 --- a/server/lib/job-queue/handlers/video-channel-import.ts +++ b/server/lib/job-queue/handlers/video-channel-import.ts | |||
@@ -3,6 +3,8 @@ import { logger } from '@server/helpers/logger' | |||
3 | import { CONFIG } from '@server/initializers/config' | 3 | import { CONFIG } from '@server/initializers/config' |
4 | import { synchronizeChannel } from '@server/lib/sync-channel' | 4 | import { synchronizeChannel } from '@server/lib/sync-channel' |
5 | import { VideoChannelModel } from '@server/models/video/video-channel' | 5 | import { VideoChannelModel } from '@server/models/video/video-channel' |
6 | import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' | ||
7 | import { MChannelSync } from '@server/types/models' | ||
6 | import { VideoChannelImportPayload } from '@shared/models' | 8 | import { VideoChannelImportPayload } from '@shared/models' |
7 | 9 | ||
8 | export async function processVideoChannelImport (job: Job) { | 10 | export async function processVideoChannelImport (job: Job) { |
@@ -12,13 +14,20 @@ export async function processVideoChannelImport (job: Job) { | |||
12 | 14 | ||
13 | // Channel import requires only http upload to be allowed | 15 | // Channel import requires only http upload to be allowed |
14 | if (!CONFIG.IMPORT.VIDEOS.HTTP.ENABLED) { | 16 | if (!CONFIG.IMPORT.VIDEOS.HTTP.ENABLED) { |
15 | logger.error('Cannot import channel as the HTTP upload is disabled') | 17 | throw new Error('Cannot import channel as the HTTP upload is disabled') |
16 | return | ||
17 | } | 18 | } |
18 | 19 | ||
19 | if (!CONFIG.IMPORT.VIDEO_CHANNEL_SYNCHRONIZATION.ENABLED) { | 20 | if (!CONFIG.IMPORT.VIDEO_CHANNEL_SYNCHRONIZATION.ENABLED) { |
20 | logger.error('Cannot import channel as the synchronization is disabled') | 21 | throw new Error('Cannot import channel as the synchronization is disabled') |
21 | return | 22 | } |
23 | |||
24 | let channelSync: MChannelSync | ||
25 | if (payload.partOfChannelSyncId) { | ||
26 | channelSync = await VideoChannelSyncModel.loadWithChannel(payload.partOfChannelSyncId) | ||
27 | |||
28 | if (!channelSync) { | ||
29 | throw new Error('Unlnown channel sync specified in videos channel import') | ||
30 | } | ||
22 | } | 31 | } |
23 | 32 | ||
24 | const videoChannel = await VideoChannelModel.loadAndPopulateAccount(payload.videoChannelId) | 33 | const videoChannel = await VideoChannelModel.loadAndPopulateAccount(payload.videoChannelId) |
@@ -28,7 +37,8 @@ export async function processVideoChannelImport (job: Job) { | |||
28 | 37 | ||
29 | await synchronizeChannel({ | 38 | await synchronizeChannel({ |
30 | channel: videoChannel, | 39 | channel: videoChannel, |
31 | externalChannelUrl: payload.externalChannelUrl | 40 | externalChannelUrl: payload.externalChannelUrl, |
41 | channelSync | ||
32 | }) | 42 | }) |
33 | } catch (err) { | 43 | } catch (err) { |
34 | logger.error(`Failed to import channel ${videoChannel.name}`, { err }) | 44 | logger.error(`Failed to import channel ${videoChannel.name}`, { err }) |