From b05dac674319196144c028929bb49d0a615c8cde Mon Sep 17 00:00:00 2001 From: Pascal Temel Date: Sun, 24 Sep 2017 05:54:13 +0200 Subject: [PATCH] cleanup --- controllers/albumsController.js | 2 +- controllers/uploadController.js | 4 ++-- controllers/utilsController.js | 5 +++-- routes/album.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/controllers/albumsController.js b/controllers/albumsController.js index a8dcb96..7b9cc46 100644 --- a/controllers/albumsController.js +++ b/controllers/albumsController.js @@ -155,7 +155,7 @@ albumsController.get = function(req, res, next) { file.file = basedomain + '/' + file.name let ext = path.extname(file.name).toLowerCase() - if (utils.extensions.includes(ext)) { + if (utils.imageExtensions.includes(ext) || utils.videoExtensions.includes(ext)) { file.thumb = basedomain + '/thumbs/' + file.name.slice(0, -ext.length) + '.png' utils.generateThumbs(file) } diff --git a/controllers/uploadController.js b/controllers/uploadController.js index 08f431f..3e4fdfe 100644 --- a/controllers/uploadController.js +++ b/controllers/uploadController.js @@ -187,7 +187,7 @@ uploadsController.processFilesForDisplay = function(req, res, files, existingFil for (let file of files) { let ext = path.extname(file.name).toLowerCase() - if (utils.extensions.includes(ext)) { + if (utils.imageExtensions.includes(ext) || utils.videoExtensions.includes(ext)) { file.thumb = basedomain + '/thumbs/' + file.name.slice(0, -ext.length) + '.png' utils.generateThumbs(file) } @@ -300,7 +300,7 @@ uploadsController.list = function(req, res) { userids.push(file.userid) let ext = path.extname(file.name).toLowerCase() - if (utils.extensions.includes(ext)) { + if (utils.imageExtensions.includes(ext) || utils.videoExtensions.includes(ext)) { file.thumb = basedomain + '/thumbs/' + file.name.slice(0, -ext.length) + '.png' utils.generateThumbs(file) } diff --git a/controllers/utilsController.js b/controllers/utilsController.js index 305f917..ec056ab 100644 --- a/controllers/utilsController.js +++ b/controllers/utilsController.js @@ -5,7 +5,8 @@ const gm = require('gm') const ffmpeg = require('fluent-ffmpeg') const utilsController = {} -utilsController.extensions = ['.jpg', '.jpeg', '.bmp', '.gif', '.png', '.webm', '.mp4', '.wmv', '.avi', '.mov'] +utilsController.imageExtensions = ['.jpg', '.jpeg', '.bmp', '.gif', '.png'] +utilsController.videoExtensions = ['.webm', '.mp4', '.wmv', '.avi', '.mov'] utilsController.getPrettyDate = function(date) { return date.getFullYear() + '-' @@ -26,7 +27,7 @@ utilsController.generateThumbs = function(file, basedomain) { let thumbname = path.join(__dirname, '..', config.uploads.folder, 'thumbs', file.name.slice(0, -ext.length) + '.png') fs.access(thumbname, (err) => { if (err && err.code === 'ENOENT') { - if (ext === '.webm' || ext === '.mp4' || ext === '.wmv' || ext === '.avi' || ext === '.mov') { + if (utilsController.videoExtensions.includes(ext)) { ffmpeg(path.join(__dirname, '..', config.uploads.folder, file.name)) .thumbnail({ timestamps: [0], diff --git a/routes/album.js b/routes/album.js index 2c084b4..20ccc26 100644 --- a/routes/album.js +++ b/routes/album.js @@ -28,7 +28,7 @@ routes.get('/a/:identifier', (req, res, next) => { file.file = basedomain + '/' + file.name let ext = path.extname(file.name).toLowerCase() - if (utils.extensions.includes(ext)) { + if (utils.imageExtensions.includes(ext) || utils.videoExtensions.includes(ext)) { file.thumb = basedomain + '/thumbs/' + file.name.slice(0, -ext.length) + '.png' /*