diff --git a/.vs/AAOlivia/v15/.suo b/.vs/AAOlivia/v15/.suo index d75627611..e07628367 100644 Binary files a/.vs/AAOlivia/v15/.suo and b/.vs/AAOlivia/v15/.suo differ 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 @@ - +