Remove wrench: using glob() everywhere

package.json

@@ -23,7 +23,6 @@
   "dependencies": {
     "handlebars": "~2.0.0",
     "lodash": "~2.4.1",
-    "wrench": "~1.5.8",
     "fs-extra": "~0.8.1",
     "gm": "~1.14.2",
     "commander": "~2.2.0",

src/galleries.js

@@ -1,9 +1,9 @@
 var _           = require('lodash');
 var fs          = require('fs');
 var path        = require('path');
-var wrench      = require('wrench');
+var glob        = require('glob');
 
-exports.fromDisk = function(mediaPath, mediaPrefix) {
+exports.fromDisk = function(mediaPath, mediaPrefix, callback) {
 
   function fileInfo(file) {
     return {
@@ -40,10 +40,6 @@ exports.fromDisk = function(mediaPath, mediaPrefix) {
     return path.dirname(file.path);
   }
 
-  function byExtension(file) {
-    return file.match(/\.(jpg|jpeg|png|mp4|mov)$/)
-  }
-
   function folderInfo(files, name) {
     return {
       name: name,
@@ -52,12 +48,14 @@ exports.fromDisk = function(mediaPath, mediaPrefix) {
     };
   }
 
-  var files = wrench.readdirSyncRecursive(mediaPath);
-  return _(files).filter(byExtension)
-                 .map(fileInfo)
-                 .sortBy('date')
-                 .groupBy(byFolder)
-                 .map(folderInfo)
-                 .value();
+  glob('**/*.{jpg,jpeg,png,mp4,mov}', {cwd: mediaPath, nonull:false}, function (err, files) {
+    var galleries = _(files)
+                   .map(fileInfo)
+                   .sortBy('date')
+                   .groupBy(byFolder)
+                   .map(folderInfo)
+                   .value();
+    callback(null, galleries);
+  });
 
 };

src/index.js

@@ -25,7 +25,7 @@ exports.build = function(opts) {
 
 function photos(opts) {
   var thumbsFolder = path.join(path.resolve(opts.output), 'thumbs');
-  glob('**/*.{jpg,png}', {cwd: opts.input, nonull:false}, function (er, files) {
+  glob('**/*.{jpg,png}', {cwd: opts.input, nonull:false}, function (err, files) {
     var fns = files.map(function(file) {
       return thumbs.photo.bind(this, {
         input: path.join(opts.input, file),
@@ -38,7 +38,7 @@ function photos(opts) {
 
 function videos(opts) {
   var thumbsFolder = path.join(path.resolve(opts.output), 'thumbs');
-  glob('**/*.{mp4,mov}', {cwd: opts.input, nonull:false}, function (er, files) {
+  glob('**/*.{mp4,mov}', {cwd: opts.input, nonull:false}, function (err, files) {
     var fns = files.map(function(file) {
       return thumbs.video.bind(this, {
         input: path.join(opts.input, file),
@@ -51,19 +51,19 @@ function videos(opts) {
 }
 
 function website(opts) {
-  var list = galleries.fromDisk(opts.input, opts.mediaPrefix);
-
-  var rendered = render.gallery(list, list[0]);
-  var outputPath = path.join(opts.output, 'index.html');
-  fs.writeFileSync(outputPath, rendered);
-
-  list.forEach(function(folder) {
-    var rendered = render.gallery(list, folder);
-    var outputPath = path.join(opts.output, folder.url);
+  galleries.fromDisk(opts.input, opts.mediaPrefix, function(err, list) {
+    var rendered = render.gallery(list, list[0]);
+    var outputPath = path.join(opts.output, 'index.html');
     fs.writeFileSync(outputPath, rendered);
+  
+    list.forEach(function(folder) {
+      var rendered = render.gallery(list, folder);
+      var outputPath = path.join(opts.output, folder.url);
+      fs.writeFileSync(outputPath, rendered);
+    });
+  
+    log('Website')();
   });
-
-  log('Website')();
 }
 
 function support(opts) {