refactor select

src/cli/helpers/abe-sql.js

@@ -323,8 +323,6 @@ export default class Sql {
 
     var dateStart = new Date()
 
-    console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
-    console.log('executeFromClause')
     var list = Manager.instance.getList()
     var files_array = list.filter((element, index, arr) => {
       if(element.published) {
@@ -334,7 +332,6 @@ export default class Sql {
       }
       return false
     })
-        console.log(((new Date().getTime() - dateStart.getTime()) / 1000) + 'sec')
     return files_array
 
     // if(folderUtils.isFolder(fromDirectory)) {

src/cli/helpers/abe-time-mesure.js

@@ -0,0 +1,37 @@
+import clc from 'cli-color'
+
+export default class TimeMesure {
+
+  constructor(str) {
+    this._name = str
+    console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
+    if(typeof str !== 'undefined' && str !== null) {
+      console.log('start: ' + clc.green(str))
+    }
+    this._dateStart = new Date()
+  }
+
+  _msToTime(duration) {
+      var milliseconds = parseInt((duration%1000)/100)
+          , seconds = parseInt((duration/1000)%60)
+          , minutes = parseInt((duration/(1000*60))%60)
+          , hours = parseInt((duration/(1000*60*60))%24);
+
+      hours = (hours < 10) ? "0" + hours : hours;
+      minutes = (minutes < 10) ? "0" + minutes : minutes;
+      seconds = (seconds < 10) ? "0" + seconds : seconds;
+
+      return hours + ":" + minutes + ":" + seconds + "." + milliseconds;
+  }
+
+  /**
+   * Get all input from a template
+   * @return {Array} array of input form
+   */
+  duration(str) {
+    var d = new Date(new Date().getTime() - this._dateStart.getTime()).getTime()
+    console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
+    console.log('d', d)
+    console.log((this._name ? 'end ' + this._name : "") + "(" + clc.green(this._msToTime(d)) + ") " + (str ? str : ""))
+  }
+}

src/cli/helpers/abe-utils.js

@@ -23,6 +23,7 @@ import {
   ,getAttr
   ,Hooks
   ,Plugins
+  ,TimeMesure
 } from '../'
 
 export default class Utils {
@@ -446,15 +447,13 @@ export default class Utils {
 
   static performDataList(tplPath, text, jsonPage, matches, cb) {
     var match = matches.shift()
-    var dateStart = new Date()
+    var t = new TimeMesure('performDataList')
 
-    console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
-    console.log('performDataList')
-    console.log(match)
+    console.log(match[0])
 
-    Utils.nextDataList(tplPath, text, jsonPage, match)
+    Utils.nextDataList(tplPath, text, jsonPage, match[0])
       .then(() => {
-        console.log(((new Date().getTime() - dateStart.getTime()) / 1000) + 'sec')
+        t.duration()
         if (matches.length > 0) {
           Utils.performDataList(tplPath, text, jsonPage, matches, cb)
         }else {
@@ -472,9 +471,7 @@ export default class Utils {
       var promises = []
       let util = new Utils()
       var matches = util.dataRequest(text)
-      console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
-      console.log('matches', matches)
-      Utils.performDataList(tplPath, text, jsonPage, matches[0], () => {
+      Utils.performDataList(tplPath, text, jsonPage, matches, () => {
         resolve()
       })
       // Array.prototype.forEach.call(matches, (match) => {

src/cli/helpers/file-parser.js

@@ -18,6 +18,7 @@ import {
   ,Manager
   ,set_deep_value
   ,deep_value
+  ,TimeMesure
 } from '../'
 
 export default class FileParser {
@@ -397,13 +398,20 @@ export default class FileParser {
 
     var files = FileParser.getFiles(path.join(config.root, config.data.url), true, 99, /\.json/)
     var filesArr = []
+
+    var i = 0
+
+    var t2 = new TimeMesure('files.forEach')
     files.forEach(function (file) {
+      // var t = new TimeMesure('add files')
       var cleanFile = file
       var json = FileParser.getJson(file.path)
 
       if(typeof json.abe_meta !== 'undefined' && json.abe_meta !== null) {
         cleanFile.abe_meta = json.abe_meta
       }
+      /**
+       * OLD
       Array.prototype.forEach.call(withKeys, (key) => {
         // console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
         // console.log(key, key.split('.').reduce((o,i)=>o[i], json))
@@ -414,8 +422,19 @@ export default class FileParser {
           set_deep_value(cleanFile, key, deep_value(json, key))
         }
       })
+      */
+      Array.prototype.forEach.call(withKeys, (key) => {
+        var current = json
+        key.split('.').forEach(function(p){ current = current[p] })
+
+        console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
+        console.log('current', current)
+      })
       filesArr.push(cleanFile)
+      // t.duration()
     })
+    t2.duration()
+
     console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
     console.log('filesArr[0]', filesArr[0])
     var merged = fileUtils.getFilesMerged(filesArr)

src/cli/index.js

@@ -55,6 +55,7 @@ import Plugins from './helpers/abe-plugins'
 import Locales from './helpers/abe-locales'
 
 import getSelectTemplateKeys from './helpers/abe-get-select-template-keys'
+import TimeMesure from './helpers/abe-time-mesure'
 
 export {
 	fileAttr
@@ -112,6 +113,7 @@ export {
 	,Manager
 	,Page
 	,getSelectTemplateKeys
+	,TimeMesure
 }
 
 export {compileAbe as compileAbe}

src/cli/models/Manager.js

@@ -7,6 +7,7 @@ import {
   FileParser,
   fileUtils,
   folderUtils,
+  TimeMesure,
   getSelectTemplateKeys
 } from '../../cli'