From 1db1b06a48ce3775596a994a9f1360108814bf0d Mon Sep 17 00:00:00 2001 From: Pitu Date: Fri, 17 Mar 2017 01:14:24 -0300 Subject: Refactor --- controllers/albumsController.js | 176 +++++++++++++++------------------------- 1 file changed, 64 insertions(+), 112 deletions(-) (limited to 'controllers/albumsController.js') diff --git a/controllers/albumsController.js b/controllers/albumsController.js index ca725de..452bd43 100644 --- a/controllers/albumsController.js +++ b/controllers/albumsController.js @@ -1,42 +1,39 @@ const config = require('../config.js') const db = require('knex')(config.database) const randomstring = require('randomstring') -const path = require('path') -const fs = require('fs') -const ffmpeg = require('fluent-ffmpeg') -const gm = require('gm') +const utils = require('utilsController.js') let albumsController = {} -albumsController.list = function(req, res, next){ - +albumsController.list = function(req, res, next) { + let token = req.headers.token - if(token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) + if (token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) db.table('users').where('token', token).then((user) => { - if(user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token'}) + if (user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token' }) let fields = ['id', 'name'] - if(req.params.sidebar === undefined){ + if (req.params.sidebar === undefined) { fields.push('timestamp') fields.push('identifier') } - - db.table('albums').select(fields).where({enabled: 1, userid: user[0].id}).then((albums) => { - - if(req.params.sidebar !== undefined) + + db.table('albums').select(fields).where({ enabled: 1, userid: user[0].id }).then((albums) => { + + if (req.params.sidebar !== undefined) return res.json({ success: true, albums }) let ids = [] - for(let album of albums){ + for (let album of albums) { album.date = new Date(album.timestamp * 1000) - album.date = album.date.getFullYear() + '-' + (album.date.getMonth() + 1) + '-' + album.date.getDate() + ' ' + (album.date.getHours() < 10 ? '0' : '') + album.date.getHours() + ':' + (album.date.getMinutes() < 10 ? '0' : '') + album.date.getMinutes() + ':' + (album.date.getSeconds() < 10 ? '0' : '') + album.date.getSeconds() + album.date = utils.getPrettyDate(album.date) // album.date.getFullYear() + '-' + (album.date.getMonth() + 1) + '-' + album.date.getDate() + ' ' + (album.date.getHours() < 10 ? '0' : '') + album.date.getHours() + ':' + (album.date.getMinutes() < 10 ? '0' : '') + album.date.getMinutes() + ':' + (album.date.getSeconds() < 10 ? '0' : '') + album.date.getSeconds() let basedomain = req.get('host') - for(let domain of config.domains) - if(domain.host === req.get('host')) - if(domain.hasOwnProperty('resolve')) + for (let domain of config.domains) + if (domain.host === req.get('host')) + if (domain.hasOwnProperty('resolve')) basedomain = domain.resolve album.identifier = basedomain + '/a/' + album.identifier @@ -47,36 +44,36 @@ albumsController.list = function(req, res, next){ db.table('files').whereIn('albumid', ids).select('albumid').then((files) => { let albumsCount = {} - - for(let id of ids) albumsCount[id] = 0 - for(let file of files) albumsCount[file.albumid] += 1 - for(let album of albums) album.files = albumsCount[album.id] + + for (let id of ids) albumsCount[id] = 0 + for (let file of files) albumsCount[file.albumid] += 1 + for (let album of albums) album.files = albumsCount[album.id] return res.json({ success: true, albums }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) } -albumsController.create = function(req, res, next){ - +albumsController.create = function(req, res, next) { + let token = req.headers.token - if(token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) + if (token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) db.table('users').where('token', token).then((user) => { - if(user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token'}) + if (user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token' }) let name = req.body.name - if(name === undefined || name === '') - return res.json({ success: false, description: 'No album name specified' }) + if (name === undefined || name === '') + return res.json({ success: false, description: 'No album name specified' }) db.table('albums').where({ name: name, enabled: 1, userid: user[0].id }).then((album) => { - if(album.length !== 0) return res.json({ success: false, description: 'There\'s already an album with that name' }) + if (album.length !== 0) return res.json({ success: false, description: 'There\'s already an album with that name' }) db.table('albums').insert({ name: name, @@ -85,122 +82,78 @@ albumsController.create = function(req, res, next){ identifier: randomstring.generate(8), timestamp: Math.floor(Date.now() / 1000) }).then(() => { - return res.json({ success: true }) + return res.json({ success: true }) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) } -albumsController.delete = function(req, res, next){ +albumsController.delete = function(req, res, next) { let token = req.headers.token - if(token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) + if (token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) db.table('users').where('token', token).then((user) => { - if(user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token'}) + if (user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token'}) let id = req.body.id - if(id === undefined || id === '') + if (id === undefined || id === ''){ return res.json({ success: false, description: 'No album specified' }) + } - db.table('albums').where({id: id, userid: user[0].id}).update({ enabled: 0 }).then(() => { - return res.json({ success: true }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) + db.table('albums').where({ id: id, userid: user[0].id }).update({ enabled: 0 }).then(() => { + return res.json({ success: true }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) } -albumsController.rename = function(req, res, next){ +albumsController.rename = function(req, res, next) { let token = req.headers.token - if(token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) + if (token === undefined) return res.status(401).json({ success: false, description: 'No token provided' }) db.table('users').where('token', token).then((user) => { - if(user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token'}) + if (user.length === 0) return res.status(401).json({ success: false, description: 'Invalid token'}) let id = req.body.id - if(id === undefined || id === '') + if (id === undefined || id === '') return res.json({ success: false, description: 'No album specified' }) let name = req.body.name - if(name === undefined || name === '') + if (name === undefined || name === '') return res.json({ success: false, description: 'No name specified' }) - db.table('albums').where({name: name, userid: user[0].id}).then((results) => { - if(results.length !== 0) return res.json({ success: false, description: 'Name already in use' }) + db.table('albums').where({ name: name, userid: user[0].id }).then((results) => { + if (results.length !== 0) return res.json({ success: false, description: 'Name already in use' }) - db.table('albums').where({id: id, userid: user[0].id}).update({ name: name }).then(() => { - return res.json({ success: true }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) + db.table('albums').where({ id: id, userid: user[0].id }).update({ name: name }).then(() => { + return res.json({ success: true }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) } -albumsController.get = function(req, res, next){ +albumsController.get = function(req, res, next) { let identifier = req.params.identifier - if(identifier === undefined) return res.status(401).json({ success: false, description: 'No identifier provided' }) + if (identifier === undefined) return res.status(401).json({ success: false, description: 'No identifier provided' }) db.table('albums') .where('identifier', identifier) .then((albums) => { - if(albums.length === 0) return res.json({ success: false, description: 'Album not found' }) + if (albums.length === 0) return res.json({ success: false, description: 'Album not found' }) let title = albums[0].name db.table('files').select('name').where('albumid', albums[0].id).orderBy('id', 'DESC').then((files) => { let basedomain = req.get('host') - for(let domain of config.domains) - if(domain.host === req.get('host')) - if(domain.hasOwnProperty('resolve')) + for (let domain of config.domains) + if (domain.host === req.get('host')) + if (domain.hasOwnProperty('resolve')) basedomain = domain.resolve - for(let file of files){ + for (let file of files) { file.file = basedomain + '/' + file.name - - if(config.uploads.generateThumbnails === true){ - - let extensions = ['.jpg', '.jpeg', '.bmp', '.gif', '.png', '.webm', '.mp4'] - for(let ext of extensions){ - if(path.extname(file.name) === ext){ - - file.thumb = basedomain + '/thumbs/' + file.name.slice(0, -ext.length) + '.png' - - let thumbname = path.join(__dirname, '..', config.uploads.folder, 'thumbs') + '/' + file.name.slice(0, -ext.length) + '.png' - fs.access(thumbname, function(err) { - if (err && err.code === 'ENOENT') { - // File doesnt exist - - if (ext === '.webm' || ext === '.mp4') { - ffmpeg('./' + config.uploads.folder + '/' + file.name) - .thumbnail({ - timestamps: [0], - filename: '%b.png', - folder: './' + config.uploads.folder + '/thumbs', - size: '200x?' - }) - .on('error', function(error) { - console.log('Error - ', error.message) - }) - } - else { - let size = { - width: 200, - height: 200 - } - - gm('./' + config.uploads.folder + '/' + file.name) - .resize(size.width, size.height + '>') - .gravity('Center') - .extent(size.width, size.height) - .background('transparent') - .write(thumbname, function (error) { - if (error) console.log('Error - ', error) - }) - } - } - }) - } - } - } + utils.generateThumbs(file) } return res.json({ @@ -210,9 +163,8 @@ albumsController.get = function(req, res, next){ files }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - }).catch(function(error) { console.log(error); res.json({success: false, description: 'error'}) }) - + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) + }).catch(function(error) { console.log(error); res.json({ success: false, description: 'error' }) }) } -module.exports = albumsController \ No newline at end of file +module.exports = albumsController -- cgit v1.2.3