diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-10 14:48:08 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:51 +0100 |
| commit | 38fa2065831b5f55be0d7f30f19a62c967397208 (patch) | |
| tree | 4a986465e3a88c85bc6a8b5fc992e0f2edd63ef0 /server/lib/jobs | |
| parent | 0d0e8dd0904b380b70e19ebcb4763d65601c4632 (diff) | |
| download | PeerTube-38fa2065831b5f55be0d7f30f19a62c967397208.tar.gz PeerTube-38fa2065831b5f55be0d7f30f19a62c967397208.tar.zst PeerTube-38fa2065831b5f55be0d7f30f19a62c967397208.zip | |
Remove references to author
Diffstat (limited to 'server/lib/jobs')
| -rw-r--r-- | server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts | 4 | ||||
| -rw-r--r-- | server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts index ccded4721..f019c28bc 100644 --- a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts +++ b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts | |||
| @@ -7,7 +7,7 @@ import { addVideoToFriends } from '../../friends' | |||
| 7 | import { JobScheduler } from '../job-scheduler' | 7 | import { JobScheduler } from '../job-scheduler' |
| 8 | 8 | ||
| 9 | async function process (data: { videoUUID: string }, jobId: number) { | 9 | async function process (data: { videoUUID: string }, jobId: number) { |
| 10 | const video = await db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(data.videoUUID) | 10 | const video = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(data.videoUUID) |
| 11 | // No video, maybe deleted? | 11 | // No video, maybe deleted? |
| 12 | if (!video) { | 12 | if (!video) { |
| 13 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) | 13 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) |
| @@ -30,7 +30,7 @@ async function onSuccess (jobId: number, video: VideoInstance) { | |||
| 30 | logger.info('Job %d is a success.', jobId) | 30 | logger.info('Job %d is a success.', jobId) |
| 31 | 31 | ||
| 32 | // Maybe the video changed in database, refresh it | 32 | // Maybe the video changed in database, refresh it |
| 33 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(video.uuid) | 33 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(video.uuid) |
| 34 | // Video does not exist anymore | 34 | // Video does not exist anymore |
| 35 | if (!videoDatabase) return undefined | 35 | if (!videoDatabase) return undefined |
| 36 | 36 | ||
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts index 853645510..397b95795 100644 --- a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts +++ b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts | |||
| @@ -5,7 +5,7 @@ import { VideoInstance } from '../../../models' | |||
| 5 | import { VideoResolution } from '../../../../shared' | 5 | import { VideoResolution } from '../../../../shared' |
| 6 | 6 | ||
| 7 | async function process (data: { videoUUID: string, resolution: VideoResolution }, jobId: number) { | 7 | async function process (data: { videoUUID: string, resolution: VideoResolution }, jobId: number) { |
| 8 | const video = await db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(data.videoUUID) | 8 | const video = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(data.videoUUID) |
| 9 | // No video, maybe deleted? | 9 | // No video, maybe deleted? |
| 10 | if (!video) { | 10 | if (!video) { |
| 11 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) | 11 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) |
| @@ -28,7 +28,7 @@ async function onSuccess (jobId: number, video: VideoInstance) { | |||
| 28 | logger.info('Job %d is a success.', jobId) | 28 | logger.info('Job %d is a success.', jobId) |
| 29 | 29 | ||
| 30 | // Maybe the video changed in database, refresh it | 30 | // Maybe the video changed in database, refresh it |
| 31 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(video.uuid) | 31 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(video.uuid) |
| 32 | // Video does not exist anymore | 32 | // Video does not exist anymore |
| 33 | if (!videoDatabase) return undefined | 33 | if (!videoDatabase) return undefined |
| 34 | 34 | ||