Merge remote-tracking branch 'upstream/master'

Author: ajkirwin

config.sample.json

@@ -5,6 +5,7 @@
 		"userMaxAge": "3 months"
 	},
 	"maximumFormSize": "1 MiB",
+	"maximumThumbnailSize": "4 MiB",
 	"password": {
 		"bcryptRounds": 12
 	},

controllers/submissions.js

@@ -1,17 +1,43 @@
 'use strict';
 
 var Promise = require('promise');
+var util = require('util');
 var querystring = require('querystring');
 var formSession = require('../lib/form-session');
 var Redirect = require('../lib/respond').Redirect;
 var view = require('../lib/view').view;
+var unit = require('../lib/unit');
+var slug = require('../lib/slug');
 var notifications = require('../models/notifications');
 var users = require('../models/users');
 var media = require('../models/media');
 var tags = require('../models/tags');
+var submissions = require('../models/submissions');
+var config = require('../config');
+
+var maximumThumbnailSize = unit.ByteSize.parse(config.maximumThumbnailSize).bytes;
+
+function toInteger(obj) {
+	return obj | 0;
+}
+
+function validId(n) {
+	return n > 0;
+}
 
 var uploadForm = view('submissions/upload', [users.ensure('submit'), media.listForRequester, notifications.counts]);
-var createForm = view('submissions/edit', [users.ensure('submit'), tags.mostCommonTagsForRequester, notifications.counts]);
+var createForm_ = view('submissions/edit', [users.ensure('submit'), tags.mostCommonTagsForRequester, notifications.counts]);
+
+function createForm(request) {
+	var submit = request.query.submit;
+	var submitMedia = Array.isArray(submit) ? submit.map(toInteger) : [submit | 0];
+
+	if (!submitMedia.every(validId)) {
+		return Promise.resolve(new Redirect('/submissions/new'));
+	}
+
+	return createForm_.with({ media: submitMedia })(request);
+}
 
 function upload(request) {
 	return request.user.ensure('submit')
@@ -66,6 +92,113 @@ function upload(request) {
 		);
 }
 
+function create(request) {
+	return request.user.ensure('submit').then(
+		function () {
+			return formSession.formFiles(request).then(function (form) {
+				return new Promise(function (resolve) {
+					var thumbnail = null;
+
+					form.on('file', function (name, file) {
+						var stream = file.stream;
+
+						if (name === 'thumbnail') {
+							var parts = [];
+							var totalLength = 0;
+
+							stream.on('data', function addPart(part) {
+								totalLength += part.length;
+
+								if (totalLength >= maximumThumbnailSize) {
+									totalLength = 0;
+									parts = null;
+									stream.removeListener('data', addPart);
+									return;
+								}
+
+								parts.push(part);
+							});
+
+							stream.on('end', function () {
+								if (totalLength) {
+									var data = Buffer.concat(parts, totalLength);
+
+									thumbnail = media.autoThumbnail(data);
+								}
+							});
+
+							return;
+						}
+
+						stream.resume();
+					});
+
+					form.on('finish', function () {
+						var submit = form.fields.media;
+						var submitMedia = Array.isArray(submit) ? submit.map(toInteger) : [submit | 0];
+
+						if (!submitMedia.every(validId)) {
+							resolve(new Redirect('/submissions/new'));
+							return;
+						}
+
+						if (thumbnail) {
+							thumbnail = thumbnail.then(function (thumbnailData) {
+								return media.createUploadStream().then(function (thumbnailStream) {
+									thumbnailStream.end(thumbnailData);
+
+									return thumbnailStream.uploaded;
+								});
+							});
+						} else {
+							thumbnail = Promise.resolve(null);
+						}
+
+						resolve(Promise.all(submitMedia.map(function (mediaId) {
+							return media.owns(request.user, mediaId);
+						})).then(function (ownsMedia) {
+							if (!ownsMedia.every(Boolean)) {
+								return Promise.reject(new Error('A specified media entry does not exist or is not available to the user.'));
+							}
+
+							return thumbnail.then(function (thumbnailId) {
+								return submissions.create({
+									owner: request.user.id,
+									thumbnail: thumbnailId,
+									title: form.fields.title,
+									description: form.fields.description,
+									rating: form.fields.rating,
+									tags: form.fields.tags
+								}).then(function (submissionId) {
+									return Promise.all(submitMedia.map(function (mediaId) {
+										return media.associateWithSubmission(mediaId, submissionId);
+									})).then(function () {
+										return new Redirect(util.format('/submissions/%d/%s', submissionId, slug.slugFor(form.fields.title)));
+									});
+								});
+							});
+						}));
+					});
+				});
+			});
+		},
+		function () {
+			return formSession.formFiles(request).then(function (form) {
+				return new Promise(function (resolve) {
+					form.on('file', function (file) {
+						file.stream.resume();
+					});
+
+					form.on('finish', function () {
+						resolve(new Redirect('/login?return_to=/submissions/new%3Fsubmit%3D' + encodeURIComponent(form.fields.user_media)));
+					});
+				});
+			});
+		}
+	);
+}
+
 exports.uploadForm = uploadForm;
 exports.createForm = createForm;
 exports.upload = upload;
