aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-05-13 20:45:53 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-05-13 20:45:53 +0200
commit57a56079fe927f99592a3defa2ba17586a6fe14c (patch)
treec35aeca04455578653a9dc276711b54bcc647c72 /server
parentbb10240ee15d31a1cc17c0e3d748dde817e7d0cb (diff)
downloadPeerTube-57a56079fe927f99592a3defa2ba17586a6fe14c.tar.gz
PeerTube-57a56079fe927f99592a3defa2ba17586a6fe14c.tar.zst
PeerTube-57a56079fe927f99592a3defa2ba17586a6fe14c.zip
getVideoThumbnail -> createVideoThumbnail
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/v1/videos.js2
-rw-r--r--server/lib/videos.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/v1/videos.js
index 5bdfdbf58..641fef6ea 100644
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/v1/videos.js
@@ -94,7 +94,7 @@ function addVideo (req, res, next) {
94 return next(err) 94 return next(err)
95 } 95 }
96 96
97 videos.getVideoThumbnail(videoFile.path, function (err, thumbnailName) { 97 videos.createVideoThumbnail(videoFile.path, function (err, thumbnailName) {
98 if (err) { 98 if (err) {
99 // TODO: unseed the video 99 // TODO: unseed the video
100 logger.error('Cannot make a thumbnail of the video file.') 100 logger.error('Cannot make a thumbnail of the video file.')
diff --git a/server/lib/videos.js b/server/lib/videos.js
index 7da4b11d2..154c31ef9 100644
--- a/server/lib/videos.js
+++ b/server/lib/videos.js
@@ -20,7 +20,7 @@ const videos = {
20 createRemoteVideos: createRemoteVideos, 20 createRemoteVideos: createRemoteVideos,
21 getVideoDuration: getVideoDuration, 21 getVideoDuration: getVideoDuration,
22 getVideoState: getVideoState, 22 getVideoState: getVideoState,
23 getVideoThumbnail: getVideoThumbnail, 23 createVideoThumbnail: createVideoThumbnail,
24 removeVideosDataFromDisk: removeVideosDataFromDisk, 24 removeVideosDataFromDisk: removeVideosDataFromDisk,
25 removeRemoteVideos: removeRemoteVideos, 25 removeRemoteVideos: removeRemoteVideos,
26 seed: seed, 26 seed: seed,
@@ -54,7 +54,7 @@ function getVideoState (video) {
54 return { exist: exist, owned: owned } 54 return { exist: exist, owned: owned }
55} 55}
56 56
57function getVideoThumbnail (videoPath, callback) { 57function createVideoThumbnail (videoPath, callback) {
58 const filename = pathUtils.basename(videoPath) + '.jpg' 58 const filename = pathUtils.basename(videoPath) + '.jpg'
59 ffmpeg(videoPath) 59 ffmpeg(videoPath)
60 .on('error', callback) 60 .on('error', callback)