Compare commits
No commits in common. "7df864b95d0767efdbca0d6bf508b72a8a0a38e7" and "5a91c8973090037ec56d3258348c4eff006fe0bc" have entirely different histories.
7df864b95d
...
5a91c89730
@ -71,8 +71,7 @@ function scanDir(parent, path) {
|
||||
let filepath = path + file;
|
||||
return stat(filepath).then(function(stats) {
|
||||
if (stats.isDirectory()) {
|
||||
return scanDir(album, filepath + "/")
|
||||
.then(([ _albums, _assets ]) => {
|
||||
return scanDir(album, filepath + "/").spread(function(_albums, _assets) {
|
||||
albums = albums.concat(_albums);
|
||||
assets = assets.concat(_assets);
|
||||
});
|
||||
@ -109,8 +108,7 @@ function scanDir(parent, path) {
|
||||
|
||||
require("./server/db/photos").then(function(db) {
|
||||
photoDB = db;
|
||||
return scanDir(null, picturesPath)
|
||||
.then(([ albums, assets ]) => {
|
||||
return scanDir(null, picturesPath).spread(function(albums, assets) {
|
||||
console.log(assets.length + " assets have incorrect dates.");
|
||||
let toProcess = assets.length, lastMessage = moment(), started = moment();
|
||||
return photoDB.sequelize.transaction(function (t) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user