Merge

.travis.yml

@@ -9,11 +9,11 @@ cache:
   directories:
     - node_modules
 env:
-  - CXX=g++-4.8
+  - CXX=g++-4.8 DEBUG=*
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
       - pandoc
-      - g++-4.8    
+      - g++-4.8    

app/blog/tests/assets.js

@@ -41,7 +41,7 @@ describe("asset middleware", function() {
     });
   });
 
-  // This test ensures that the middleware will pass 
+  // This test ensures that the middleware will pass
   // the request on if it can't find a matching file.
   it("returns a 404 correctly", function(done) {
     this.get("/" + this.fake.random.uuid(), function(err, body, res) {
@@ -75,14 +75,18 @@ describe("asset middleware", function() {
       });
 
       ctx.server.use(require("../assets"));
-      ctx.server = ctx.server.listen(port, function(err) {
-        if (err && err.code === "EADDRINUSE") return attempt(done);
-        if (err && err.code === "EACCESS") return attempt(done);
-        if (err) return done(err);
-        done();
-      });
+
+      try {
+        ctx.server = ctx.server.listen(port);
+      } catch (err) {
+        if (err.code === "EADDRINUSE") return attempt(done);
+        if (err.code === "EACCESS") return attempt(done);
+        return done(err);
+      }
+
       ctx.server.port = port;
       ctx.url = "http://localhost:" + port;
+      done();
     })(done);
   });
 

app/clients/dropbox/routes/index.js

@@ -44,9 +44,22 @@ dashboard
   .get(require("./checkAppFolder"))
   .get(require("./askToMigrateIfNeeded"))
   .get(require("./createFolder"))
-  .get(require("./writeExistingContents"))
   .get(require("./saveDropboxAccount"))
+  .get(function(req, res, next) {
+    res.message("/", "Set up Dropbox successfuly!");
 
+    require("./writeExistingContents")(req, res, function(err) {
+      // Headers have been sent at this point, so just log this error
+      if (err) console.log("Dropbox authentication error:", err);
+
+      console.log(
+        "Blog:",
+        req.blog.id,
+        "Set up Dropbox client successfully! Full access?",
+        req.unsavedAccount.full_access
+      );
+    });
+  })
   // If we encounter some error during
   // the authentication flow, send them
   // back to the setup page where they started
@@ -70,8 +83,24 @@ dashboard
   })
   .post(require("./moveExistingFiles"))
   .post(require("./createFolder"))
-  .post(require("./writeExistingContents"))
-  .post(require("./saveDropboxAccount"));
+  .post(require("./saveDropboxAccount"))
+  .post(function(req, res, next) {
+    res.message("/", "Set up Dropbox successfuly!");
+
+    // This happens in the background. It would be nice to
+    // expose a progress bar in future.
+    require("./writeExistingContents")(req, res, function(err) {
+      // Headers have been sent at this point, so just log this error
+      if (err) console.log("Dropbox authentication error:", err);
+
+      console.log(
+        "Blog:",
+        req.blog.id,
+        "Set up Dropbox client successfully! Full access?",
+        req.unsavedAccount.full_access
+      );
+    });
+  });
 
 // Will remove the Dropbox account from the client's database
 // and revoke the token if needed.

app/clients/dropbox/routes/saveDropboxAccount.js

@@ -1,8 +1,4 @@
 var database = require("../database");
 module.exports = function saveDropboxAccount(req, res, next) {
-  database.set(req.blog.id, req.unsavedAccount, function(err) {
-    if (err) return next(err);
-
-    res.message("/", "Set up Dropbox successfuly!");
-  });
+  database.set(req.blog.id, req.unsavedAccount, next);
 };

app/clients/dropbox/sync.js

@@ -37,6 +37,7 @@ module.exports = function main(blog, callback) {
       // blog folder in the user's Dropbox folder.
       delta(account.cursor, function handle(err, result) {
         if (err) {
+          debug("Delta error", err);
           return Database.set(
             blog.id,
             { error_code: err.status || 400 },
@@ -46,6 +47,8 @@ module.exports = function main(blog, callback) {
           );
         }
 
+        debug("Retrieved", result.entries.length, "changes");
+
         // Now we attempt to apply the changes which occured in the
         // user's folder on Dropbox to the blog folder on Blot's server.
         // This means making any new directories, downloading any new
@@ -102,7 +105,10 @@ module.exports = function main(blog, callback) {
                 // we get them before returning the callback.
                 // This is important because a rename could
                 // be split across two pages of file events.
-                if (result.has_more) return delta(result.cursor, handle);
+                if (result.has_more) {
+                  debug("There are more change to fetch");
+                  return delta(result.cursor, handle);
+                }
 
                 debug("Finished sync!");
                 done(null, callback);

app/clients/local/controllers/sync.js

@@ -36,10 +36,26 @@ function walk(dir) {
 }
 
 function init(blogID, userFolder, callback) {
-  var watcher = fs.watch(userFolder, { recursive: true }, handler);
+
+  var queue = async.queue(function(task, callback) {
+    console.log("Beginning sync...");
+    handler(task.event, task.path, function(err) {
+      if (err) console.log(err);
+      console.log("Finished sync...");
+      callback();
+    });
+  });
+
+  var watcher = fs.watch(userFolder, { recursive: true }, function(
+    event,
+    path
+  ) {
+    queue.push({ event: event, path: path });
+  });
+
   callback(null);
 
-  function handler(event, path) {
+  function handler(event, path, callback) {
     if (!path) return;
 
     // Blot likes leading slashes
@@ -55,7 +71,7 @@ function init(blogID, userFolder, callback) {
       if (!folder) return watcher.close();
 
       Sync(blogID, syncOptions, function(err, folder, done) {
-        if (err) return console.log(err);
+        if (err) return callback(err);
 
         fs.stat(pathInUserFolder, function(err, stat) {
           try {
@@ -83,7 +99,8 @@ function init(blogID, userFolder, callback) {
           async.each(affectedPaths, folder.update, function(err) {
             if (err) console.log(err);
             done(null, function(err) {
-              if (err) console.log(err);
+              if (err) return callback(err);
+              callback();
             });
           });
         });