diff --git a/controllers/albumsController.js b/controllers/albumsController.js
index 79e3ab8..238275d 100644
--- a/controllers/albumsController.js
+++ b/controllers/albumsController.js
@@ -1,5 +1,10 @@
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')
let albumsController = {}
@@ -67,6 +72,7 @@ albumsController.create = function(req, res, next){
name: name,
enabled: 1,
userid: user[0].id,
+ identifier: randomstring.generate(8),
timestamp: Math.floor(Date.now() / 1000)
}).then(() => {
return res.json({ success: true })
@@ -74,7 +80,6 @@ albumsController.create = function(req, res, next){
}).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){
@@ -120,4 +125,83 @@ albumsController.rename = 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' })
+
+ db.table('albums')
+ .where('identifier', identifier)
+ .then((albums) => {
+ 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'))
+ basedomain = domain.resolve
+
+ 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)
+ })
+ }
+ }
+ })
+ }
+ }
+ }
+ }
+
+ return res.json({
+ success: true,
+ title: title,
+ 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'}) })
+
+}
+
module.exports = albumsController
\ No newline at end of file
diff --git a/database/db.js b/database/db.js
index 12638fa..f1ec75a 100644
--- a/database/db.js
+++ b/database/db.js
@@ -5,6 +5,7 @@ let init = function(db){
table.increments()
table.integer('userid')
table.string('name')
+ table.string('identifier')
table.integer('enabled')
table.integer('timestamp')
}).then(() => {})
diff --git a/lolisafe.js b/lolisafe.js
index dc749ee..34a1a35 100644
--- a/lolisafe.js
+++ b/lolisafe.js
@@ -26,6 +26,7 @@ safe.use(bodyParser.json())
safe.use('/', express.static('./uploads'))
safe.use('/', express.static('./public'))
safe.use('/api', api)
+safe.get('/a/:identifier', (req, res, next) => res.sendFile('album.html', {root: './pages/'}))
for(let page of config.pages){
let root = './pages/'
diff --git a/pages/album.html b/pages/album.html
new file mode 100644
index 0000000..a04bcd9
--- /dev/null
+++ b/pages/album.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ lolisafe - A small safe worth protecting.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/js/album.js b/public/js/album.js
new file mode 100644
index 0000000..8a69d94
--- /dev/null
+++ b/public/js/album.js
@@ -0,0 +1,33 @@
+var album = {};
+
+album.get = function(album){
+ axios.get('/api/album/get/' + album)
+ .then(function (response) {
+ document.getElementById('title').innerHTML = response.data.title;
+
+ var container = document.createElement('div');
+ container.innerHTML = ``
+ document.getElementById('container').appendChild(container);
+
+ var table = document.getElementById('table');
+ for(var item of response.data.files){
+ var div = document.createElement('div');
+ div.className = "column is-2";
+ if(item.thumb !== undefined)
+ div.innerHTML = `
`;
+ else
+ div.innerHTML = `.${item.file.split('.').pop()}
`;
+ table.appendChild(div);
+ }
+ })
+ .catch(function (error) {
+ return swal("An error ocurred", 'There was an error with the request, please check the console for more information.', "error");
+ console.log(error);
+ });
+}
+
+window.onload = function () {
+ var identifier = document.location.pathname;
+ identifier = identifier.substring(3, identifier.length);
+ album.get(identifier);
+};
\ No newline at end of file
diff --git a/routes/api.js b/routes/api.js
index 5aa10ea..b3ff798 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -22,6 +22,7 @@ routes.post ('/upload', (req, res, next) => uploadController.upload(req, res, ne
routes.post ('/upload/delete', (req, res, next) => uploadController.delete(req, res, next))
routes.post ('/upload/:albumid', (req, res, next) => uploadController.upload(req, res, next))
+routes.get ('/album/get/:identifier', (req, res, next) => albumsController.get(req, res, next))
routes.get ('/album/:id', (req, res, next) => uploadController.list(req, res, next))
routes.get ('/album/:id/:page', (req, res, next) => uploadController.list(req, res, next))