Merge pull request #53 from PascalTemel/improvement/AdditionalFileExtensions

Improvement: add .wmv, .avi and .mov thumbnail support

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)
 				}

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)
 					}

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']
+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') {
+			if (utilsController.videoExtensions.includes(ext)) {
 				ffmpeg(path.join(__dirname, '..', config.uploads.folder, file.name))
 					.thumbnail({
 						timestamps: [0],

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'
 
 					/*