Added Image.middleware().

petersirka · petersirka · commit b3f382ba2ae1 · 2016-02-01T19:40:34.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -6,7 +6,8 @@
 - added: `U.get(obj, path)` reads a value from `obj` by path
 - added: `U.set(obj, path, value)` sets a value into `obj` by path
 - added: (IMPORTANT) `config['default-root']` can replace root relative path
-- added: FrameworkImage --> `instance.make(function(image) {})`
+- added: `FrameworkImage` --> `instance.make(function(image) {})`
+- added: `FrameworkImage` supports middleware `FrameworkImage.middleware(type, fn)`
 
 - updated: (IMPORTANT) Array.async([NEW: threadCount (Number)], [callback]) supports `threads`
 - updated: Date.format(format, [resource_name]) supports name of months via `MMM` (short) and `MMMM` (full)
diff --git a/image.js b/image.js
@@ -31,6 +31,8 @@ var exec = child.exec;
 var spawn = child.spawn;
 var path = require('path');
 var sof = { 0xc0: true, 0xc1: true, 0xc2: true, 0xc3: true, 0xc5: true, 0xc6: true, 0xc7: true, 0xc9: true, 0xca: true, 0xcb: true, 0xcd: true, 0xce: true, 0xcf: true };
+var middlewares = {};
+var Fs = require('fs');
 
 function u16(buf, o) {
 	return buf[o] << 8 | buf[o + 1];
@@ -244,10 +246,25 @@ Image.prototype.save = function(filename, callback, writer) {
 		if (!callback)
 			return;
 
-		if (error)
+		if (error) {
 			callback(error, false);
-		else
-			callback(null, true);
+			return;
+		}
+
+		var middleware = middlewares[self.outputType];
+		if (!middleware)
+			return callback(null, true);
+
+		var reader = Fs.createReadStream(filename);
+		var writer = Fs.createWriteStream(filename + '_');
+
+		reader.pipe(middleware()).pipe(writer);
+
+		writer.on('finish', function() {
+			Fs.rename(filename + '_', filename, function() {
+				callback(null, true);
+			});
+		});
 	});
 
 	if (self.currentStream) {
@@ -293,7 +310,7 @@ Image.prototype.pipe = function(stream, type, options) {
 	if (!self.builder.length)
 		return;
 
-	if (type === undefined || type === null)
+	if (!type)
 		type = self.outputType;
 
 	var cmd = spawn(self.isIM ? 'convert' : 'gm', self.arg(!self.filename ? '-' : self.filename, (type ? type + ':' : '') + '-'));
@@ -302,7 +319,12 @@ Image.prototype.pipe = function(stream, type, options) {
 	cmd.stdout.on('data', stream.emit.bind(stream, 'data'));
 	cmd.stdout.on('end', stream.emit.bind(stream, 'end'));
 	cmd.on('error', stream.emit.bind(stream, 'error'));
-	cmd.stdout.pipe(stream, options);
+
+	var middleware = middlewares[type];
+	if (middleware)
+		cmd.stdout.pipe(middleware()).pipe(stream, options);
+	else
+		cmd.stdout.pipe(stream, options);
 
 	if (self.currentStream) {
 		if (self.currentStream instanceof Buffer)
@@ -341,7 +363,11 @@ Image.prototype.stream = function(type, writer) {
 	if (writer)
 		writer(cmd.stdin);
 
-	return cmd.stdout;
+	var middleware = middlewares[type];
+	if (!middleware)
+		return cmd.stdout;
+
+	return cmd.stdout.pipe(middleware());
 };
 
 /*
@@ -743,9 +769,6 @@ Image.prototype.colors = function(value) {
 	return this.push('-colors', value, 10);
 };
 
-/*
-	@color {String}
-*/
 Image.prototype.background = function(color) {
 	return this.push('-background', color, 2);
 };
@@ -785,4 +808,8 @@ exports.init = function(filename, imageMagick, width, height) {
 
 exports.load = function(filename, imageMagick, width, height) {
 	return new Image(filename, imageMagick, width, height);
-};
+};
+
+exports.middleware = function(type, fn) {
+	middlewares[type] = fn;
+};
diff --git a/index.js b/index.js
@@ -428,7 +428,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 1970;
-	this.version_header = '1.9.7-17';
+	this.version_header = '1.9.7-18';
 
 	var version = process.version.toString().replace('v', '').replace(/\./g, '');
 	if (version[0] !== '0' || version[1] !== '0')
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
         "name": "Сковорода Никита Андреевич",
         "email": "chalkerx@gmail.com"
     }],
-    "version": "1.9.7-17",
+    "version": "1.9.7-18",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
