Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

added error checking to install.js for categories

Browse Source
This commit is contained in:
barisusakli
2014-07-02 21:55:05 -04:00
parent 5ea74ae9e9
commit 586aeaf53f
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/categories.js
View File

@@ -275,7 +275,7 @@ var db = require('./database'),
return callback(err); return callback(err);
} }
if (!Array.isArray(categories)) { if (!Array.isArray(categories) || !categories.length) {
return callback(null, []); return callback(null, []);
} }

37
src/install.js
View File

@@ -366,26 +366,25 @@ function createCategories(next) {
var Categories = require('./categories'); var Categories = require('./categories');
Categories.getAllCategories(function (err, categoryData) { Categories.getAllCategories(function (err, categoryData) {
if (categoryData.length === 0) { if (err) {
winston.warn('No categories found, populating instance with default categories'); return next(err);
fs.readFile(path.join(__dirname, '../', 'install/data/categories.json'), function (err, default_categories) {
default_categories = JSON.parse(default_categories);
async.eachSeries(default_categories, function (category, next) {
Categories.create(category, next);
}, function (err) {
if (!err) {
next();
} else {
winston.error('Could not set up categories');
}
});
});
} else {
winston.info('Categories OK. Found ' + categoryData.length + ' categories.');
next();
} }
if (Array.isArray(categoryData) && categoryData.length) {
winston.info('Categories OK. Found ' + categoryData.length + ' categories.');
return next();
}
winston.warn('No categories found, populating instance with default categories');
fs.readFile(path.join(__dirname, '../', 'install/data/categories.json'), function (err, default_categories) {
if (err) {
return next(err);
}
default_categories = JSON.parse(default_categories);
async.eachSeries(default_categories, Categories.create, next);
});
}); });
} }