修复ppt路径的问题

当自建一个文件夹，取名不是ppt时，解析会有问题。现在将默认的ppt和自建的文件夹处理方式合并，使得流程更清晰
blackMao · May 30, 2014 · bf742ff · bf742ff
1 parent cb0fc55
commit bf742ff
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/lib/server.js b/lib/server.js
@@ -119,24 +119,20 @@ function startApp(port, dir, host, argvObj) {
         }),
 
         function(req, res) {
-            var url = URL.parse(req.url).path;
+            var url = URL.parse(req.url).pathname;
             var dirname = path.dirname(url);
             var realPath, ext;
 
-            if (dirname === '/ppt') {
-
-                var uid = req.session.uid;
-                if (!uid) {
-                    uid = now++; //当前连接用户的UID
-                    req.session.uid = uid;
-                    console.log('new user: ' + uid);
-                } else {
-                    console.log('welcome back ' + uid);
-                }
-
-                realPath = pptDir + path.basename(url);
-                ext = 'html';
-            } else if (dirname === '/') {
+            var uid = req.session.uid;
+            if (!uid) {
+                uid = now++; //当前连接用户的UID
+                req.session.uid = uid;
+                console.log('new user: ' + uid);
+            } else {
+                console.log('welcome back ' + uid);
+            }
+
+            if (dirname === '/') {
                 pptlist(res, pptDir, argvObj);
                 return;
             } else if (dirname === '/md') {
@@ -157,6 +153,7 @@ function startApp(port, dir, host, argvObj) {
                 return;
             } else {
                 //优先选择pptDir的静态资源
+                url = url.indexOf("/") === 0 ? url.substring(1) : url;
                 realPath = pptDir + url;
                 if (!fs.existsSync(realPath)) {
                     realPath = staticDir + url;