jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Compare commits

base: jketreno:7df864b95d0767efdbca0d6bf508b72a8a0a38e7
Branches Tags
jketreno:master
..
compare: jketreno:5a91c8973090037ec56d3258348c4eff006fe0bc
Branches Tags
jketreno:master

No commits in common. "7df864b95d0767efdbca0d6bf508b72a8a0a38e7" and "5a91c8973090037ec56d3258348c4eff006fe0bc" have entirely different histories.
7df864b95d ... 5a91c89730

1 changed files with 2 additions and 4 deletions
Show Stats Expand all files Collapse all files

6
fixdate.js
View File

@ -71,8 +71,7 @@ function scanDir(parent, path) {
let filepath = path + file; let filepath = path + file;
return stat(filepath).then(function(stats) { return stat(filepath).then(function(stats) {
if (stats.isDirectory()) { if (stats.isDirectory()) {
return scanDir(album, filepath + "/") return scanDir(album, filepath + "/").spread(function(_albums, _assets) {
.then(([ _albums, _assets ]) => {
albums = albums.concat(_albums); albums = albums.concat(_albums);
assets = assets.concat(_assets); assets = assets.concat(_assets);
}); });
@ -109,8 +108,7 @@ function scanDir(parent, path) {
require("./server/db/photos").then(function(db) { require("./server/db/photos").then(function(db) {
photoDB = db; photoDB = db;
return scanDir(null, picturesPath) return scanDir(null, picturesPath).spread(function(albums, assets) {
.then(([ albums, assets ]) => {
console.log(assets.length + " assets have incorrect dates."); console.log(assets.length + " assets have incorrect dates.");
let toProcess = assets.length, lastMessage = moment(), started = moment(); let toProcess = assets.length, lastMessage = moment(), started = moment();
return photoDB.sequelize.transaction(function (t) { return photoDB.sequelize.transaction(function (t) {