添加data.json

jaywcjlove · jaywcjlove · commit 85f9535885b6 · 2016-12-10T02:17:02.000+08:00
diff --git a/build/compile.js b/build/compile.js
@@ -240,30 +240,49 @@ function CreateStyl(styl_path,css_path){
 function CreateDatajs(dt_path,callback){
     // 获取 markdown文件所在的目录
     var path_md = path.join(path.dirname(__dirname),'command');
+    var path_dist = path.join(path.dirname(__dirname),'dist');
     if(!exists(path_md)) return console.log("\n  → error: 文件夹 "+path_md+" 不存在 \n ")
     // 获取 markdown 目录的集合
     var path_arr = readMDSync(path_md);
     path_arr = sortLength(path_arr);
-    var indexes = []
+    var indexes = [];
+
+    var command_data={}
     path_arr.forEach(function(md_path,i){
         var json = {}
         var con = fs.readFileSync(md_path);
         var str = con.toString();
         var title = str.match(/[^===]+(?=[===])/g);
+
+        title = title[0]?title[0].replace(/\n/g,''):title[0];
         // 命令名称
-        json["n"] = title[0]?title[0].replace(/\n/g,''):title[0];
+        json["n"] = title;
         // 命令路径
         json["p"] = md_path.replace(/\.md$/,'').replace(path_md,'');
         // 命令描述
         var des = str.match(/\n==={1,}([\s\S]*?)##/i);
-        json["d"] = des[1]?des[1].replace(/\n/g,''):des[1];
+        des = des[1]?des[1].replace(/\n/g,''):des[1];
+        des = des.replace(/\r/g,'')
+        json["d"] = des;
         indexes.push(json)
+
+        command_data[title] = json;
     })
     mkdirsSync(path.dirname(dt_path));
+
+    console.log("path.dirname(__dirname)",path.dirname(__dirname))
     //生成数据文件
     fs.writeFile(dt_path, 'var linux_commands='+JSON.stringify(indexes) , 'utf8',function(err){
         console.log(success("\n  → ")+"生成数据成功！"+dt_path+" \n ");
-        callback&&callback(dt_path,indexes);
+
+
+        path_dist = path.join(path_dist,'data.json')
+
+        fs.writeFile(path_dist, JSON.stringify(command_data) , 'utf8',function(err){
+            console.log(success("\n  → ")+"生成数据成功！"+path_dist+" \n ");
+            callback&&callback(dt_path,indexes);
+        });
+
     });
 }
 
diff --git a/dist/data.json b/dist/data.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "linux-command",
   "version": "1.0.0",
   "description": "Linux Command",
-  "main": "build/compile.js",
+  "main": "dist/data.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node build/compile.js",
@@ -18,7 +18,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jaywcjlove/linux-command.git"
+    "url": "git+https://github.com/jaywcjlove/linux-command.git"
   },
   "devDependencies": {
     "autoprefixer": "^6.5.1",
@@ -29,14 +29,18 @@
     "marked": "^0.3.6",
     "ssr": "^1.1.1",
     "stylus": "^0.54.5",
-    "watch": "^1.0.1"
-  },
-  "dependencies": {
+    "watch": "^1.0.1",
     "cheerio": "^0.22.0",
     "gh-pages": "^0.12.0",
     "loading-cli": "^1.0.2",
     "superagent": "^3.0.0",
     "to-markdown": "^3.0.3",
     "uglify-js": "^2.7.4"
-  }
+  },
+  "dependencies": {
+  },
+  "bugs": {
+    "url": "https://github.com/jaywcjlove/linux-command/issues"
+  },
+  "homepage": "https://jaywcjlove.github.io/linux-command/"
 }
