cleaner implementation of default author

flatiron · Feb 17, 2012 · b960978 · b960978
1 parent 273ea6f
commit b960978
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/lib/commands/post.js b/lib/commands/post.js
@@ -1,15 +1,19 @@
 var smith   = require("../blacksmith"),
     fs2      = require('../fs2'),
     winston = require('winston'),
-	path = require('path'),
+    path = require('path'),
     prompt  = require("prompt");
 
 module.exports = function() {
   winston.info("Executing command "+"post".yellow);
 
-  if(smith.config.global.store.defaultAuthor && path.existsSync('./authors/'+smith.config.global.store.defaultAuthor+'.json')) {
-      var authors = require("../loaders/authors").load(true);
-      var defaultAuthor = authors[smith.config.global.store.defaultAuthor].file.store.name;
+  var defaultAuthor = smith.config.get("defaultAuthor"),
+      defaultAuthorName;
+  if(defaultAuthor && path.existsSync('./authors/'+defaultAuthor+'.json')) {
+    var author = require("../loaders/authors").load(true)[defaultAuthor];
+    if(author) {
+      defaultAuthorName = author.get("name");
+    }
   }
 
   prompt.start();
@@ -20,22 +24,20 @@ module.exports = function() {
     },
     {
       name: "author",
-      message: "Specify the author" + (defaultAuthor ? " (empty to use '"+defaultAuthor+"')" : "")
+      message: "Specify the author" + (defaultAuthorName ? " (empty to use '"+defaultAuthorName+"')" : "")
     }
   ], function (err, res) {
     if (err) {
       winston.error(err.stack);
       cb(1);
     }
 
-    if(res.author === "")
-      res.author = smith.config.global.store.defaultAuthor;
+    if(res.author === "") {
+      res.author = defaultAuthorName;
+    }
 
     var folder = res.title.toLowerCase().replace(/\W+/g, '-');
 
-    if(smith.config.global.store.contentDir)
-      folder = smith.config.global.store.contentDir + "/" + folder;
-
     //TODO: Check authors
 
     winston.warn('blacksmith'.yellow+' is about to write '