## 0.6.3

 * 添加--host
 * 添加port占用报错

Author: ksky521

.gitignore

@@ -3,3 +3,4 @@
 /src/index.html
 /test
 /3th
+/.idea

bin/nodeppt

@@ -15,8 +15,9 @@ var opts = {
     '-d': '--dir',
     '-f': '--file',
     '-o': '--output',
-    '-a': '--all'
-}
+    '-a': '--all',
+    '-h': '--host'
+};
 
 var argv = parseArgs(process.argv);
 var action = argv.slice(2, 3).toString();

changelog.md

@@ -1,5 +1,10 @@
+## 0.6.3
+ * 添加--host
+ * 添加port占用报错
+
 ## 0.6.1
  * 修复bug：copy img等
+
 ## 0.6.0
  * 新增导出功能：```nodeppt generate```
  * 去除grunt依赖

lib/nodePPT.js

@@ -38,7 +38,7 @@ var ppt = module.exports = {
         for (var i = 0, len = args.length; i < len; i++) {
             switch (args[i]) {
                 case '--output':
-                    output = args[i + 1] ? args[i + 1] : 8080;
+                    output = args[i + 1] ? args[i + 1] : '';
                     i++;
                     break;
             }
@@ -69,44 +69,45 @@ var ppt = module.exports = {
 
         console.log('     ________________|'.bold.green + 'nodePPT帮助'.bold.red + '|_______________'.bold.green);
         console.log('    |                                            |'.bold.green);
-        console.log('    |   nodeppt start: 启动服务                  |'.bold.green);
+        console.log('    |   nodeppt start: 启动httpserver            |'.bold.green);
         console.log('    |   nodeppt start -p 8000: 启动8000端口      |'.bold.green);
-        console.log('    |   nodeppt start -p 8000 -d ./              |'.bold.green);
+        console.log('    |   nodeppt start -p 8000 -d ./ 指定路径     |'.bold.green);
+        console.log('    |   nodeppt start -h 127.0.0.1 指定host      |'.bold.green);
         console.log('    |   nodeppt create fileName: 创建一个ppt     |'.bold.green);
         console.log('    |   nodeppt pdf url -o a.pdf: 输出一个pdf    |'.bold.green);
         console.log('    |   nodeppt generate path: 输导出html        |'.bold.green);
         console.log('    |____________________________________________|'.bold.green);
     },
     start: function(args) {
         //启动
-        var port = 8080;
-        var dir = '',
-            file;
         var self = this;
-        for (var i = 0, len = args.length; i < len; i++) {
-            switch (args[i]) {
-                case '--port':
-                    port = args[i + 1] ? args[i + 1] : 8080;
-                    i++;
-                    break;
-                case '--file':
-                    file = args[i + 1] ? args[i + 1] : '';
-                    break;
-                case '--dir':
-                    dir = args[i + 1] ? args[i + 1] : null;
-                    i++;
-                    break;
+
+        var argsObj = {
+            port: 8080,
+            dir: '',
+            host: '127.0.0.1',
+            file: ''
+        };
+        args = args.join(' ').split('--');
+        args.forEach(function(v, i) {
+            v = v.trim();
+            if (v !== '') {
+                v = v.split(/\s+/);
+                if (v.length === 2) {
+                    argsObj[v[0]] = v[1];
+                }
             }
-        }
+        });
+        // console.log(argsObj);
+
+        var dir = argsObj.dir;
         if (dir === '') {
             dir = path.join(rootDir, 'ppts');
         }
 
-
         if (!fs.existsSync(dir)) {
             dir = path.join(self.cwd, dir);
             if (!fs.existsSync(dir)) {
-
                 return console.log('\nERROR: '.bold.red + dir + ' 不是一个正确路径');
             }
 
@@ -117,7 +118,7 @@ var ppt = module.exports = {
             }
         }
 
-        require(libDir + '/server').start(port, dir);
+        require(libDir + '/server').start(argsObj.port, dir, argsObj.host);
     },
     create: function(args) {
         var curRoot = process.cwd();

lib/server.js

@@ -101,14 +101,14 @@ module.exports.start = function(port, pptDir) {
 
 }
 
-function startApp(port, dir) {
+function startApp(port, dir, host) {
+    host = host || '127.0.0.1';
     var staticDir = path.normalize(path.join(__dirname, '../assets')) + path.sep;
     var pptDir = (dir || path.join(__dirname, '../ppts')) + path.sep;
     try {
         pptDir = fs.realpathSync(pptDir) + path.sep;
     } catch (e) {}
-    console.log('Server :'.cyan + 'http://127.0.0.1:' + port);
-    console.log('ppt directory    : '.cyan + pptDir + '\n' + 'assets directory : '.cyan + staticDir);
+
     var now = Date.now();
     var app = connect(
         connect.cookieParser(),
@@ -152,26 +152,30 @@ function startApp(port, dir) {
 
                 realPath = pptDir + basename;
                 console.log('markdown', realPath);
-
                 markdown(realPath, basename, res)
                 return;
-
             } else {
                 //优先选择pptDir的静态资源
                 realPath = pptDir + url;
                 if (!fs.existsSync(realPath)) {
                     realPath = staticDir + url;
                 }
-
                 ext = path.extname(realPath);
                 ext = ext ? ext.slice(1) : 'unknown';
             }
-
             assets(realPath, ext, url, res);
-
-        }).listen(port);
-
-    return app;
+        }).listen(port, host);
+    return app.on('listening', function() {
+        var server = app.address();
+        console.log('ppt directory    : '.cyan + pptDir + '\n' + 'assets directory : '.cyan + staticDir);
+        console.log('nodeppt server started : '.bold.green + server.address + ':' + server.port);
+    }).on('error', function(e) {
+        if (e.code === 'EADDRINUSE') {
+            console.log('ERROR: '.red + 'port ' + port + ' is in use!');
+        } else {
+            console.log('ERROR: '.red + e.code);
+        }
+    });
 }
 
 function assets(realPath, ext, url, res) {

package.json

@@ -2,7 +2,7 @@
     "name": "nodeppt",
     "jsname": "nodeppt",
     "description": "Create a PowerPoint presentation with Markdown",
-    "version": "0.6.2",
+    "version": "0.6.3",
     "site": "https://github.com/ksky521/nodePPT",
     "author": {
         "name": "Theo Wang",