diff options
author | Chocobozzz <me@florianbigard.com> | 2022-03-22 14:35:04 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-03-22 16:25:14 +0100 |
commit | 1808a1f8e4b7b102823492a2007a46929aebf189 (patch) | |
tree | a345140ec9a7a20c222ace3cda18ac999277c8c3 /server/lib | |
parent | 348c2ce3ff3fe2f25a31f08bfb36c88723a0ce46 (diff) | |
download | PeerTube-1808a1f8e4b7b102823492a2007a46929aebf189.tar.gz PeerTube-1808a1f8e4b7b102823492a2007a46929aebf189.tar.zst PeerTube-1808a1f8e4b7b102823492a2007a46929aebf189.zip |
Add video edition finished notification
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/job-queue/handlers/move-to-object-storage.ts | 14 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-edition.ts | 29 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-file-import.ts | 2 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-import.ts | 4 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-live-ending.ts | 2 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/video-transcoding.ts | 6 | ||||
-rw-r--r-- | server/lib/notifier/notifier.ts | 11 | ||||
-rw-r--r-- | server/lib/notifier/shared/video-publication/abstract-owned-video-publication.ts | 2 | ||||
-rw-r--r-- | server/lib/notifier/shared/video-publication/edition-finished-for-owner.ts | 57 | ||||
-rw-r--r-- | server/lib/notifier/shared/video-publication/index.ts | 1 | ||||
-rw-r--r-- | server/lib/user.ts | 3 | ||||
-rw-r--r-- | server/lib/video-state.ts | 50 | ||||
-rw-r--r-- | server/lib/video.ts | 37 |
13 files changed, 166 insertions, 52 deletions
diff --git a/server/lib/job-queue/handlers/move-to-object-storage.ts b/server/lib/job-queue/handlers/move-to-object-storage.ts index 69b441176..f480b32cd 100644 --- a/server/lib/job-queue/handlers/move-to-object-storage.ts +++ b/server/lib/job-queue/handlers/move-to-object-storage.ts | |||
@@ -11,7 +11,7 @@ import { moveToFailedMoveToObjectStorageState, moveToNextState } from '@server/l | |||
11 | import { VideoModel } from '@server/models/video/video' | 11 | import { VideoModel } from '@server/models/video/video' |
12 | import { VideoJobInfoModel } from '@server/models/video/video-job-info' | 12 | import { VideoJobInfoModel } from '@server/models/video/video-job-info' |
13 | import { MStreamingPlaylistVideo, MVideo, MVideoFile, MVideoWithAllFiles } from '@server/types/models' | 13 | import { MStreamingPlaylistVideo, MVideo, MVideoFile, MVideoWithAllFiles } from '@server/types/models' |
14 | import { MoveObjectStoragePayload, VideoStorage } from '@shared/models' | 14 | import { MoveObjectStoragePayload, VideoState, VideoStorage } from '@shared/models' |
15 | 15 | ||
16 | const lTagsBase = loggerTagsFactory('move-object-storage') | 16 | const lTagsBase = loggerTagsFactory('move-object-storage') |
17 | 17 | ||
@@ -45,7 +45,7 @@ export async function processMoveToObjectStorage (job: Job) { | |||
45 | if (pendingMove === 0) { | 45 | if (pendingMove === 0) { |
46 | logger.info('Running cleanup after moving files to object storage (video %s in job %d)', video.uuid, job.id, lTags) | 46 | logger.info('Running cleanup after moving files to object storage (video %s in job %d)', video.uuid, job.id, lTags) |
47 | 47 | ||
48 | await doAfterLastJob(video, payload.isNewVideo) | 48 | await doAfterLastJob({ video, previousVideoState: payload.previousVideoState, isNewVideo: payload.isNewVideo }) |
49 | } | 49 | } |
50 | } catch (err) { | 50 | } catch (err) { |
51 | logger.error('Cannot move video %s to object storage.', video.url, { err, ...lTags }) | 51 | logger.error('Cannot move video %s to object storage.', video.url, { err, ...lTags }) |
@@ -91,7 +91,13 @@ async function moveHLSFiles (video: MVideoWithAllFiles) { | |||
91 | } | 91 | } |
92 | } | 92 | } |
93 | 93 | ||
94 | async function doAfterLastJob (video: MVideoWithAllFiles, isNewVideo: boolean) { | 94 | async function doAfterLastJob (options: { |
95 | video: MVideoWithAllFiles | ||
96 | previousVideoState: VideoState | ||
97 | isNewVideo: boolean | ||
98 | }) { | ||
99 | const { video, previousVideoState, isNewVideo } = options | ||
100 | |||
95 | for (const playlist of video.VideoStreamingPlaylists) { | 101 | for (const playlist of video.VideoStreamingPlaylists) { |
96 | if (playlist.storage === VideoStorage.OBJECT_STORAGE) continue | 102 | if (playlist.storage === VideoStorage.OBJECT_STORAGE) continue |
97 | 103 | ||
@@ -115,7 +121,7 @@ async function doAfterLastJob (video: MVideoWithAllFiles, isNewVideo: boolean) { | |||
115 | await remove(getHLSDirectory(video)) | 121 | await remove(getHLSDirectory(video)) |
116 | } | 122 | } |
117 | 123 | ||
118 | await moveToNextState(video, isNewVideo) | 124 | await moveToNextState({ video, previousVideoState, isNewVideo }) |
119 | } | 125 | } |
120 | 126 | ||
121 | async function onFileMoved (options: { | 127 | async function onFileMoved (options: { |
diff --git a/server/lib/job-queue/handlers/video-edition.ts b/server/lib/job-queue/handlers/video-edition.ts index c5ba0452f..d2d2a4f65 100644 --- a/server/lib/job-queue/handlers/video-edition.ts +++ b/server/lib/job-queue/handlers/video-edition.ts | |||
@@ -8,10 +8,9 @@ import { federateVideoIfNeeded } from '@server/lib/activitypub/videos' | |||
8 | import { generateWebTorrentVideoFilename } from '@server/lib/paths' | 8 | import { generateWebTorrentVideoFilename } from '@server/lib/paths' |
9 | import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/default-transcoding-profiles' | 9 | import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/default-transcoding-profiles' |
10 | import { isAbleToUploadVideo } from '@server/lib/user' | 10 | import { isAbleToUploadVideo } from '@server/lib/user' |
11 | import { addMoveToObjectStorageJob, addOptimizeOrMergeAudioJob } from '@server/lib/video' | 11 | import { addOptimizeOrMergeAudioJob } from '@server/lib/video' |
12 | import { approximateIntroOutroAdditionalSize } from '@server/lib/video-editor' | 12 | import { approximateIntroOutroAdditionalSize } from '@server/lib/video-editor' |
13 | import { VideoPathManager } from '@server/lib/video-path-manager' | 13 | import { VideoPathManager } from '@server/lib/video-path-manager' |
14 | import { buildNextVideoState } from '@server/lib/video-state' | ||
15 | import { UserModel } from '@server/models/user/user' | 14 | import { UserModel } from '@server/models/user/user' |
16 | import { VideoModel } from '@server/models/video/video' | 15 | import { VideoModel } from '@server/models/video/video' |
17 | import { VideoFileModel } from '@server/models/video/video-file' | 16 | import { VideoFileModel } from '@server/models/video/video-file' |
@@ -33,8 +32,7 @@ import { | |||
33 | VideoEditorTaskCutPayload, | 32 | VideoEditorTaskCutPayload, |
34 | VideoEditorTaskIntroPayload, | 33 | VideoEditorTaskIntroPayload, |
35 | VideoEditorTaskOutroPayload, | 34 | VideoEditorTaskOutroPayload, |
36 | VideoEditorTaskWatermarkPayload, | 35 | VideoEditorTaskWatermarkPayload |
37 | VideoState | ||
38 | } from '@shared/models' | 36 | } from '@shared/models' |
39 | import { logger, loggerTagsFactory } from '../../../helpers/logger' | 37 | import { logger, loggerTagsFactory } from '../../../helpers/logger' |
40 | 38 | ||
@@ -42,14 +40,15 @@ const lTagsBase = loggerTagsFactory('video-edition') | |||
42 | 40 | ||
43 | async function processVideoEdition (job: Job) { | 41 | async function processVideoEdition (job: Job) { |
44 | const payload = job.data as VideoEditionPayload | 42 | const payload = job.data as VideoEditionPayload |
43 | const lTags = lTagsBase(payload.videoUUID) | ||
45 | 44 | ||
46 | logger.info('Process video edition of %s in job %d.', payload.videoUUID, job.id) | 45 | logger.info('Process video edition of %s in job %d.', payload.videoUUID, job.id, lTags) |
47 | 46 | ||
48 | const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID) | 47 | const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID) |
49 | 48 | ||
50 | // No video, maybe deleted? | 49 | // No video, maybe deleted? |
51 | if (!video) { | 50 | if (!video) { |
52 | logger.info('Can\'t process job %d, video does not exist.', job.id, lTagsBase(payload.videoUUID)) | 51 | logger.info('Can\'t process job %d, video does not exist.', job.id, lTags) |
53 | return undefined | 52 | return undefined |
54 | } | 53 | } |
55 | 54 | ||
@@ -69,7 +68,8 @@ async function processVideoEdition (job: Job) { | |||
69 | inputPath: tmpInputFilePath ?? originalFilePath, | 68 | inputPath: tmpInputFilePath ?? originalFilePath, |
70 | video, | 69 | video, |
71 | outputPath, | 70 | outputPath, |
72 | task | 71 | task, |
72 | lTags | ||
73 | }) | 73 | }) |
74 | 74 | ||
75 | if (tmpInputFilePath) await remove(tmpInputFilePath) | 75 | if (tmpInputFilePath) await remove(tmpInputFilePath) |
@@ -81,7 +81,7 @@ async function processVideoEdition (job: Job) { | |||
81 | return outputPath | 81 | return outputPath |
82 | }) | 82 | }) |
83 | 83 | ||
84 | logger.info('Video edition ended for video %s.', video.uuid) | 84 | logger.info('Video edition ended for video %s.', video.uuid, lTags) |
85 | 85 | ||
86 | const newFile = await buildNewFile(video, editionResultPath) | 86 | const newFile = await buildNewFile(video, editionResultPath) |
87 | 87 | ||
@@ -94,19 +94,13 @@ async function processVideoEdition (job: Job) { | |||
94 | 94 | ||
95 | await newFile.save() | 95 | await newFile.save() |
96 | 96 | ||
97 | video.state = buildNextVideoState() | ||
98 | video.duration = await getVideoStreamDuration(outputPath) | 97 | video.duration = await getVideoStreamDuration(outputPath) |
99 | await video.save() | 98 | await video.save() |
100 | 99 | ||
101 | await federateVideoIfNeeded(video, false, undefined) | 100 | await federateVideoIfNeeded(video, false, undefined) |
102 | 101 | ||
103 | if (video.state === VideoState.TO_TRANSCODE) { | 102 | const user = await UserModel.loadByVideoId(video.id) |
104 | const user = await UserModel.loadByVideoId(video.id) | 103 | await addOptimizeOrMergeAudioJob({ video, videoFile: newFile, user, isNewVideo: false }) |
105 | |||
106 | await addOptimizeOrMergeAudioJob(video, newFile, user, false) | ||
107 | } else if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { | ||
108 | await addMoveToObjectStorageJob(video, false) | ||
109 | } | ||
110 | } | 104 | } |
111 | 105 | ||
112 | // --------------------------------------------------------------------------- | 106 | // --------------------------------------------------------------------------- |
@@ -122,6 +116,7 @@ type TaskProcessorOptions <T extends VideoEditionTaskPayload = VideoEditionTaskP | |||
122 | outputPath: string | 116 | outputPath: string |
123 | video: MVideo | 117 | video: MVideo |
124 | task: T | 118 | task: T |
119 | lTags: { tags: string[] } | ||
125 | } | 120 | } |
126 | 121 | ||
127 | const taskProcessors: { [id in VideoEditorTask['name']]: (options: TaskProcessorOptions) => Promise<any> } = { | 122 | const taskProcessors: { [id in VideoEditorTask['name']]: (options: TaskProcessorOptions) => Promise<any> } = { |
@@ -134,7 +129,7 @@ const taskProcessors: { [id in VideoEditorTask['name']]: (options: TaskProcessor | |||
134 | async function processTask (options: TaskProcessorOptions) { | 129 | async function processTask (options: TaskProcessorOptions) { |
135 | const { video, task } = options | 130 | const { video, task } = options |
136 | 131 | ||
137 | logger.info('Processing %s task for video %s.', task.name, video.uuid, { task }) | 132 | logger.info('Processing %s task for video %s.', task.name, video.uuid, { task, ...options.lTags }) |
138 | 133 | ||
139 | const processor = taskProcessors[options.task.name] | 134 | const processor = taskProcessors[options.task.name] |
140 | if (!process) throw new Error('Unknown task ' + task.name) | 135 | if (!process) throw new Error('Unknown task ' + task.name) |
diff --git a/server/lib/job-queue/handlers/video-file-import.ts b/server/lib/job-queue/handlers/video-file-import.ts index 6b2d60317..110176d81 100644 --- a/server/lib/job-queue/handlers/video-file-import.ts +++ b/server/lib/job-queue/handlers/video-file-import.ts | |||
@@ -28,7 +28,7 @@ async function processVideoFileImport (job: Job) { | |||
28 | await updateVideoFile(video, payload.filePath) | 28 | await updateVideoFile(video, payload.filePath) |
29 | 29 | ||
30 | if (CONFIG.OBJECT_STORAGE.ENABLED) { | 30 | if (CONFIG.OBJECT_STORAGE.ENABLED) { |
31 | await addMoveToObjectStorageJob(video) | 31 | await addMoveToObjectStorageJob({ video, previousVideoState: video.state }) |
32 | } else { | 32 | } else { |
33 | await federateVideoIfNeeded(video, false) | 33 | await federateVideoIfNeeded(video, false) |
34 | } | 34 | } |
diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index b3ca28c2f..d59a1b12f 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts | |||
@@ -254,12 +254,12 @@ async function processFile (downloader: () => Promise<string>, videoImport: MVid | |||
254 | } | 254 | } |
255 | 255 | ||
256 | if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { | 256 | if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { |
257 | return addMoveToObjectStorageJob(videoImportUpdated.Video) | 257 | return addMoveToObjectStorageJob({ video: videoImportUpdated.Video, previousVideoState: VideoState.TO_IMPORT }) |
258 | } | 258 | } |
259 | 259 | ||
260 | // Create transcoding jobs? | 260 | // Create transcoding jobs? |
261 | if (video.state === VideoState.TO_TRANSCODE) { | 261 | if (video.state === VideoState.TO_TRANSCODE) { |
262 | await addOptimizeOrMergeAudioJob(videoImportUpdated.Video, videoFile, videoImport.User) | 262 | await addOptimizeOrMergeAudioJob({ video: videoImportUpdated.Video, videoFile, user: videoImport.User }) |
263 | } | 263 | } |
264 | 264 | ||
265 | } catch (err) { | 265 | } catch (err) { |
diff --git a/server/lib/job-queue/handlers/video-live-ending.ts b/server/lib/job-queue/handlers/video-live-ending.ts index 497f6612a..f4de4b47c 100644 --- a/server/lib/job-queue/handlers/video-live-ending.ts +++ b/server/lib/job-queue/handlers/video-live-ending.ts | |||
@@ -133,7 +133,7 @@ async function saveLive (video: MVideo, live: MVideoLive, streamingPlaylist: MSt | |||
133 | }) | 133 | }) |
134 | } | 134 | } |
135 | 135 | ||
136 | await moveToNextState(videoWithFiles, false) | 136 | await moveToNextState({ video: videoWithFiles, isNewVideo: false }) |
137 | } | 137 | } |
138 | 138 | ||
139 | async function cleanupTMPLiveFiles (hlsDirectory: string) { | 139 | async function cleanupTMPLiveFiles (hlsDirectory: string) { |
diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts index 512979734..95ee6b384 100644 --- a/server/lib/job-queue/handlers/video-transcoding.ts +++ b/server/lib/job-queue/handlers/video-transcoding.ts | |||
@@ -168,7 +168,7 @@ async function onHlsPlaylistGeneration (video: MVideoFullLight, user: MUser, pay | |||
168 | } | 168 | } |
169 | 169 | ||
170 | await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode') | 170 | await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode') |
171 | await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo) | 171 | await retryTransactionWrapper(moveToNextState, { video, isNewVideo: payload.isNewVideo }) |
172 | } | 172 | } |
173 | 173 | ||
174 | async function onVideoFirstWebTorrentTranscoding ( | 174 | async function onVideoFirstWebTorrentTranscoding ( |
@@ -210,7 +210,7 @@ async function onVideoFirstWebTorrentTranscoding ( | |||
210 | 210 | ||
211 | // Move to next state if there are no other resolutions to generate | 211 | // Move to next state if there are no other resolutions to generate |
212 | if (!hasHls && !hasNewResolutions) { | 212 | if (!hasHls && !hasNewResolutions) { |
213 | await retryTransactionWrapper(moveToNextState, videoDatabase, payload.isNewVideo) | 213 | await retryTransactionWrapper(moveToNextState, { video: videoDatabase, isNewVideo: payload.isNewVideo }) |
214 | } | 214 | } |
215 | } | 215 | } |
216 | 216 | ||
@@ -225,7 +225,7 @@ async function onNewWebTorrentFileResolution ( | |||
225 | 225 | ||
226 | await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode') | 226 | await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode') |
227 | 227 | ||
228 | await retryTransactionWrapper(moveToNextState, video, payload.isNewVideo) | 228 | await retryTransactionWrapper(moveToNextState, { video, isNewVideo: payload.isNewVideo }) |
229 | } | 229 | } |
230 | 230 | ||
231 | // --------------------------------------------------------------------------- | 231 | // --------------------------------------------------------------------------- |
diff --git a/server/lib/notifier/notifier.ts b/server/lib/notifier/notifier.ts index 8b68d2e69..e34a82603 100644 --- a/server/lib/notifier/notifier.ts +++ b/server/lib/notifier/notifier.ts | |||
@@ -12,6 +12,7 @@ import { | |||
12 | AbuseStateChangeForReporter, | 12 | AbuseStateChangeForReporter, |
13 | AutoFollowForInstance, | 13 | AutoFollowForInstance, |
14 | CommentMention, | 14 | CommentMention, |
15 | EditionFinishedForOwner, | ||
15 | FollowForInstance, | 16 | FollowForInstance, |
16 | FollowForUser, | 17 | FollowForUser, |
17 | ImportFinishedForOwner, | 18 | ImportFinishedForOwner, |
@@ -53,7 +54,8 @@ class Notifier { | |||
53 | abuseStateChange: [ AbuseStateChangeForReporter ], | 54 | abuseStateChange: [ AbuseStateChangeForReporter ], |
54 | newAbuseMessage: [ NewAbuseMessageForReporter, NewAbuseMessageForModerators ], | 55 | newAbuseMessage: [ NewAbuseMessageForReporter, NewAbuseMessageForModerators ], |
55 | newPeertubeVersion: [ NewPeerTubeVersionForAdmins ], | 56 | newPeertubeVersion: [ NewPeerTubeVersionForAdmins ], |
56 | newPluginVersion: [ NewPluginVersionForAdmins ] | 57 | newPluginVersion: [ NewPluginVersionForAdmins ], |
58 | videoEditionFinished: [ EditionFinishedForOwner ] | ||
57 | } | 59 | } |
58 | 60 | ||
59 | private static instance: Notifier | 61 | private static instance: Notifier |
@@ -198,6 +200,13 @@ class Notifier { | |||
198 | .catch(err => logger.error('Cannot notify on new plugin version %s.', plugin.name, { err })) | 200 | .catch(err => logger.error('Cannot notify on new plugin version %s.', plugin.name, { err })) |
199 | } | 201 | } |
200 | 202 | ||
203 | notifyOfFinishedVideoEdition (video: MVideoFullLight) { | ||
204 | const models = this.notificationModels.videoEditionFinished | ||
205 | |||
206 | this.sendNotifications(models, video) | ||
207 | .catch(err => logger.error('Cannot notify on finished edition %s.', video.url, { err })) | ||
208 | } | ||
209 | |||
201 | private async notify <T> (object: AbstractNotification<T>) { | 210 | private async notify <T> (object: AbstractNotification<T>) { |
202 | await object.prepare() | 211 | await object.prepare() |
203 | 212 | ||
diff --git a/server/lib/notifier/shared/video-publication/abstract-owned-video-publication.ts b/server/lib/notifier/shared/video-publication/abstract-owned-video-publication.ts index fd06e080d..37435f898 100644 --- a/server/lib/notifier/shared/video-publication/abstract-owned-video-publication.ts +++ b/server/lib/notifier/shared/video-publication/abstract-owned-video-publication.ts | |||
@@ -46,7 +46,7 @@ export abstract class AbstractOwnedVideoPublication extends AbstractNotification | |||
46 | subject: `Your video ${this.payload.name} has been published`, | 46 | subject: `Your video ${this.payload.name} has been published`, |
47 | text: `Your video "${this.payload.name}" has been published.`, | 47 | text: `Your video "${this.payload.name}" has been published.`, |
48 | locals: { | 48 | locals: { |
49 | title: 'You video is live', | 49 | title: 'Your video is live', |
50 | action: { | 50 | action: { |
51 | text: 'View video', | 51 | text: 'View video', |
52 | url: videoUrl | 52 | url: videoUrl |
diff --git a/server/lib/notifier/shared/video-publication/edition-finished-for-owner.ts b/server/lib/notifier/shared/video-publication/edition-finished-for-owner.ts new file mode 100644 index 000000000..dec91f574 --- /dev/null +++ b/server/lib/notifier/shared/video-publication/edition-finished-for-owner.ts | |||
@@ -0,0 +1,57 @@ | |||
1 | import { logger } from '@server/helpers/logger' | ||
2 | import { WEBSERVER } from '@server/initializers/constants' | ||
3 | import { UserModel } from '@server/models/user/user' | ||
4 | import { UserNotificationModel } from '@server/models/user/user-notification' | ||
5 | import { MUserDefault, MUserWithNotificationSetting, MVideoFullLight, UserNotificationModelForApi } from '@server/types/models' | ||
6 | import { UserNotificationType } from '@shared/models' | ||
7 | import { AbstractNotification } from '../common/abstract-notification' | ||
8 | |||
9 | export class EditionFinishedForOwner extends AbstractNotification <MVideoFullLight> { | ||
10 | private user: MUserDefault | ||
11 | |||
12 | async prepare () { | ||
13 | this.user = await UserModel.loadByVideoId(this.payload.id) | ||
14 | } | ||
15 | |||
16 | log () { | ||
17 | logger.info('Notifying user %s its video edition %s is finished.', this.user.username, this.payload.url) | ||
18 | } | ||
19 | |||
20 | getSetting (user: MUserWithNotificationSetting) { | ||
21 | return user.NotificationSetting.myVideoEditionFinished | ||
22 | } | ||
23 | |||
24 | getTargetUsers () { | ||
25 | if (!this.user) return [] | ||
26 | |||
27 | return [ this.user ] | ||
28 | } | ||
29 | |||
30 | async createNotification (user: MUserWithNotificationSetting) { | ||
31 | const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ | ||
32 | type: UserNotificationType.MY_VIDEO_EDITION_FINISHED, | ||
33 | userId: user.id, | ||
34 | videoId: this.payload.id | ||
35 | }) | ||
36 | notification.Video = this.payload | ||
37 | |||
38 | return notification | ||
39 | } | ||
40 | |||
41 | createEmail (to: string) { | ||
42 | const videoUrl = WEBSERVER.URL + this.payload.getWatchStaticPath() | ||
43 | |||
44 | return { | ||
45 | to, | ||
46 | subject: `Edition of your video ${this.payload.name} has finished`, | ||
47 | text: `Edition of your video ${this.payload.name} has finished.`, | ||
48 | locals: { | ||
49 | title: 'Video edition has finished', | ||
50 | action: { | ||
51 | text: 'View video', | ||
52 | url: videoUrl | ||
53 | } | ||
54 | } | ||
55 | } | ||
56 | } | ||
57 | } | ||
diff --git a/server/lib/notifier/shared/video-publication/index.ts b/server/lib/notifier/shared/video-publication/index.ts index 940774504..57f3443b9 100644 --- a/server/lib/notifier/shared/video-publication/index.ts +++ b/server/lib/notifier/shared/video-publication/index.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | export * from './new-video-for-subscribers' | 1 | export * from './new-video-for-subscribers' |
2 | export * from './edition-finished-for-owner' | ||
2 | export * from './import-finished-for-owner' | 3 | export * from './import-finished-for-owner' |
3 | export * from './owned-publication-after-auto-unblacklist' | 4 | export * from './owned-publication-after-auto-unblacklist' |
4 | export * from './owned-publication-after-schedule-update' | 5 | export * from './owned-publication-after-schedule-update' |
diff --git a/server/lib/user.ts b/server/lib/user.ts index ea755f4be..173d89d0b 100644 --- a/server/lib/user.ts +++ b/server/lib/user.ts | |||
@@ -252,7 +252,8 @@ function createDefaultUserNotificationSettings (user: MUserId, t: Transaction | | |||
252 | abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, | 252 | abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, |
253 | autoInstanceFollowing: UserNotificationSettingValue.WEB, | 253 | autoInstanceFollowing: UserNotificationSettingValue.WEB, |
254 | newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, | 254 | newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL, |
255 | newPluginVersion: UserNotificationSettingValue.WEB | 255 | newPluginVersion: UserNotificationSettingValue.WEB, |
256 | myVideoEditionFinished: UserNotificationSettingValue.WEB | ||
256 | } | 257 | } |
257 | 258 | ||
258 | return UserNotificationSettingModel.create(values, { transaction: t }) | 259 | return UserNotificationSettingModel.create(values, { transaction: t }) |
diff --git a/server/lib/video-state.ts b/server/lib/video-state.ts index 97ff540ed..f75f81704 100644 --- a/server/lib/video-state.ts +++ b/server/lib/video-state.ts | |||
@@ -16,6 +16,7 @@ function buildNextVideoState (currentState?: VideoState) { | |||
16 | } | 16 | } |
17 | 17 | ||
18 | if ( | 18 | if ( |
19 | currentState !== VideoState.TO_EDIT && | ||
19 | currentState !== VideoState.TO_TRANSCODE && | 20 | currentState !== VideoState.TO_TRANSCODE && |
20 | currentState !== VideoState.TO_MOVE_TO_EXTERNAL_STORAGE && | 21 | currentState !== VideoState.TO_MOVE_TO_EXTERNAL_STORAGE && |
21 | CONFIG.TRANSCODING.ENABLED | 22 | CONFIG.TRANSCODING.ENABLED |
@@ -33,7 +34,13 @@ function buildNextVideoState (currentState?: VideoState) { | |||
33 | return VideoState.PUBLISHED | 34 | return VideoState.PUBLISHED |
34 | } | 35 | } |
35 | 36 | ||
36 | function moveToNextState (video: MVideoUUID, isNewVideo = true) { | 37 | function moveToNextState (options: { |
38 | video: MVideoUUID | ||
39 | previousVideoState?: VideoState | ||
40 | isNewVideo?: boolean // Default true | ||
41 | }) { | ||
42 | const { video, previousVideoState, isNewVideo = true } = options | ||
43 | |||
37 | return sequelizeTypescript.transaction(async t => { | 44 | return sequelizeTypescript.transaction(async t => { |
38 | // Maybe the video changed in database, refresh it | 45 | // Maybe the video changed in database, refresh it |
39 | const videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t) | 46 | const videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t) |
@@ -48,28 +55,35 @@ function moveToNextState (video: MVideoUUID, isNewVideo = true) { | |||
48 | const newState = buildNextVideoState(videoDatabase.state) | 55 | const newState = buildNextVideoState(videoDatabase.state) |
49 | 56 | ||
50 | if (newState === VideoState.PUBLISHED) { | 57 | if (newState === VideoState.PUBLISHED) { |
51 | return moveToPublishedState(videoDatabase, isNewVideo, t) | 58 | return moveToPublishedState({ video: videoDatabase, previousVideoState, isNewVideo, transaction: t }) |
52 | } | 59 | } |
53 | 60 | ||
54 | if (newState === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { | 61 | if (newState === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) { |
55 | return moveToExternalStorageState(videoDatabase, isNewVideo, t) | 62 | return moveToExternalStorageState({ video: videoDatabase, isNewVideo, transaction: t }) |
56 | } | 63 | } |
57 | }) | 64 | }) |
58 | } | 65 | } |
59 | 66 | ||
60 | async function moveToExternalStorageState (video: MVideoFullLight, isNewVideo: boolean, transaction: Transaction) { | 67 | async function moveToExternalStorageState (options: { |
68 | video: MVideoFullLight | ||
69 | isNewVideo: boolean | ||
70 | transaction: Transaction | ||
71 | }) { | ||
72 | const { video, isNewVideo, transaction } = options | ||
73 | |||
61 | const videoJobInfo = await VideoJobInfoModel.load(video.id, transaction) | 74 | const videoJobInfo = await VideoJobInfoModel.load(video.id, transaction) |
62 | const pendingTranscode = videoJobInfo?.pendingTranscode || 0 | 75 | const pendingTranscode = videoJobInfo?.pendingTranscode || 0 |
63 | 76 | ||
64 | // We want to wait all transcoding jobs before moving the video on an external storage | 77 | // We want to wait all transcoding jobs before moving the video on an external storage |
65 | if (pendingTranscode !== 0) return false | 78 | if (pendingTranscode !== 0) return false |
66 | 79 | ||
80 | const previousVideoState = video.state | ||
67 | await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction) | 81 | await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction) |
68 | 82 | ||
69 | logger.info('Creating external storage move job for video %s.', video.uuid, { tags: [ video.uuid ] }) | 83 | logger.info('Creating external storage move job for video %s.', video.uuid, { tags: [ video.uuid ] }) |
70 | 84 | ||
71 | try { | 85 | try { |
72 | await addMoveToObjectStorageJob(video, isNewVideo) | 86 | await addMoveToObjectStorageJob({ video, previousVideoState, isNewVideo }) |
73 | 87 | ||
74 | return true | 88 | return true |
75 | } catch (err) { | 89 | } catch (err) { |
@@ -103,21 +117,33 @@ export { | |||
103 | 117 | ||
104 | // --------------------------------------------------------------------------- | 118 | // --------------------------------------------------------------------------- |
105 | 119 | ||
106 | async function moveToPublishedState (video: MVideoFullLight, isNewVideo: boolean, transaction: Transaction) { | 120 | async function moveToPublishedState (options: { |
107 | logger.info('Publishing video %s.', video.uuid, { tags: [ video.uuid ] }) | 121 | video: MVideoFullLight |
122 | isNewVideo: boolean | ||
123 | transaction: Transaction | ||
124 | previousVideoState?: VideoState | ||
125 | }) { | ||
126 | const { video, isNewVideo, transaction, previousVideoState } = options | ||
127 | const previousState = previousVideoState ?? video.state | ||
128 | |||
129 | logger.info('Publishing video %s.', video.uuid, { previousState, tags: [ video.uuid ] }) | ||
108 | 130 | ||
109 | const previousState = video.state | ||
110 | await video.setNewState(VideoState.PUBLISHED, isNewVideo, transaction) | 131 | await video.setNewState(VideoState.PUBLISHED, isNewVideo, transaction) |
111 | 132 | ||
112 | // If the video was not published, we consider it is a new one for other instances | 133 | // If the video was not published, we consider it is a new one for other instances |
113 | // Live videos are always federated, so it's not a new video | 134 | // Live videos are always federated, so it's not a new video |
114 | await federateVideoIfNeeded(video, isNewVideo, transaction) | 135 | await federateVideoIfNeeded(video, isNewVideo, transaction) |
115 | 136 | ||
116 | if (!isNewVideo) return | 137 | if (previousState === VideoState.TO_EDIT) { |
138 | Notifier.Instance.notifyOfFinishedVideoEdition(video) | ||
139 | return | ||
140 | } | ||
117 | 141 | ||
118 | Notifier.Instance.notifyOnNewVideoIfNeeded(video) | 142 | if (isNewVideo) { |
143 | Notifier.Instance.notifyOnNewVideoIfNeeded(video) | ||
119 | 144 | ||
120 | if (previousState === VideoState.TO_TRANSCODE) { | 145 | if (previousState === VideoState.TO_TRANSCODE) { |
121 | Notifier.Instance.notifyOnVideoPublishedAfterTranscoding(video) | 146 | Notifier.Instance.notifyOnVideoPublishedAfterTranscoding(video) |
147 | } | ||
122 | } | 148 | } |
123 | } | 149 | } |
diff --git a/server/lib/video.ts b/server/lib/video.ts index ec4256c1a..a98e45c60 100644 --- a/server/lib/video.ts +++ b/server/lib/video.ts | |||
@@ -6,7 +6,7 @@ import { VideoModel } from '@server/models/video/video' | |||
6 | import { VideoJobInfoModel } from '@server/models/video/video-job-info' | 6 | import { VideoJobInfoModel } from '@server/models/video/video-job-info' |
7 | import { FilteredModelAttributes } from '@server/types' | 7 | import { FilteredModelAttributes } from '@server/types' |
8 | import { MThumbnail, MUserId, MVideoFile, MVideoTag, MVideoThumbnail, MVideoUUID } from '@server/types/models' | 8 | import { MThumbnail, MUserId, MVideoFile, MVideoTag, MVideoThumbnail, MVideoUUID } from '@server/types/models' |
9 | import { ThumbnailType, VideoCreate, VideoPrivacy, VideoTranscodingPayload } from '@shared/models' | 9 | import { ThumbnailType, VideoCreate, VideoPrivacy, VideoState, VideoTranscodingPayload } from '@shared/models' |
10 | import { CreateJobOptions, JobQueue } from './job-queue/job-queue' | 10 | import { CreateJobOptions, JobQueue } from './job-queue/job-queue' |
11 | import { updateVideoMiniatureFromExisting } from './thumbnail' | 11 | import { updateVideoMiniatureFromExisting } from './thumbnail' |
12 | import { CONFIG } from '@server/initializers/config' | 12 | import { CONFIG } from '@server/initializers/config' |
@@ -67,6 +67,8 @@ async function buildVideoThumbnailsFromReq (options: { | |||
67 | return Promise.all(promises) | 67 | return Promise.all(promises) |
68 | } | 68 | } |
69 | 69 | ||
70 | // --------------------------------------------------------------------------- | ||
71 | |||
70 | async function setVideoTags (options: { | 72 | async function setVideoTags (options: { |
71 | video: MVideoTag | 73 | video: MVideoTag |
72 | tags: string[] | 74 | tags: string[] |
@@ -81,7 +83,16 @@ async function setVideoTags (options: { | |||
81 | video.Tags = tagInstances | 83 | video.Tags = tagInstances |
82 | } | 84 | } |
83 | 85 | ||
84 | async function addOptimizeOrMergeAudioJob (video: MVideoUUID, videoFile: MVideoFile, user: MUserId, isNewVideo = true) { | 86 | // --------------------------------------------------------------------------- |
87 | |||
88 | async function addOptimizeOrMergeAudioJob (options: { | ||
89 | video: MVideoUUID | ||
90 | videoFile: MVideoFile | ||
91 | user: MUserId | ||
92 | isNewVideo?: boolean // Default true | ||
93 | }) { | ||
94 | const { video, videoFile, user, isNewVideo } = options | ||
95 | |||
85 | let dataInput: VideoTranscodingPayload | 96 | let dataInput: VideoTranscodingPayload |
86 | 97 | ||
87 | if (videoFile.isAudio()) { | 98 | if (videoFile.isAudio()) { |
@@ -113,13 +124,6 @@ async function addTranscodingJob (payload: VideoTranscodingPayload, options: Cre | |||
113 | return JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: payload }, options) | 124 | return JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: payload }, options) |
114 | } | 125 | } |
115 | 126 | ||
116 | async function addMoveToObjectStorageJob (video: MVideoUUID, isNewVideo = true) { | ||
117 | await VideoJobInfoModel.increaseOrCreate(video.uuid, 'pendingMove') | ||
118 | |||
119 | const dataInput = { videoUUID: video.uuid, isNewVideo } | ||
120 | return JobQueue.Instance.createJobWithPromise({ type: 'move-to-object-storage', payload: dataInput }) | ||
121 | } | ||
122 | |||
123 | async function getTranscodingJobPriority (user: MUserId) { | 127 | async function getTranscodingJobPriority (user: MUserId) { |
124 | const now = new Date() | 128 | const now = new Date() |
125 | const lastWeek = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 7) | 129 | const lastWeek = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 7) |
@@ -131,6 +135,21 @@ async function getTranscodingJobPriority (user: MUserId) { | |||
131 | 135 | ||
132 | // --------------------------------------------------------------------------- | 136 | // --------------------------------------------------------------------------- |
133 | 137 | ||
138 | async function addMoveToObjectStorageJob (options: { | ||
139 | video: MVideoUUID | ||
140 | previousVideoState: VideoState | ||
141 | isNewVideo?: boolean // Default true | ||
142 | }) { | ||
143 | const { video, previousVideoState, isNewVideo = true } = options | ||
144 | |||
145 | await VideoJobInfoModel.increaseOrCreate(video.uuid, 'pendingMove') | ||
146 | |||
147 | const dataInput = { videoUUID: video.uuid, isNewVideo, previousVideoState } | ||
148 | return JobQueue.Instance.createJobWithPromise({ type: 'move-to-object-storage', payload: dataInput }) | ||
149 | } | ||
150 | |||
151 | // --------------------------------------------------------------------------- | ||
152 | |||
134 | export { | 153 | export { |
135 | buildLocalVideoFromReq, | 154 | buildLocalVideoFromReq, |
136 | buildVideoThumbnailsFromReq, | 155 | buildVideoThumbnailsFromReq, |