Merge pull request #122 from Dahlgren/bugfix/missions-error

Handle errors while loading missions list
This commit is contained in:
Björn Dahlgren 2018-10-08 23:23:13 +02:00 committed by GitHub
commit 59b9c15869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,35 +27,40 @@ Missions.prototype.updateMissions = function (cb) {
var self = this var self = this
fs.readdir(this.missionsPath(), function (err, files) { fs.readdir(this.missionsPath(), function (err, files) {
if (err) { if (err) {
console.log(err)
if (cb) { if (cb) {
cb(err) return cb(err)
} }
} else {
async.map(files, function (filename, cb) {
fs.stat(self.missionPath(filename), function (err, stat) {
if (err) {
cb(err)
}
cb(null, { return
dateCreated: new Date(stat.ctime),
dateModified: new Date(stat.mtime),
name: filename,
size: stat.size,
sizeFormatted: filesize(stat.size)
})
})
}, function (err, missions) {
if (!err) {
self.missions = missions
self.emit('missions', missions)
}
if (cb) {
cb(err, missions)
}
})
} }
async.map(files, function (filename, cb) {
fs.stat(self.missionPath(filename), function (err, stat) {
if (err) {
console.log(err)
return cb(err)
}
cb(null, {
dateCreated: new Date(stat.ctime),
dateModified: new Date(stat.mtime),
name: filename,
size: stat.size,
sizeFormatted: filesize(stat.size)
})
})
}, function (err, missions) {
if (!err) {
self.missions = missions
self.emit('missions', missions)
}
if (cb) {
cb(err, missions)
}
})
}) })
} }