@@ -240,30 +240,49 @@ function CreateStyl(styl_path,css_path){
240240function CreateDatajs ( dt_path , callback ) {
241241 // 获取 markdown文件所在的目录
242242 var path_md = path . join ( path . dirname ( __dirname ) , 'command' ) ;
243+ var path_dist = path . join ( path . dirname ( __dirname ) , 'dist' ) ;
243244 if ( ! exists ( path_md ) ) return console . log ( "\n → error: 文件夹 " + path_md + " 不存在 \n " )
244245 // 获取 markdown 目录的集合
245246 var path_arr = readMDSync ( path_md ) ;
246247 path_arr = sortLength ( path_arr ) ;
247- var indexes = [ ]
248+ var indexes = [ ] ;
249+
250+ var command_data = { }
248251 path_arr . forEach ( function ( md_path , i ) {
249252 var json = { }
250253 var con = fs . readFileSync ( md_path ) ;
251254 var str = con . toString ( ) ;
252255 var title = str . match ( / [ ^ = = = ] + (? = [ = = = ] ) / g) ;
256+
257+ title = title [ 0 ] ?title [ 0 ] . replace ( / \n / g, '' ) :title [ 0 ] ;
253258 // 命令名称
254- json [ "n" ] = title [ 0 ] ? title [ 0 ] . replace ( / \n / g , '' ) : title [ 0 ] ;
259+ json [ "n" ] = title ;
255260 // 命令路径
256261 json [ "p" ] = md_path . replace ( / \. m d $ / , '' ) . replace ( path_md , '' ) ;
257262 // 命令描述
258263 var des = str . match ( / \n = = = { 1 , } ( [ \s \S ] * ?) # # / i) ;
259- json [ "d" ] = des [ 1 ] ?des [ 1 ] . replace ( / \n / g, '' ) :des [ 1 ] ;
264+ des = des [ 1 ] ?des [ 1 ] . replace ( / \n / g, '' ) :des [ 1 ] ;
265+ des = des . replace ( / \r / g, '' )
266+ json [ "d" ] = des ;
260267 indexes . push ( json )
268+
269+ command_data [ title ] = json ;
261270 } )
262271 mkdirsSync ( path . dirname ( dt_path ) ) ;
272+
273+ console . log ( "path.dirname(__dirname)" , path . dirname ( __dirname ) )
263274 //生成数据文件
264275 fs . writeFile ( dt_path , 'var linux_commands=' + JSON . stringify ( indexes ) , 'utf8' , function ( err ) {
265276 console . log ( success ( "\n → " ) + "生成数据成功!" + dt_path + " \n " ) ;
266- callback && callback ( dt_path , indexes ) ;
277+
278+
279+ path_dist = path . join ( path_dist , 'data.json' )
280+
281+ fs . writeFile ( path_dist , JSON . stringify ( command_data ) , 'utf8' , function ( err ) {
282+ console . log ( success ( "\n → " ) + "生成数据成功!" + path_dist + " \n " ) ;
283+ callback && callback ( dt_path , indexes ) ;
284+ } ) ;
285+
267286 } ) ;
268287}
269288
0 commit comments