From 28221f910c62e505798cc37fce1263f10cb32f07 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sun, 11 Feb 2018 12:29:50 +0100 Subject: [PATCH] Process name changed --- .vs/AAOlivia/v15/.suo | Bin 26112 -> 23552 bytes .../Interval Executor.js | 0 {Index-Files => 24-hs-Market}/Interval.js | 10 +++++----- {Index-Files => 24-hs-Market}/run.js | 2 +- AAOlivia.njsproj | 9 ++++++--- 5 files changed, 12 insertions(+), 9 deletions(-) rename {Index-Files => 24-hs-Market}/Interval Executor.js (100%) rename {Index-Files => 24-hs-Market}/Interval.js (99%) rename {Index-Files => 24-hs-Market}/run.js (98%) diff --git a/.vs/AAOlivia/v15/.suo b/.vs/AAOlivia/v15/.suo index d75627611dee140a277a8484e6f210f208b371e1..e07628367fa47f2f124f38401250c576436dc8ec 100644 GIT binary patch delta 2701 zcmds3Urd`-6u%0$%2 zA`g2YX7ps)gW+NB$(LoUFMBX^4m3+N8H;E%S(X@0eDP^vhQ@4q&PPkWDdj;EHQwac zd(J)Q+*-|b3raGhe`ylhg!jAocu)he&eODxRo(>qY`F?S^g|M5Z>c< zcvBaV_uz6J;x`;{#_A|;MP^gL9~^q%qAhI@dkx5xBS6%QHW_xULZ&aqTq?Xv$OqDIbN>{Bl$);I? zx!DOe#jYJpn}1xM`aHP24z+&qDOid7jZ|J}sEo55?s!Mx8=naromD2mww^kraZD`S z`suTu-+t$7)UW5Kb1Ib%_x#gM`iQPtyK?yD{f(LrXbU=@#suCRG>F@AbFun}1e*68 z^)N4Uu?h6a#roJ7OR|$}oTb>eO`l6MM_`(u%R z2WOfGgn6ou9&6$3wJ|u?Z0Gl3*gL~#NO@lYWw_XBhLG<#Bt12m>%N=9o=tq0=!Fs3 z61ZFACXd%OG3DwTOP(B0jU=ZNu-x9rKO~W?7D2Yf3vUFBys(uhuy6sxyX`U$!kspU zS-t1Tkwj`dd3x-1_lYS*TCt-P?u8Cl9^>e9Zj2&*0O@dHU!)?u3U2GCL(3oARwelJ zJ`|LOZ&MzT;UP18AF^Hb%<+FBeGj+Ow{xg>$&Zr0 zovr>Ssk2bp=u@mt-ELWfj_wv?_#zJnngUJqKVyj{pDw delta 2558 zcmeHHT}WGZ6urV$Ho9mnh{l;{Vy=lF1(T}X7%4#pMQt# zfisnF8bfI1dHTk224I4HB_V=C5L^-(Oo)e@o10bmTaDO*Fd}LYXx@aV*j=#?Uk<`K zeG79!LD)-w28+Q`NH|!YKeWx__BUs }Wx6AP`1g=U=Ba`2120dDiP6(vIOS7k$u z4qYn|BEpQ&V)*^$dOX!4C_izt;29En*EWxW(7%g;{>BSE=+TStBKi<7A^H(MgdZ`0 z7=#*qZIg_rVMG`aL5v_q5o3sPFdAA`5+l0T@#Pre;Yw^aFQwTKWTZ)fS^~H1byNcj z!hQ4GEC3nf`>X9T6Nw}BUvYr6^#=TEw~}))ZHqFIs-oWPc-(8)5S!6p+huHwiWO*} zx$JnRn?A^!7Wq&mEY**RG%9M?&gXlks7Sq{ZtfVDU_%tpPpeA$Z_HwK zpRBncI|Y!PSHRn0Dw;fZS-x5>RY;4gRH$a@y&|xmVA+3|orUG*8NQ!`oZrEIhgSy{ zSqg&o1T;=dFg`d9X9qmRtAp2gLkP7&@ig2Q`S7e^bpEyEVn=u`l{^J^3U_&#J}<$?+tPA(I-hxNe8n5$MDcp)?2 zdHht#zKfbEGFDH*QyvW-tO)tps4+9V7xC(l_g1y=Zp0@lZ}4rz3)f>VI65i80bbdY?rn`lVySRQHo9Mi_eK!(cx`bL0w5Pd4|?+9pfK#sPr0EcY|)a!=Q$dBv2pri25atswKMWY{I?H}UH>_D z^=Pl|(gS7GPb3Z(+M0+XeBFEyE+3I-)j2p9>8&euOUbLmgIuJG@;fIV&p+Y`z?!2Q zx_Bu+<;5RSMG^PXw(85W=j;0{%6h)O|HJh)2ZIx-xzlqq$~{uLLs9$=zoK%ETZ`ej z9W|sDzalO`iBvx(spVFbR5`ss);$Dco`I68q8%q;3n{oZH3Xw=?eOKxQ;>7Jz;+~_ QZ~F}Xv>PDTYI(}%N5bmSR{#J2 diff --git a/Index-Files/Interval Executor.js b/24-hs-Market/Interval Executor.js similarity index 100% rename from Index-Files/Interval Executor.js rename to 24-hs-Market/Interval Executor.js diff --git a/Index-Files/Interval.js b/24-hs-Market/Interval.js similarity index 99% rename from Index-Files/Interval.js rename to 24-hs-Market/Interval.js index 75e07027c..d2faa9009 100644 --- a/Index-Files/Interval.js +++ b/24-hs-Market/Interval.js @@ -332,7 +332,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each maxCandleFile = new Date(statusReport.lastFile.year + "-" + statusReport.lastFile.month + "-" + statusReport.lastFile.days + " " + "00:00" + GMT_SECONDS); - getIndexFiles(); + getThisProcessReport(); } catch (err) { @@ -350,11 +350,11 @@ Read the candles and volumes from Bruce and produce a single Index File for each } } - function getIndexFiles() { + function getThisProcessReport() { /* If the process run and was interrupted, there should be a status report that allows us to resume execution. */ - reportFilePath = EXCHANGE_NAME + "/Processes/" + "Index-Files"; + reportFilePath = EXCHANGE_NAME + "/Processes/" + bot.process; oliviaAzureFileStorage.getTextFile(reportFilePath, fileName, onStatusReportReceived, true); @@ -750,7 +750,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each let fileName = '' + market.assetA + '_' + market.assetB + '.json'; - let filePath = EXCHANGE_NAME + "/Output/" + CANDLES_FOLDER_NAME; + let filePath = EXCHANGE_NAME + "/Output/" + CANDLES_FOLDER_NAME + "/" + bot.process; utilities.createFolderIfNeeded(filePath, oliviaAzureFileStorage, onFolderCreated); @@ -793,7 +793,7 @@ Read the candles and volumes from Bruce and produce a single Index File for each let fileName = '' + market.assetA + '_' + market.assetB + '.json'; - let filePath = EXCHANGE_NAME + "/Output/" + VOLUMES_FOLDER_NAME; + let filePath = EXCHANGE_NAME + "/Output/" + VOLUMES_FOLDER_NAME + "/" + bot.process; utilities.createFolderIfNeeded(filePath, oliviaAzureFileStorage, onFolderCreated); diff --git a/Index-Files/run.js b/24-hs-Market/run.js similarity index 98% rename from Index-Files/run.js rename to 24-hs-Market/run.js index c28940c1f..cd137207d 100644 --- a/Index-Files/run.js +++ b/24-hs-Market/run.js @@ -1,7 +1,7 @@  let bot = { name: "Olivia", - process: "Index-Files", + process: "24-hs-Market", type: "Indicator", version: "1.0.0", devTeam: "AA Masters" diff --git a/AAOlivia.njsproj b/AAOlivia.njsproj index 582782141..ad403231d 100644 --- a/AAOlivia.njsproj +++ b/AAOlivia.njsproj @@ -6,8 +6,8 @@ {aa2901bc-8f81-40f0-a402-5ca79a3f22ad} ShowAllFiles - Index-Files\run.js - c:\users\luis\source\repos\AAOlivia\Index-Files + 24-hs-Market\run.js + c:\users\luis\source\repos\AAOlivia\24-hs-Market . {3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD} 14.0 @@ -19,6 +19,9 @@ + + + @@ -34,7 +37,7 @@ - +