re:update: check the file exists before create it

Author: ReAlign

.gitignore

@@ -4,8 +4,9 @@ dist/
 coverage/
 *.rar
 npm-debug.log
-webapp/src/mcss/
-webapp/src/page/
-webapp/WEB-INF/view/
+
+sample/webapp/src/mcss/
+sample/webapp/src/page/
+sample/webapp/WEB-INF/view/
 
 package-lock.json

lib/main.js

@@ -1,27 +1,27 @@
 let fs = require('fs');
-let moment = require('moment');
 let log = require('n-s-logs');
+let moment = require('moment');
 let tool = require('./util/tool');
 let exec = require('child_process').exec;
 
-var file = {};
+let file = {};
 
 let main = (fpConfig, conf) => {
     // config list
-    var _keys = fpConfig.list;
+    let _keys = fpConfig.list;
     // page file absolute path
-    var _cachePath = conf.pageConf;
+    let _cachePath = conf.pageConf;
     // inquirer answers, about name & path
-    var _answers = conf.answers;
+    let _answers = conf.answers;
     // folder path [arr]
-    var _folderPath = _answers.folderPath;
+    let _folderPath = _answers.folderPath;
     // page template config
-    var _tempConf = conf.tempConf;
+    let _tempConf = conf.tempConf;
     // template names
-    var _names = conf.names;
+    let _names = conf.names;
     // folder path [str]
-    var _folderPathArr = _folderPath.split('/');
-    var _keysPath = {},   // path about
+    let _folderPathArr = _folderPath.split('/');
+    let _keysPath = {},   // path about
         _replaceArr = {};
 
     _keysPath = tool.initPrivKeysPath(_keys, conf, _folderPathArr, _answers);
@@ -36,11 +36,11 @@ let main = (fpConfig, conf) => {
                 if (stderr) {
                     log.error(stderr);
                 }
-                var arr = {};
-                var strArr = stdout.toString().split('\n');
+                let arr = {};
+                let strArr = stdout.toString().split('\n');
                 strArr.forEach((item) => {
-                    var i = item.indexOf('=');
-                    var _arr = [item.substring(0, i), item.substring(i + 1)];
+                    let i = item.indexOf('=');
+                    let _arr = [item.substring(0, i), item.substring(i + 1)];
                     if(arr[_arr[0]]) {
                         arr[_arr[0] + '.pro'] = arr[_arr[0]];
                         arr[_arr[0]] = _arr[1];
@@ -58,7 +58,11 @@ let main = (fpConfig, conf) => {
         return new Promise((res) => {
             (async function () {
                 for (let layer of _keysPath[flag]) {
-                    fs.existsSync(_cachePath[flag] + layer) ? _cachePath[flag] = _cachePath[flag] + layer + '/' : await mkdir(layer, flag);
+                    const _file = `${_cachePath[flag]}${layer}`;
+
+                    fs.existsSync(_file)
+                        ? _cachePath[flag] = `${_file}/`
+                        : await mkdir(layer, flag);
                 }
                 res(_cachePath[flag]);
             })()
@@ -67,12 +71,13 @@ let main = (fpConfig, conf) => {
 
     let mkdir = (layer, flag) => {
         return new Promise((res, rej) => {
-            fs.mkdir(_cachePath[flag] + layer, (err) => {
+            const _file = `${_cachePath[flag]}${layer}`;
+            fs.mkdir(_file, (err) => {
                 if (err) {
                     log.error(err);
                     rej(err);
                 }
-                _cachePath[flag] = _cachePath[flag] + layer + '/'
+                _cachePath[flag] = `${_file}/`;
                 res(_cachePath[flag]);
             });
         })
@@ -81,8 +86,8 @@ let main = (fpConfig, conf) => {
     let replaceAll = (flag, replaceList = [], info) => {
         for (let layer of _tempConf[flag]) {
             let text = fs.readFileSync(layer).toString();
-            var arr = layer.split('/');
-            var k = arr[arr.length - 1].replace(/\./g, '');
+            let arr = layer.split('/');
+            let k = arr[arr.length - 1].replace(/\./g, '');
             text = text.replace(/~date~/g, moment().format('YYYY-MM-DD'))
                         .replace(/~author~/g, (info['user.name'] || '') + '(' + (info['user.email'] || '') + ')')
                         .replace(/~headTitle~/g, _replaceArr.headTitle)
@@ -93,8 +98,8 @@ let main = (fpConfig, conf) => {
 
             if(replaceList.length) {
                 replaceList.every(function(item) {
-                    var global = item.global ? 'g' : '';
-                    var rex = new RegExp(item.rex, global);
+                    let global = item.global ? 'g' : '';
+                    let rex = new RegExp(item.rex, global);
                     text = text.replace(rex, item.str);
 
                     return true;
@@ -117,11 +122,19 @@ let main = (fpConfig, conf) => {
         return new Promise((res, rej) => {
             (async () => {
                 for (let layer of _names[flag]) {
-                    var k = layer.replace(/\./g, '');
-                    await fs.writeFile(_cachePath[flag] + '/' + layer,
-                        file[k], (err) => {
-                            if (err) rej(err)
-                        })
+                    const _k = layer.replace(/\./g, '');
+                    const _file = `${_cachePath[flag]}${layer}`;
+                    const _exists = fs.existsSync(_file);
+
+                    if(_exists) {
+                        log.warn(`${_file} already exists.`);
+                    } else {
+                        await fs.writeFile(_file, file[_k], (err) => {
+                            if(err) {
+                                rej(err);
+                            }
+                        });
+                    }
                 }
                 res('succ');
             })()
@@ -134,7 +147,7 @@ let main = (fpConfig, conf) => {
                 await exists(i.key);
                 await readFile(i.key);
                 await writeFile(await readFile(i.key), i.key);
-                log.ok('successfully created ' + i.key + ' directory and associated files');
+                log.ok(`successfully created ${i.key} directory and associated files`);
                 file = {};
             } catch (err) {
                 log.error(err);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastpage",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "a tool to quickly generate front-end pages and associated files",
   "main": ".eslintrc.js",
   "bin": {