Merge branch 'master' of https://github.com/publiclab/image-sequencer into demo

.gitignore

@@ -36,3 +36,4 @@ node_modules
 todo.txt
 test.js
 output.txt
+output/

index.js

@@ -1,11 +1,13 @@
 console.log('\x1b[31m%s\x1b[0m',"This is the output of the module");
 require('./src/ImageSequencer');
 sequencer = ImageSequencer();
-sequencer.loadImages({images:{red:'examples/red.jpg'},callback:function(){
+sequencer.loadImages({images:{red:'examples/images/red.jpg'},callback:function(){
   sequencer.addSteps(['do-nothing-pix','ndvi-red','invert']);
   sequencer.removeSteps(1);
   sequencer.insertSteps({
     red: [{index: -1, name: 'do-nothing-pix', o:{}}]
   });
-  sequencer.run();
+  sequencer.run(function(){
+    sequencer.exportBin();
+  });
 }});

package.json

@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "bootstrap": "~3.2.0",
+    "data-uri-to-buffer": "^2.0.0",
     "fisheyegl": "^0.1.2",
     "font-awesome": "~4.5.0",
     "jquery": "~2",
@@ -30,6 +31,7 @@
   "devDependencies": {
     "browserify": "13.0.0",
     "buffer": "~5.0.2",
+    "data-uri-to-buffer": "^2.0.0",
     "get-pixels": "~3.3.0",
     "grunt": "^0.4.5",
     "grunt-browserify": "^5.0.0",
@@ -37,6 +39,7 @@
     "grunt-contrib-watch": "^0.6.1",
     "image-filter-core": "~1.0.0",
     "image-filter-threshold": "~1.0.0",
+    "looks-same": "^3.2.1",
     "matchdep": "^0.3.0",
     "plotly.js": "~1.21.2",
     "save-pixels": "~2.3.4",

src/ExportBin.js

@@ -0,0 +1,52 @@
+var getDirectories = function(rootDir, cb) {
+  fs.readdir(rootDir, function(err, files) {
+      var dirs = [];
+      if(typeof(files)=="undefined") {
+        cb(dirs);
+        return [];
+      }
+      for (var index = 0; index < files.length; ++index) {
+          var file = files[index];
+          if (file[0] !== '.') {
+              var filePath = rootDir + '/' + file;
+              fs.stat(filePath, function(err, stat) {
+                  if (stat.isDirectory()) {
+                      dirs.push(this.file);
+                  }
+                  if (files.length === (this.index + 1)) {
+                      return cb(dirs);
+                  }
+              }.bind({index: index, file: file}));
+          }
+      }
+  });
+}
+
+module.exports = function ExportBin(ref) {
+  if(ref.options.inBrowser) return false;
+  fs.access('./output/', function(err){
+    if(err) fs.mkdir('output', function() {});
+  });
+  getDirectories('./output',function(dirs){
+    var num = 1;
+    for(var d in dirs){
+      if(dirs[d].match(/^sequencer(.*)$/)==null) continue;
+      var n = parseInt(dirs[d].match(/^sequencer(.*)$/)[1]);
+      num = (n>=num)?(n+1):num;
+    }
+    fs.mkdir('output/sequencer'+num,function(){
+      var root = 'output/sequencer'+num+'/';
+      for(var image in ref.images) {
+        var steps = ref.images[image].steps;
+        for(var i in steps) {
+          var datauri = steps[i].output.src;
+          var ext = steps[i].output.format;
+          var buffer = require('data-uri-to-buffer')(datauri);
+          fs.writeFile(root+image+"_"+i+"."+ext,buffer,function(){
+
+          });
+        }
+      }
+    })
+  });
+}

src/ImageSequencer.js

@@ -42,7 +42,8 @@ ImageSequencer = function ImageSequencer(options) {
       formatInput = require('./FormatInput'),
       images = {},
       inputlog = [],
-      events = require('./UserInterface')();
+      events = require('./UserInterface')(),
+      fs = require('fs');
 
   // if in browser, prompt for an image
   // if (options.imageSelect || options.inBrowser) addStep('image-select');
@@ -175,6 +176,10 @@ ImageSequencer = function ImageSequencer(options) {
     this.events = require('./UserInterface')(UI);
   }
 
+  var exportBin = function() {
+    return require('./ExportBin')(this);
+  }
+
   return {
     //literals and objects
     name: "ImageSequencer",
@@ -193,6 +198,7 @@ ImageSequencer = function ImageSequencer(options) {
     replaceImage: replaceImage,
     run: run,
     setUI: setUI,
+    exportBin: exportBin,
 
     //other functions
     log: log,

test/image-manip.js

@@ -1,6 +1,8 @@
 'use strict';
 
 var test = require('tape');
+var looksSame = require('looks-same');
+var DataURItoBuffer = require('data-uri-to-buffer');
 
 // We should only test headless code here.
 // http://stackoverflow.com/questions/21358015/error-jquery-requires-a-window-with-a-document#25622933
@@ -24,13 +26,27 @@ test("Preload", function(t) {
 });
 
 test("Inverted image isn't identical", function (t) {
-  t.notEqual(sequencer.images.image1.steps[1].output.src, sequencer.images.image1.steps[2].output.src);
-  t.end();
+  var step1 = sequencer.images.image1.steps[1].output.src;
+  var step2 = sequencer.images.image1.steps[2].output.src;
+  step1 = DataURItoBuffer(step1);
+  step2 = DataURItoBuffer(step2);
+  looksSame(step1,step2,function(err,res){
+    if(err) console.log(err);
+    t.equal(res,false);
+    t.end();
+  });
 });
 
 test("Twice inverted image is identical to original image", function (t) {
-  t.equal(sequencer.images.image1.steps[1].output.src, sequencer.images.image1.steps[3].output.src);
-  t.end();
+  var step1 = sequencer.images.image1.steps[1].output.src;
+  var step3 = sequencer.images.image1.steps[3].output.src;
+  step1 = DataURItoBuffer(step1);
+  step3 = DataURItoBuffer(step3);
+  looksSame(step1,step3,function(err,res){
+    if(err) console.log(err);
+    t.equal(res,true);
+    t.end();
+  });
 });
 
 test("Decode QR module works properly :: setup", function (t) {