diff options
Diffstat (limited to 'server/controllers/api/video-playlist.ts')
-rw-r--r-- | server/controllers/api/video-playlist.ts | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/server/controllers/api/video-playlist.ts b/server/controllers/api/video-playlist.ts index 99325aa9d..6a1d23529 100644 --- a/server/controllers/api/video-playlist.ts +++ b/server/controllers/api/video-playlist.ts | |||
@@ -41,7 +41,7 @@ import { VideoPlaylistReorder } from '../../../shared/models/videos/playlist/vid | |||
41 | import { JobQueue } from '../../lib/job-queue' | 41 | import { JobQueue } from '../../lib/job-queue' |
42 | import { CONFIG } from '../../initializers/config' | 42 | import { CONFIG } from '../../initializers/config' |
43 | import { sequelizeTypescript } from '../../initializers/database' | 43 | import { sequelizeTypescript } from '../../initializers/database' |
44 | import { createPlaylistThumbnailFromExisting } from '../../lib/thumbnail' | 44 | import { createPlaylistMiniatureFromExisting } from '../../lib/thumbnail' |
45 | 45 | ||
46 | const reqThumbnailFile = createReqFiles([ 'thumbnailfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { thumbnailfile: CONFIG.STORAGE.TMP_DIR }) | 46 | const reqThumbnailFile = createReqFiles([ 'thumbnailfile' ], MIMETYPES.IMAGE.MIMETYPE_EXT, { thumbnailfile: CONFIG.STORAGE.TMP_DIR }) |
47 | 47 | ||
@@ -174,16 +174,13 @@ async function addVideoPlaylist (req: express.Request, res: express.Response) { | |||
174 | 174 | ||
175 | const thumbnailField = req.files['thumbnailfile'] | 175 | const thumbnailField = req.files['thumbnailfile'] |
176 | const thumbnailModel = thumbnailField | 176 | const thumbnailModel = thumbnailField |
177 | ? await createPlaylistThumbnailFromExisting(thumbnailField[0].path, videoPlaylist) | 177 | ? await createPlaylistMiniatureFromExisting(thumbnailField[0].path, videoPlaylist) |
178 | : undefined | 178 | : undefined |
179 | 179 | ||
180 | const videoPlaylistCreated: VideoPlaylistModel = await sequelizeTypescript.transaction(async t => { | 180 | const videoPlaylistCreated: VideoPlaylistModel = await sequelizeTypescript.transaction(async t => { |
181 | const videoPlaylistCreated = await videoPlaylist.save({ transaction: t }) | 181 | const videoPlaylistCreated = await videoPlaylist.save({ transaction: t }) |
182 | 182 | ||
183 | if (thumbnailModel) { | 183 | if (thumbnailModel) await videoPlaylistCreated.setAndSaveThumbnail(thumbnailModel, t) |
184 | thumbnailModel.videoPlaylistId = videoPlaylistCreated.id | ||
185 | videoPlaylistCreated.setThumbnail(await thumbnailModel.save({ transaction: t })) | ||
186 | } | ||
187 | 184 | ||
188 | // We need more attributes for the federation | 185 | // We need more attributes for the federation |
189 | videoPlaylistCreated.OwnerAccount = await AccountModel.load(user.Account.id, t) | 186 | videoPlaylistCreated.OwnerAccount = await AccountModel.load(user.Account.id, t) |
@@ -210,7 +207,7 @@ async function updateVideoPlaylist (req: express.Request, res: express.Response) | |||
210 | 207 | ||
211 | const thumbnailField = req.files['thumbnailfile'] | 208 | const thumbnailField = req.files['thumbnailfile'] |
212 | const thumbnailModel = thumbnailField | 209 | const thumbnailModel = thumbnailField |
213 | ? await createPlaylistThumbnailFromExisting(thumbnailField[0].path, videoPlaylistInstance) | 210 | ? await createPlaylistMiniatureFromExisting(thumbnailField[0].path, videoPlaylistInstance) |
214 | : undefined | 211 | : undefined |
215 | 212 | ||
216 | try { | 213 | try { |
@@ -239,10 +236,7 @@ async function updateVideoPlaylist (req: express.Request, res: express.Response) | |||
239 | 236 | ||
240 | const playlistUpdated = await videoPlaylistInstance.save(sequelizeOptions) | 237 | const playlistUpdated = await videoPlaylistInstance.save(sequelizeOptions) |
241 | 238 | ||
242 | if (thumbnailModel) { | 239 | if (thumbnailModel) await playlistUpdated.setAndSaveThumbnail(thumbnailModel, t) |
243 | thumbnailModel.videoPlaylistId = playlistUpdated.id | ||
244 | playlistUpdated.setThumbnail(await thumbnailModel.save({ transaction: t })) | ||
245 | } | ||
246 | 240 | ||
247 | const isNewPlaylist = wasPrivatePlaylist && playlistUpdated.privacy !== VideoPlaylistPrivacy.PRIVATE | 241 | const isNewPlaylist = wasPrivatePlaylist && playlistUpdated.privacy !== VideoPlaylistPrivacy.PRIVATE |
248 | 242 | ||
@@ -313,8 +307,8 @@ async function addVideoInPlaylist (req: express.Request, res: express.Response) | |||
313 | if (playlistElement.position === 1 && videoPlaylist.hasThumbnail() === false) { | 307 | if (playlistElement.position === 1 && videoPlaylist.hasThumbnail() === false) { |
314 | logger.info('Generating default thumbnail to playlist %s.', videoPlaylist.url) | 308 | logger.info('Generating default thumbnail to playlist %s.', videoPlaylist.url) |
315 | 309 | ||
316 | const inputPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnail().filename) | 310 | const inputPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getMiniature().filename) |
317 | const thumbnailModel = await createPlaylistThumbnailFromExisting(inputPath, videoPlaylist, true) | 311 | const thumbnailModel = await createPlaylistMiniatureFromExisting(inputPath, videoPlaylist, true) |
318 | 312 | ||
319 | thumbnailModel.videoPlaylistId = videoPlaylist.id | 313 | thumbnailModel.videoPlaylistId = videoPlaylist.id |
320 | 314 | ||