Switch to using transactions

Signed-off-by: James Ketrenos <james_git@ketrenos.com>

server/routes/photos.js

@@ -132,7 +132,6 @@ router.get("/*", function(req, res/*, next*/) {
     photos.forEach(function(photo) {
       for (var key in photo) {
         if (photo[key] instanceof Date) {
-          photo[key].setHours(0, 0, 0, 0);
           photo[key] = moment(photo[key]);
         }
       }

server/scanner.js

@@ -217,6 +217,7 @@ function processBlock(items) {
   }).then(function() {
     let toProcess = processing.length, lastMessage = moment();
     /* Needs to be one at a time in case there are multiple HASH collisions */
+    return photoDB.sequelize.transaction(function(transaction) {
       return Promise.mapSeries(processing, function(asset) {
         return photoDB.sequelize.query("SELECT photohashes.*,photos.filename,albums.path FROM photohashes " +
           "LEFT JOIN photos ON (photos.id=photohashes.photoId) " +
@@ -246,7 +247,8 @@ function processBlock(items) {
           }
 
           return photoDB.sequelize.query(query, {
-          replacements: asset
+            replacements: asset,
+            transaction: transaction
           });
         }).then(function() {
           toProcess--;
@@ -256,13 +258,14 @@ function processBlock(items) {
           }
         });
       });
+    });
   }).then(function() {
     let toProcess = processing.length, lastMessage = moment();
     console.log(needsProcessing.length + " assets need to have metadata extracted");
     return Promise.map(needsProcessing, function(asset) {
       var path = asset.album.path,
         file = asset.filename,
-        created = asset.stats.ctime,
+        created = asset.stats.mtime,
         albumId = asset.album.id;
         
       let tmp = Promise.resolve(file);
@@ -364,7 +367,7 @@ function processBlock(items) {
             return photoDB.sequelize.query("UPDATE photos SET " +
               "added=:added,modified=:modified,taken=:taken,width=:width,height=:height,scanned=CURRENT_TIMESTAMP " +
               "WHERE id=:id", {
-              replacements: asset
+              replacements: asset,
             });
           }).then(function() {
             toProcess--;
@@ -530,7 +533,6 @@ function scanDir(parent, path) {
           filename: file.replace(rawExtension, ".jpg"), /* We will be converting from NEF/ORF => JPG */
           name: file.replace(/.[^.]*$/, ""),
           stats: {
-            ctime: stats.ctime,
             mtime: stats.mtime
           },
           album: album
@@ -548,7 +550,7 @@ function scanDir(parent, path) {
   });
 }
 
-function findOrCreateDBAlbum(album) {
+function findOrCreateDBAlbum(transaction, album) {
   let query = "SELECT id FROM albums WHERE path=:path AND ";
   if (!album.parent) {
     query += "parentId IS NULL";
@@ -572,7 +574,8 @@ function findOrCreateDBAlbum(album) {
         console.warn("Creating top level album: " + picturesPath);
       }
       return photoDB.sequelize.query("INSERT INTO albums (path,parentId,name) VALUES(:path,:parentId,:name)", {
-        replacements: album
+        replacements: album,
+        transaction: transaction
       }).spread(function(results, metadata) {
         return metadata.lastID;
       });
@@ -585,8 +588,8 @@ function findOrCreateDBAlbum(album) {
   });
 }
 
-function findOrUpdateDBAsset(asset) {
+function findOrUpdateDBAsset(transaction, asset) {
-  let query = "SELECT id,scanned FROM photos WHERE albumId=:albumId AND filename=:filename";
+  let query = "SELECT id FROM photos WHERE albumId=:albumId AND filename=:filename";
   if (!asset.album || !asset.album.id) {
     let error = "Asset being processed without an album";
     console.error(error);
@@ -601,7 +604,8 @@ function findOrUpdateDBAsset(asset) {
       return photoDB.sequelize.query("INSERT INTO photos " +
         "(albumId,filename,name) " +
         "VALUES(:albumId,:filename,:name)", {
-        replacements: asset
+        replacements: asset,
+        transaction: transaction
       }).spread(function(results, metadata) {
         return [ metadata.lastID, null ];
       });
@@ -668,27 +672,31 @@ module.exports = {
       now = Date.now();
 
       let toProcess = albums.length, lastMessage = moment();
+      return photoDB.sequelize.transaction(function(transaction) {
         return Promise.mapSeries(albums, function(album) {
-        return findOrCreateDBAlbum(album).then(function() {
+          return findOrCreateDBAlbum(transaction, album).then(function() {
             toProcess--;
             if (moment().add(-5, 'seconds') > lastMessage) {
               console.log("Albums to be created in DB: "  + toProcess);
               lastMessage = moment();
             }
           });
+        });
       }).then(function() {
         console.log("Processed " + albums.length + " album DB entries in " + 
           ((Date.now() - now) / 1000) + "s");
         now = Date.now();
 
         let processed = 0, start = Date.now(), last = 0, updateScanned = [];
+        return photoDB.sequelize.transaction(function(transaction) {
           return Promise.map(assets, function(asset) {
-          return findOrUpdateDBAsset(asset).then(function(asset) {
+            return findOrUpdateDBAsset(transaction, asset).then(function(asset) {
               if (asset.scanned < asset.stats.mtime) {
                 needsProcessing.push(asset);
               } else {
                 updateScanned.push(asset.id);
               }
+            });
           }).then(function(asset) {
             processed++;