alchemy-media 0.9.0-alpha.4 → 0.9.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.9.0 (2026-01-21)
+
+* Update to veronica v0.3.0
+* Requires Node.js >= 18.17.0
+* Remove direct `sharp` dependency - all image processing now goes through veronica
+* Remove `cwebp` binary requirement - veronica/sharp has native WebP support
+* Remove `scratch_path` setting - veronica now uses single cache directory
+
+## 0.9.0-alpha.5 (2025-07-10)
+
+* Add `size` to the media file chooser
+* Allow using filters in the table
+* Limit the height of the media file chooser
+
 ## 0.9.0-alpha.4 (2024-10-10)
 
 * Make `MediaRaw#addFile(url)` support data uris too

package/README.md

@@ -34,15 +34,9 @@ var options = {
 	// The location of the exiv2 binary
 	exiv2: '/usr/bin/exiv2',
 
-	// The location of cwebp
-	cwebp: '/usr/bin/cwebp',
-
 	// Enable webp
 	webp: true,
 
-	// Temporary map for intermediate file changes
-	scratch: path.resolve(PATH_TEMP, 'scratch'),
-
 	// The cache map for resized images & thumbnails
 	cache: path.resolve(PATH_TEMP, 'imagecache')
 };
@@ -70,21 +64,21 @@ The supplied width percentage isn't relative to the image itself, but to the use
 
 ## System dependencies
 
-You will have to install certain packages on your system,
-you can do so like this on Debian/Ubuntu
+This plugin uses `sharp` for image processing, which comes with pre-built binaries for all major platforms (no system packages needed).
 
-Install the requirements of the `veronica` module:
+For placeholder image generation, you'll need the canvas dependencies:
 
-    apt-get install graphicsmagick webp libgif-dev libcairo2-dev libpango1.0-dev libjpeg-dev librsvg2-dev
+```bash
+# Debian/Ubuntu
+sudo apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
 
-This plugin requires exiv2
-
-    apt-get install exiv2 libexiv2-dev
+# macOS
+brew install pkg-config cairo pango libpng jpeg giflib librsvg pixman
 
-This plugin requires libopencv packages
-
-    apt-get install libopencv-dev
+# Arch Linux
+sudo pacman -S cairo pango giflib libjpeg-turbo librsvg
+```
 
-This plugin requires magick++
+This plugin uses exiv2 for reading image metadata:
 
-    apt-get install libmagick++-dev
+    apt-get install exiv2 libexiv2-dev

package/assets/stylesheets/media_elements/_file.scss

@@ -133,4 +133,16 @@ al-field[field-type="file"] {
 			margin: auto;
 		}
 	}
+}
+
+.alchemy-file-selection-dialog {
+	.alchemy-file-selection-wrapper {
+		max-height: 85vh;
+
+		al-table {
+			max-height: 76vh;
+			margin-bottom: 1rem;
+			overflow: auto;
+		}
+	}
 }

package/config/settings.js

@@ -27,19 +27,6 @@ MEDIA_PLUGIN_GROUP.addSetting('file_storage_path', {
 	description : 'Where to store uploaded files',
 });
 
