diff options
author | Chocobozzz <me@florianbigard.com> | 2021-02-16 08:50:40 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2021-02-16 10:36:44 +0100 |
commit | a35a22797c99f17924347da9a226068c3dbe4787 (patch) | |
tree | affb713929145f90f6bda8828ded3ac2f4f73b19 /server/controllers/api/video-playlist.ts | |
parent | 6302d599cdf98b5a5363a2a1dcdc266447950191 (diff) | |
download | PeerTube-a35a22797c99f17924347da9a226068c3dbe4787.tar.gz PeerTube-a35a22797c99f17924347da9a226068c3dbe4787.tar.zst PeerTube-a35a22797c99f17924347da9a226068c3dbe4787.zip |
Remove previous thumbnail if needed
Diffstat (limited to 'server/controllers/api/video-playlist.ts')
-rw-r--r-- | server/controllers/api/video-playlist.ts | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/server/controllers/api/video-playlist.ts b/server/controllers/api/video-playlist.ts index f3dc8b2a9..aab16533d 100644 --- a/server/controllers/api/video-playlist.ts +++ b/server/controllers/api/video-playlist.ts | |||
@@ -173,7 +173,11 @@ async function addVideoPlaylist (req: express.Request, res: express.Response) { | |||
173 | 173 | ||
174 | const thumbnailField = req.files['thumbnailfile'] | 174 | const thumbnailField = req.files['thumbnailfile'] |
175 | const thumbnailModel = thumbnailField | 175 | const thumbnailModel = thumbnailField |
176 | ? await createPlaylistMiniatureFromExisting(thumbnailField[0].path, videoPlaylist, false) | 176 | ? await createPlaylistMiniatureFromExisting({ |
177 | inputPath: thumbnailField[0].path, | ||
178 | playlist: videoPlaylist, | ||
179 | automaticallyGenerated: false | ||
180 | }) | ||
177 | : undefined | 181 | : undefined |
178 | 182 | ||
179 | const videoPlaylistCreated = await sequelizeTypescript.transaction(async t => { | 183 | const videoPlaylistCreated = await sequelizeTypescript.transaction(async t => { |
@@ -211,7 +215,11 @@ async function updateVideoPlaylist (req: express.Request, res: express.Response) | |||
211 | 215 | ||
212 | const thumbnailField = req.files['thumbnailfile'] | 216 | const thumbnailField = req.files['thumbnailfile'] |
213 | const thumbnailModel = thumbnailField | 217 | const thumbnailModel = thumbnailField |
214 | ? await createPlaylistMiniatureFromExisting(thumbnailField[0].path, videoPlaylistInstance, false) | 218 | ? await createPlaylistMiniatureFromExisting({ |
219 | inputPath: thumbnailField[0].path, | ||
220 | playlist: videoPlaylistInstance, | ||
221 | automaticallyGenerated: false | ||
222 | }) | ||
215 | : undefined | 223 | : undefined |
216 | 224 | ||
217 | try { | 225 | try { |
@@ -474,7 +482,12 @@ async function generateThumbnailForPlaylist (videoPlaylist: MVideoPlaylistThumbn | |||
474 | } | 482 | } |
475 | 483 | ||
476 | const inputPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, videoMiniature.filename) | 484 | const inputPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, videoMiniature.filename) |
477 | const thumbnailModel = await createPlaylistMiniatureFromExisting(inputPath, videoPlaylist, true, true) | 485 | const thumbnailModel = await createPlaylistMiniatureFromExisting({ |
486 | inputPath, | ||
487 | playlist: videoPlaylist, | ||
488 | automaticallyGenerated: true, | ||
489 | keepOriginal: true | ||
490 | }) | ||
478 | 491 | ||
479 | thumbnailModel.videoPlaylistId = videoPlaylist.id | 492 | thumbnailModel.videoPlaylistId = videoPlaylist.id |
480 | 493 | ||