fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split code and config

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2020-05-23 14:09:07 +02:00
1 parent 9ae7a45d9d
commit c63ecf644a
6 files changed
+25 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/DailyFiles.js
+3 -3
View File
@@ -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)
}
src/FileCloud.js
+14 -14
View File
@@ -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())
src/FileCursor.js
+2 -2
View File
@@ -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)
src/FileSequence.js
+1 -1
View File
@@ -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) {
src/MarketFiles.js
+4 -4
View File
@@ -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) {
src/SingleFile.js
+1 -1
View File
@@ -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