meta/templates.js refactor

src/meta/templates.js

@@ -47,17 +47,15 @@ function getBaseTemplates(theme) {
 	return baseTemplatesPaths.reverse();
 }
 
-function compile(callback) {
+function preparePaths(baseTemplatesPaths, callback) {
 	var coreTemplatesPath = nconf.get('core_templates_path'),
-		themeConfig = require(nconf.get('theme_config')),
-		baseTemplatesPaths = themeConfig.baseTheme ? getBaseTemplates(themeConfig.baseTheme) : [nconf.get('base_templates_path')],
 		viewsPath = nconf.get('views_dir');
 
-
 	plugins.getTemplates(function(err, pluginTemplates) {
 		if (err) {
 			return callback(err);
 		}
+		
 		winston.verbose('[meta/templates] Compiling templates');
 		rimraf.sync(viewsPath);
 		mkdirp.sync(viewsPath);
@@ -86,7 +84,7 @@ function compile(callback) {
 				paths = {};
 
 			coreTpls.forEach(function(el, i) {
-				paths[coreTpls[i].replace(coreTemplatesPath, '')] = path.join(coreTemplatesPath, coreTpls[i]);
+				paths[coreTpls[i].replace(coreTemplatesPath, '')] = coreTpls[i];
 			});
 
 			baseThemes.forEach(function(baseTpls) {
@@ -101,6 +99,22 @@ function compile(callback) {
 				}
 			}
 
+			callback(err, paths);
+		});
+	});
+}
+
+function compile(callback) {
+	var themeConfig = require(nconf.get('theme_config')),
+		baseTemplatesPaths = themeConfig.baseTheme ? getBaseTemplates(themeConfig.baseTheme) : [nconf.get('base_templates_path')],
+		viewsPath = nconf.get('views_dir');
+	
+
+	preparePaths(baseTemplatesPaths, function(err, paths) {
+		if (err) {
+			return callback(err);
+		}
+
 		async.each(Object.keys(paths), function(relativePath, next) {
 			var file = fs.readFileSync(paths[relativePath]).toString(),
 				matches = null,
@@ -142,7 +156,6 @@ function compile(callback) {
 			});
 		});
 	});
-	});
 }