-MEDIA_PLUGIN_GROUP.addSetting('scratch_path', {
-	type        : 'string',
-	default     : libpath.resolve(PATH_TEMP, 'scratch'),
-	description : 'Temporary map for intermediate file changes',
-	action      : (value, value_instance) => {
-
-		if (value) {
-			alchemy.createDir(value);
-		}
-
-		createVeronicaInstance();
-	},
-});
 
 MEDIA_PLUGIN_GROUP.addSetting('cache_path', {
 	type        : 'string',
@@ -72,24 +59,12 @@ MEDIA_PLUGIN_GROUP.addSetting('max_page_width', {
 
 const BINARIES = MEDIA_PLUGIN_GROUP.createGroup('binaries');
 
-BINARIES.addSetting('convert', {
-	type        : 'string',
-	default     : alchemy.findPathToBinarySync('convert'),
-	description : 'The path to the `convert` binary',
-});
-
 BINARIES.addSetting('exiv2', {
 	type        : 'string',
 	default     : alchemy.findPathToBinarySync('exiv2'),
 	description : 'The path to the `exiv2` binary',
 });
 
-BINARIES.addSetting('cwebp', {
-	type        : 'string',
-	default     : alchemy.findPathToBinarySync('cwebp'),
-	description : 'The path to the `cwebp` binary',
-	action      : createVeronicaInstance,
-});
 
 /**
  * Recreate the Veronica instance
@@ -104,8 +79,6 @@ function createVeronicaInstance() {
 	const media = alchemy.settings.plugins.media;
 
 	alchemy.plugins.media.veronica = new Veronica({
-		cwebp  : media.binaries.cwebp,
-		temp   : media.scratch_path,
 		cache  : media.cache_path,
 	});
 }

package/controller/media_files_controller.js

@@ -460,13 +460,12 @@ MediaFiles.setAction(async function recordsource(conduit) {
 				continue;
 			}
 
-			val = RegExp.interpretWildcard('*' + val + '*', 'i');
-			crit.where(key).equals(val);
+			crit.where(key).matchesFilter(val);
 		}
 	}
 
 	let records = await model.find('all', crit);
-	
+
 	conduit.end({
 		records : records
 	});

package/lib/media_types/image_media_type.js

@@ -1,6 +1,5 @@
 var exiv2    = alchemy.use('@11ways/exiv2'),
     child    = alchemy.use('child_process'),
-    gm       = alchemy.use('gm'),
     profiles = alchemy.shared('Media.profiles'),
     fs       = alchemy.use('fs'),
     libpath  = require('path'),
@@ -39,19 +38,6 @@ ImageMedia.setProperty(function exiv_path() {
 	return alchemy.settings.plugins.media.binaries.exiv2;
 });
 
-/**
- * Add a property getter to the cwebp binary
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    0.9.0
- * @version  0.9.0
- *
- * @type     {string}
- */
-ImageMedia.setProperty(function cwebp_path() {
-	return alchemy.settings.plugins.media.binaries.cwebp;
-});
-
 /**
  * Get the hash algorithm
  *
@@ -342,9 +328,8 @@ ImageMedia.setMethod(function serve(conduit, record, options) {
 
 	if (resizeOptions) {
 
-		const cwebp_path = this.cwebp_path;
-
-		if (this.supportsWebp(conduit) && cwebp_path) {
+		// Sharp has native WebP support, no external binary needed
+		if (this.supportsWebp(conduit)) {
 			resizeOptions.type = 'webp';
 		}
 
@@ -450,9 +435,8 @@ ImageMedia.setMethod(function placeholder(conduit, options) {
 
 ImageMedia.setMethod(function getSize(conduit, filePath, options, callback) {
 
-	var tempName = filePath,
-	    resizeOptions = '',
-	    tempPath;
+	var that = this,
+	    tempName = filePath;
 
 	if (!options.type) {
 		options.type = 'webp';
@@ -464,8 +448,6 @@ ImageMedia.setMethod(function getSize(conduit, filePath, options, callback) {
 
 	if (options.height) {
 		tempName += '-h' + options.height;
-
-		resizeOptions += '-resize ' + options.width + ' ' + options.height;
 	}
 
 	tempName += '-' + options.type;
@@ -475,22 +457,27 @@ ImageMedia.setMethod(function getSize(conduit, filePath, options, callback) {
 		return callback(null, cache[tempName]);
 	}
 
-	tempPath = PATH_TEMP + '/' + alchemy.ObjectId() + '.webp';
-
-	const cwebp_path = this.cwebp_path;
+	// Use veronica for resize and WebP conversion
+	let resizeOptions = {
+		type: options.type,
+		quality: 80
+	};
 
-	if (!cwebp_path) {
-		return callback(new Error('Unable to get size: cwebp not found'));
+	if (options.width) {
+		resizeOptions.maxWidth = options.width;
 	}
 
-	child.exec(cwebp_path + ' ' + [resizeOptions, '-q 80', filePath, '-o', tempPath].join(' '), function(err, out) {
+	if (options.height) {
+		resizeOptions.maxHeight = options.height;
+	}
 
+	this.veronica.getResizedImage(filePath, resizeOptions, function(err, resizedPath) {
 		if (err) {
 			return callback(err);
 		}
 
-		cache[tempName] = tempPath;
-		callback(null, tempPath);
+		cache[tempName] = resizedPath;
+		callback(null, resizedPath);
 	});
 });
 
@@ -599,6 +586,10 @@ ImageMedia.setMethod(function getMetadata(filePath, base, info, extra, callback)
 				return getInfo();
 			}
 
+			if (!that.exiv_path) {
+				return getInfo();
+			}
+
 			child.execFile(that.exiv_path, ['rm', tempFile], function afterStrip(err) {
 
 				if (err) {
@@ -635,7 +626,7 @@ ImageMedia.setMethod(function getMetadata(filePath, base, info, extra, callback)
 });
 
 /**
- * Resize an image using imagemagick's convert
+ * Resize an image using veronica
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
@@ -643,11 +634,12 @@ ImageMedia.setMethod(function getMetadata(filePath, base, info, extra, callback)
  */
 ImageMedia.setMethod(function resize(source, target, width, height, callback) {
 
-	let convertBin = alchemy.settings.plugins.media.convert;
-
-	child.execFile(convertBin, [source, '-resize', width + 'x' + height, target], function(err) {
-		callback(err);
-	});
+	// Fit inside, maintain aspect ratio
+	this.veronica.resize(source, {
+		maxWidth: width,
+		maxHeight: height,
+		target: target
+	}, callback);
 });
 
 /**
@@ -662,6 +654,32 @@ ImageMedia.setMethod(function resize(source, target, width, height, callback) {
  */
 ImageMedia.setMethod(function getImageInfo(filePath, callback) {
 
+	const that = this;
+
+	// Helper to use veronica for basic image info
+	function useVeronica() {
+		that.veronica.image(filePath).size(function(err, size) {
+			if (err) {
+				return callback(err);
+			}
+
+			let info = {};
+			let extra = {};
+
+			info.width = size.width;
+			info.height = size.height;
+
+			extra.width = size.width;
+			extra.height = size.height;
+
+			callback(null, info, extra);
+		});
+	}
+
+	if (!this.exiv_path) {
+		return useVeronica();
+	}
+
 	// Run exiv on the given file
 	child.execFile(this.exiv_path, ['-pt', filePath], function afterStrip(err, out) {
 
@@ -675,30 +693,9 @@ ImageMedia.setMethod(function getImageInfo(filePath, callback) {
 		// See what type of error was made
 		if (err) {
 
-			// No exif information found
-			if (err.code == 253) {
-
-				gm(filePath).size(function gotGmResponse(err, size) {
-
-					if (err) {
-						if (err.message && err.message.indexOf('spawn ENOENT')) {
-							callback(new Error('Graphicsmagick needs to be installed!'));
-						} else {
-							callback(err);
-						}
-						return;
-					}
-
-					info.width = size.width;
-					info.height = size.height;
-
-					extra.width = size.width;
-					extra.height = size.height;
-
-					callback(null, info, extra);
-				});
-
-				return;
+			// No exif information found (253) or binary not found (ENOENT)
+			if (err.code == 253 || err.code === 'ENOENT') {
+				return useVeronica();
 			}
 
 			// Code 255 = file not found

package/package.json

@@ -1,21 +1,20 @@
 {
 	"name": "alchemy-media",
 	"description": "The media plugin for Alchemy",
-	"version": "0.9.0-alpha.4",
+	"version": "0.9.0",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-media.git"
 	},
 	"dependencies": {
-		"@11ways/exiv2" : "~0.7.0",
-		"gm"            : "~1.23.1",
-		"veronica"      : "~0.2.2"
+		"@11ways/exiv2" : "~0.7.3",
+		"veronica"      : "~0.3.0"
 	},
 	"peerDependencies": {
 		"alchemymvc" : ">=1.4.0||>=1.4.0-alpha"
 	},
 	"license": "MIT",
 	"engines": {
-		"node" : ">=16.20.1"
+		"node" : ">=18.17.0"
 	}
 }

package/view/element/al_file_selection.hwk

@@ -15,6 +15,14 @@ fieldset.addField('_id', {
 
 fieldset.addField('filename');
 fieldset.addField('type');
+fieldset.addField('MediaRaw.size');
+
+if (!filters) {
+	filters = {
+		'MediaRaw.size': '>500000'
+	};
+}
+
 %>
 
 <div class="alchemy-file-selection-wrapper">