From c63ecf644a1998abc86080fbd59c441b9ad26e67 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 23 May 2020 14:09:07 +0200 Subject: [PATCH] Split code and config --- src/DailyFiles.js | 6 +++--- src/FileCloud.js | 28 ++++++++++++++-------------- src/FileCursor.js | 4 ++-- src/FileSequence.js | 2 +- src/MarketFiles.js | 8 ++++---- src/SingleFile.js | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/DailyFiles.js b/src/DailyFiles.js index 55cb27de9..d84a67d97 100644 --- a/src/DailyFiles.js +++ b/src/DailyFiles.js @@ -55,7 +55,7 @@ function newDailyFiles () { fileCloud.initialize(pBot, pHost, pPort) /* Some Validations */ - if (pDataset.code.validTimeFrames === undefined) { + if (pDataset.config.validTimeFrames === undefined) { if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = Can not initialize Market Files for bot ' + pBot.name) } if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = You need to define validTimeFrames at the Dataset config. ') } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) @@ -111,7 +111,7 @@ function newDailyFiles () { let periodTime = dailyFilePeriods[i][0] let periodName = dailyFilePeriods[i][1] - if (pDataset.code.validTimeFrames.includes(periodName) === true) { + if (pDataset.config.validTimeFrames.includes(periodName) === true) { let fileCursor = newFileCursor() fileCursor.eventHandler = thisObject.eventHandler // We share our event handler with each file cursor, so that they can raise events there when files are changed.s fileCursor.initialize(fileCloud, pDataMine, pBot, pSession, pProduct, pDataset, exchange, pMarket, periodName, periodTime, pDatetime, pTimeFrame, beginDateRange, endDateRange, pEventsServerClient, onInitialized) @@ -147,7 +147,7 @@ function newDailyFiles () { let periodTime = dailyFilePeriods[i][0] let periodName = dailyFilePeriods[i][1] - if (pDataset.code.validTimeFrames.includes(periodName) === true) { + if (pDataset.config.validTimeFrames.includes(periodName) === true) { let fileCursor = fileCursors.get(periodTime) fileCursor.reload(onFileReceived) } diff --git a/src/FileCloud.js b/src/FileCloud.js index 051705797..69dfac0d8 100644 --- a/src/FileCloud.js +++ b/src/FileCloud.js @@ -36,18 +36,18 @@ function newFileCloud () { function getFileRecursively (pRetryCounter, pDataMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, pPeriodName, pDatetime, pSequence, pDataRange, callBackFunction) { try { if (INFO_LOG === true) { logger.write('[INFO] getFile -> getFileRecursively -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] getFile -> getFileRecursively -> key = ' + pDataMine.code.codeName + '-' + pBot.code.codeName + '-' + pDataset.code.filePath + '-' + pDataset.code.fileName) } + if (INFO_LOG === true) { logger.write('[INFO] getFile -> getFileRecursively -> key = ' + pDataMine.config.codeName + '-' + pBot.config.codeName + '-' + pDataset.config.filePath + '-' + pDataset.config.fileName) } let fileName let filePath if (pDataRange === undefined) { - fileName = pDataset.code.fileName - filePath = pDataset.code.filePath + fileName = pDataset.config.fileName + filePath = pDataset.config.filePath } else { - if (pDataset.code.dataRange !== undefined) { - fileName = pDataset.code.dataRange.fileName - filePath = pDataset.code.dataRange.filePath + if (pDataset.config.dataRange !== undefined) { + fileName = pDataset.config.dataRange.fileName + filePath = pDataset.config.dataRange.filePath } else { let customErr = { result: GLOBAL.CUSTOM_FAIL_RESPONSE.result, @@ -80,19 +80,19 @@ function newFileCloud () { } if (pDataMine !== undefined) { - filePath = filePath.replace('@DataMine', pDataMine.code.codeName) + filePath = filePath.replace('@DataMine', pDataMine.config.codeName) } if (pBot !== undefined) { - filePath = filePath.replace('@Bot', pBot.code.codeName) + filePath = filePath.replace('@Bot', pBot.config.codeName) } if (pSession !== undefined) { - let code + let config let sessionFolderName = pSession.id - if (pSession.code !== undefined) { - if (pSession.code.folderName !== undefined) { - sessionFolderName = pSession.code.folderName + '-' + pSession.id + if (pSession.config !== undefined) { + if (pSession.config.folderName !== undefined) { + sessionFolderName = pSession.config.folderName + '-' + pSession.id } } filePath = filePath.replace('@Session', sessionFolderName) @@ -103,8 +103,8 @@ function newFileCloud () { } filePath = filePath.replace('@Period', pPeriodName) - filePath = filePath.replace('@Dataset', pDataset.code.codeName) - filePath = filePath.replace('@Product', pProduct.code.codeName) + filePath = filePath.replace('@Dataset', pDataset.config.codeName) + filePath = filePath.replace('@Product', pProduct.config.codeName) if (pDatetime !== undefined) { filePath = filePath.replace('@Year', pDatetime.getUTCFullYear()) diff --git a/src/FileCursor.js b/src/FileCursor.js index 29ddb900e..85f3bcc8c 100644 --- a/src/FileCursor.js +++ b/src/FileCursor.js @@ -108,11 +108,11 @@ function newFileCursor () { endDateRange = pEndDateRange eventsServerClient = pEventsServerClient - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset + let key = dataMine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + dataset.config.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset let callerId = key + '-' + periodName + newUniqueId() eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponseDataSet, updateFiles) - key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset + key = dataMine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset callerId = key + '-' + periodName + newUniqueId() eventsServerClient.listenToEvent(key, 'Data Range Updated', undefined, callerId, onResponseDataRange, updateDataRange) diff --git a/src/FileSequence.js b/src/FileSequence.js index f14de19f4..187576503 100644 --- a/src/FileSequence.js +++ b/src/FileSequence.js @@ -88,7 +88,7 @@ function newFileSequence () { callerId = newUniqueId() - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset + let key = dataMine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + dataset.config.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles) function onResponse (message) { diff --git a/src/MarketFiles.js b/src/MarketFiles.js index 666389d08..a6b0187bb 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -95,7 +95,7 @@ function newMarketFiles () { fileCloud.initialize(pBot, pHost, pPort) /* Some Validations */ - if (dataset.code.validTimeFrames === undefined) { + if (dataset.config.validTimeFrames === undefined) { if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = Can not initialize Market Files for bot ' + pBot.name) } if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = You need to define validTimeFrames at the Dataset config. ') } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) @@ -108,7 +108,7 @@ function newMarketFiles () { let periodTime = marketFilesPeriods[i][0] let periodName = marketFilesPeriods[i][1] - if (dataset.code.validTimeFrames.includes(periodName) === true) { + if (dataset.config.validTimeFrames.includes(periodName) === true) { fileCloud.getFile(dataMine, bot, session, product, dataset, exchange, market, periodName, undefined, undefined, undefined, onFileReceived) function onFileReceived (err, file) { @@ -122,7 +122,7 @@ function newMarketFiles () { } if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) { - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset + let key = dataMine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + dataset.config.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset let callerId = key + '-' + periodName + newUniqueId() eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles) @@ -156,7 +156,7 @@ function newMarketFiles () { let periodTime = marketFilesPeriods[i][0] let periodName = marketFilesPeriods[i][1] - if (dataset.code.validTimeFrames.includes(periodName) === true) { + if (dataset.config.validTimeFrames.includes(periodName) === true) { fileCloud.getFile(dataMine, bot, session, product, dataset, exchange, market, periodName, undefined, undefined, undefined, onFileReceived) function onFileReceived (err, file) { diff --git a/src/SingleFile.js b/src/SingleFile.js index 17d2542de..9a6fdbae8 100644 --- a/src/SingleFile.js +++ b/src/SingleFile.js @@ -30,7 +30,7 @@ function newSingleFile () { callBackFunction) { try { if (INFO_LOG === true) { logger.write('[INFO] initialize -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> key = ' + pDataMine.code.codeName + '-' + pBot.code.codeName + '-' + pProduct.code.codeName) } + if (INFO_LOG === true) { logger.write('[INFO] initialize -> key = ' + pDataMine.config.codeName + '-' + pBot.config.codeName + '-' + pProduct.config.codeName) } let exchange = pExchange