+exports.create = create;

lib/db.js

@@ -33,5 +33,33 @@ function query() {
 	});
 }
 
+function useClient() {
+	return new Promise(function (resolve, reject) {
+		pg.connect(connectionString, function (error, client, done) {
+			if (error) {
+				reject(error);
+				return;
+			}
+
+			resolve({
+				query: function query(queryString, parameters) {
+					return new Promise(function (resolve, reject) {
+						client.query(queryString, parameters, function (error, result) {
+							if (error) {
+								reject(error);
+								return;
+							}
+
+							resolve(result);
+						});
+					});
+				},
+				done: done
+			});
+		});
+	});
+}
+
 exports.query = query;
+exports.useClient = useClient;
 exports.pg = pg;

lib/slug.js

@@ -0,0 +1,12 @@
+'use strict';
+
+var unorm = require('unorm');
+
+var AMPERSAND = /&/g;
+var SLUG_PART = /[a-z0-9]+/g;
+
+function slugFor(text) {
+	return unorm.nfd(text.toLowerCase().replace(AMPERSAND, ' and ')).match(SLUG_PART).join('-');
+}
+
+exports.slugFor = slugFor;

migrations/current

@@ -1 +1 @@
-portfolios
+submission-thumbnails

migrations/submission-media.js

@@ -0,0 +1,20 @@
+'use strict';
+
+var Promise = require('promise');
+
+exports.base = 'portfolios';
+
+exports.up = function (query) {
+	return Promise.resolve()
+		.then(query(
+			"CREATE TABLE submission_media (\
+				submission INTEGER NOT NULL REFERENCES submissions (id),\
+				media INTEGER NOT NULL REFERENCES media (id)\
+			)"
+		));
+};
+
+exports.down = function (query) {
+	return Promise.resolve()
+		.then(query("DROP TABLE submission_media"));
+};

migrations/submission-thumbnails.js

@@ -0,0 +1,17 @@
+'use strict';
+
+var Promise = require('promise');
+
+exports.base = 'submission-media';
+
+exports.up = function (query) {
+	return Promise.resolve()
+		.then(query(
+			"ALTER TABLE submissions ADD thumbnail INTEGER REFERENCES media (id)"
+		));
+};
+
+exports.down = function (query) {
+	return Promise.resolve()
+		.then(query("ALTER TABLE submissions DROP thumbnail"));
+};

models/media.js

@@ -5,6 +5,7 @@ var crypto = require('crypto');
 var stream = require('stream');
 var fs = require('fs');
 var path = require('path');
+var sharp = require('sharp');
 var db = require('../lib/db');
 var config = require('../config');
 
@@ -17,6 +18,14 @@ function const_(obj) {
 	};
 }
 
+function autoThumbnail(imageBuffer) {
+	return sharp(imageBuffer).resize(300, 300).max().png();
+}
+
+function associateWithSubmission(mediaId, submissionId) {
+	return db.query('INSERT INTO submission_media (media, submission) VALUES ($1, $2)', [mediaId, submissionId]);
+}
+
 function createUploadStream() {
 	return new Promise(function (resolve, reject) {
 		crypto.randomBytes(15, function (error, bytes) {
@@ -89,6 +98,15 @@ function associate(user, mediaId, filename) {
 		.then(mediaId_, mediaId_);
 }
 
+function owns(user, mediaId) {
+	return db.query(
+		'SELECT COUNT(*)::int AS count FROM user_media WHERE user_media.owner = $1 AND user_media.media = $2',
+		[user.id, mediaId]
+	).then(function (result) {
+		return result.rows[0].count === 1;
+	});
+}
+
 function listFor(user) {
 	return db.query(
 		'SELECT media.id, media.hash, media.type, media.file_size, media.width, media.height, user_media.media, user_media.name FROM media INNER JOIN user_media ON media.id = user_media.media WHERE user_media.owner = $1',
@@ -108,7 +126,10 @@ function listForRequester(request) {
 	});
 }
 
+exports.autoThumbnail = autoThumbnail;
 exports.createUploadStream = createUploadStream;
 exports.associate = associate;
+exports.associateWithSubmission = associateWithSubmission;
+exports.owns = owns;
 exports.listFor = listFor;
 exports.listForRequester = listForRequester;