From 09df54e6290f05102f5410775f18a4896cff294d Mon Sep 17 00:00:00 2001 From: Alexander Wunschik Date: Tue, 31 Jan 2017 21:39:44 +0100 Subject: [PATCH 1/2] feat: new option to turn gallery generation off --- lib/wraith.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/wraith.js b/lib/wraith.js index 64e82d2..9930902 100644 --- a/lib/wraith.js +++ b/lib/wraith.js @@ -51,6 +51,7 @@ Wraith.prototype.config = function(config) { self.sizes = []; self.dirs = []; self.quiet = config.quiet || false; + self.gallery = config.hasOwnProperty('gallery') ? config.gallery : true; self.server = {}; self.server.start = config.server.start || false; self.server.port = config.server.port || 9090; @@ -293,7 +294,13 @@ Wraith.prototype.compareScreenshots = function() { return self; } else { log.success('Image comparison done'); - self.generateGallery(); + if (self.gallery || self.server.start) { + self.generateGallery(); + } else { + helpers.emptyFolder(self.outputFolder, function() { + self.cb(); + }); + } return self; } }); @@ -301,5 +308,12 @@ Wraith.prototype.compareScreenshots = function() { Wraith.prototype.generateGallery = function() { var self = this; - gallery.generate(self.dirs, self.compareQueue, self.outputFolder, self.config.project, self.server, self.cb); + gallery.generate( + self.dirs, + self.compareQueue, + self.outputFolder, + self.config.project, + self.server, + self.cb + ); }; From 808b058efb91b76dcddedfe21ed0c48b50a6f489 Mon Sep 17 00:00:00 2001 From: Alexander Wunschik Date: Tue, 31 Jan 2017 21:42:21 +0100 Subject: [PATCH 2/2] feat: return max mismatch to callback --- lib/wraith.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/wraith.js b/lib/wraith.js index 9930902..7faa5cb 100644 --- a/lib/wraith.js +++ b/lib/wraith.js @@ -240,6 +240,7 @@ Wraith.prototype.compareScreenshots = function() { } self.compareQueue = []; + self.maxMismatch = 0; for(var url in self.urls) { var dir = self.urls[url].substring(1).replace(/\/+$/,'') + '/'; @@ -278,6 +279,7 @@ Wraith.prototype.compareScreenshots = function() { async.eachLimit(self.compareQueue, self.maxConnections, function(task, callback) { resemble('./' + task.base).compareTo('./' + task.compare).ignoreAntialiasing().onComplete(function(data) { data.getDiffImage().pack().pipe(fs.createWriteStream(task.output)); + self.maxMismatch = data.misMatchPercentage > self.maxMismatch ? data.misMatchPercentage : self.maxMismatch; fs.writeFile('./' + task.diff, data.misMatchPercentage, function(err) { if(err) { log.error(err); } if(bar) { @@ -298,7 +300,7 @@ Wraith.prototype.compareScreenshots = function() { self.generateGallery(); } else { helpers.emptyFolder(self.outputFolder, function() { - self.cb(); + self.cb(self.maxMismatch); }); } return self; @@ -308,12 +310,5 @@ Wraith.prototype.compareScreenshots = function() { Wraith.prototype.generateGallery = function() { var self = this; - gallery.generate( - self.dirs, - self.compareQueue, - self.outputFolder, - self.config.project, - self.server, - self.cb - ); + gallery.generate(self.dirs, self.compareQueue, self.outputFolder, self.config.project, self.server, self.cb); };