alchemy-media 0.5.1 → 0.6.1

package/lib/media_types/image_media_type.js

@@ -35,7 +35,7 @@ ImageMedia.setProperty('typeMap', {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.4.1
+ * @version  0.6.0
  *
  * @param    {Conduit}   conduit
  * @param    {Object}    record
@@ -49,6 +49,13 @@ ImageMedia.setMethod(function thumbnail(conduit, record) {
 		return conduit.notFound('Image could not be found');
 	}
 
+	if (record.MediaRaw && record.MediaRaw.mimetype == 'image/svg') {
+		return conduit.serveFile(record.path, {
+			mimetype    : 'image/svg+xml',
+			disposition : false
+		});
+	}
+
 	dimension = 100 * this.getDpr(conduit);
 	options   = {};
 
@@ -77,20 +84,31 @@ ImageMedia.setMethod(function thumbnail(conduit, record) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.5.0
+ * @version  0.6.1
  *
  * @param    {Conduit}   conduit
  * @param    {Object}    record
  */
 ImageMedia.setMethod(function serve(conduit, record, options) {
 
-	var that = this,
-	    query = conduit.url.query,
+	const that = this;
+
+	if (!record) {
+		return onError('Empty file record', 404);
+	}
+
+	if (record.MediaRaw && record.MediaRaw.mimetype == 'image/svg') {
+		return conduit.serveFile(record.path, {
+			mimetype    : 'image/svg+xml',
+			disposition : false
+		});
+	}
+
+	let query = conduit.url.query,
 	    dpr = this.getDpr(conduit),
 	    path,
 	    width,
 	    height,
-	    onError,
 	    baseWidth,
 	    resolution,
 	    baseHeight,
@@ -100,7 +118,7 @@ ImageMedia.setMethod(function serve(conduit, record, options) {
 		options = {};
 	}
 
-	onError = function onError(message, status) {
+	function onError(message, status) {
 
 		if (!status) {
 			status = 404;
@@ -209,8 +227,7 @@ ImageMedia.setMethod(function serve(conduit, record, options) {
 
 	if (resizeOptions) {
 
-		// @todo: make it possible to disable webp
-		if (this.supportsWebp(conduit)) {
+		if (this.supportsWebp(conduit) && alchemy.plugins.media.cwebp) {
 			resizeOptions.type = 'webp';
 		}
 
@@ -373,6 +390,10 @@ ImageMedia.setMethod(function getSize(conduit, filePath, options, callback) {
 
 	tempPath = PATH_TEMP + '/' + alchemy.ObjectId() + '.webp';
 
+	if (!alchemy.plugins.media.cwebp) {
+		return callback(new Error('Unable to get size: cwebp not found'));
+	}
+
 	child.exec(alchemy.plugins.media.cwebp + ' ' + [resizeOptions, '-q 80', filePath, '-o', tempPath].join(' '), function(err, out) {
 
 		if (err) {
@@ -392,12 +413,16 @@ ImageMedia.setMethod(function getSize(conduit, filePath, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  0.2.0
+ * @version  0.6.0
  */
 ImageMedia.setMethod(function normalize(filePath, baseInfo, callback) {
 
 	var that = this;
 
+	if (baseInfo && baseInfo.mimetype == 'image/svg') {
+		return callback(null, filePath);
+	}
+
 	this.getImageInfo(filePath, function gotFileInfo(err, info, extra) {
 
 		if (err) {

package/model/media_file_model.js

@@ -24,13 +24,17 @@ MediaFile.setProperty('types', alchemy.shared('Media.types'));
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  0.5.0
+ * @version  0.5.1
  */
 MediaFile.constitute(function addFields() {
 
 	this.addField('name', 'String');
 	this.addField('filename', 'String');
-	this.addField('type', 'Enum');
+
+	this.addField('type', 'Enum', {
+		values: alchemy.getClassGroup('media_type')
+	});
+
 	this.addField('extra', 'Object');
 
 	let options = {};
@@ -50,7 +54,7 @@ MediaFile.constitute(function addFields() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.5.1
  */
 MediaFile.constitute(function chimeraConfig() {
 
@@ -77,6 +81,8 @@ MediaFile.constitute(function chimeraConfig() {
 	edit.addField('name');
 	edit.addField('filename');
 	edit.addField('type');
+	edit.addField('title');
+	edit.addField('alt');
 
 	// Get the galery group
 	gallery = this.chimera.getActionFields('gallery');