git pull

merge.js

 const fs = require('fs')
 let moment = require('moment-timezone')
 let _ = require('lodash')
-const uuid=require('uniqid')
-let pairs=''
+const uuid = require('uniqid')
+let pairs = ''
 let res
 init()
 
@@ -10,24 +10,22 @@ init()
 async function init() {
 
 
-let arr=[]
+    let arr = []
     let files = await fs.readdirSync('E:\\fail\\btc1')
-    for(let i=0;i<files.length;i++)
-    {
+    for (let i = 0; i < files.length; i++) {
         if (!files[i].includes('.csv'))
             continue
-       arr.push(read('E:\\fail\\btc1\\'+files[i],files[i]))
+        arr.push(read('E:\\fail\\btc1\\' + files[i], files[i]))
     }
 
     let files2 = await fs.readdirSync('E:\\fail\\btc2')
-    for(let i=0;i<files2.length;i++)
-    {
+    for (let i = 0; i < files2.length; i++) {
         if (!files2[i].includes('.csv'))
             continue
-        arr.push(read('E:\\fail\\btc2\\'+files2[i],files2[i]))
+        arr.push(read('E:\\fail\\btc2\\' + files2[i], files2[i]))
     }
 
-  //  console.log(files)
+    //  console.log(files)
     // let com = await fs.readFileSync('E:\\fail\\btc1', 'utf8');
     // com = JSON.parse(com)
 
@@ -35,33 +33,38 @@ let arr=[]
 }
 
 
-async function read(dir,name)
-{
-    let arr=[]
-     let com = await fs.readFileSync(dir, 'utf8');
-     com=com.split('\n')
-    name=name.split('_')
-    let uniq=name[4]+'_'+name[5]
-    uniq=uniq.replace('.csv','')
+async function read(dir, name) {
+    let arr = []
+    let com = await fs.readFileSync(dir, 'utf8');
+    com = com.split('\n')
+    name = name.split('_')
+    let uniq = name[4] + '_' + name[5]
+    uniq = uniq.replace('.csv', '')
     console.log(uniq)
-  //  console.log(com.length)
-     for (let i=1;i<com.length;i++)
-     {
+    //  console.log(com.length)
+    for (let i = 1; i < com.length; i++) {
+        let pars = com[i].split(',')
+        let obj = {}
+        obj.time = pars[1]
+        obj.data=pars
+        arr.push(obj)
 
-     }
-   //  console.log(com)
+    }
+
+    console.log(uniq,arr)
+    //  console.log(com)
     // com = JSON.parse(com)
 }
+
 function isUpper(str) {
     return !/[a-z]/.test(str) && /[A-Z]/.test(str);
 }
 
-function capital(t)
-{
-    let f=''
-    for (let j=0;j<t.length;j++)
+function capital(t) {
+    let f = ''
+    for (let j = 0; j < t.length; j++)
         if (isUpper(t[j]))
-            f=f+t[j]
+            f = f + t[j]
 
     return f
 }
@@ -69,7 +72,7 @@ function capital(t)
 function createRunResfileADV(data) {
     // console.log(data)
     return new Promise(function (resolve, reject) {
-        fs.writeFile(pairs+'_TOP.csv', data, 'utf8', function (err) {
+        fs.writeFile(pairs + '_TOP.csv', data, 'utf8', function (err) {
             if (err) reject(err);
             else resolve(data);
         });
@@ -79,7 +82,7 @@ function createRunResfileADV(data) {
 function createComResfileADV(data) {
     // console.log(data)
     return new Promise(function (resolve, reject) {
-        fs.writeFile(pairs+'newCom.json', data, 'utf8', function (err) {
+        fs.writeFile(pairs + 'newCom.json', data, 'utf8', function (err) {
             if (err) reject(err);
             else resolve(data);
         });
@@ -94,15 +97,14 @@ function found(pair, lp) {
 
         let d = res[i].split(',')
         let timeframe = d[13]
-        timeframe=timeframe.split(' ')
-        let newTimeframe='0d '
-        for (let z=1;z<timeframe.length;z++)
-        {
-            newTimeframe=newTimeframe+timeframe[z]
-            if (z !== timeframe.length-1)
-                newTimeframe=newTimeframe+' '
+        timeframe = timeframe.split(' ')
+        let newTimeframe = '0d '
+        for (let z = 1; z < timeframe.length; z++) {
+            newTimeframe = newTimeframe + timeframe[z]
+            if (z !== timeframe.length - 1)
+                newTimeframe = newTimeframe + ' '
         }
-        timeframe=newTimeframe
+        timeframe = newTimeframe
         let pvt = parseFloat(d[14])
         let factor = parseFloat(d[15])
         let period = d[106]

test_text.js

-let t='220818102341_O1_BNC_BTCUSDT_Lp19500_22BTC13.csv'
-t=t.split('_')
-let uniq=t[4]+'_'+t[5]
-uniq=uniq.replace('.csv','')
-console.log(uniq)
+let t='12,2019.10.22 12:00:00.000,Buy,BNC_BTCUSDT,8276.170,7425.960,2019.10.23 16:00:00.000,-10.27,0.26,-10.59'
+t=t.split(',')
+console.log(t)
+