From 3ff8864ecbefa898a644b8cba236ee6ca309939a Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 5 Jun 2018 21:34:43 +0200 Subject: [PATCH] Eliminating Create Folder --- Multi-Period-Daily/User.bot.js | 95 ++++++++++----------------------- Multi-Period-Market/User.bot.js | 66 +++++++---------------- 2 files changed, 48 insertions(+), 113 deletions(-) diff --git a/Multi-Period-Daily/User.bot.js b/Multi-Period-Daily/User.bot.js index afd4f5ec1..2b3334ee7 100644 --- a/Multi-Period-Daily/User.bot.js +++ b/Multi-Period-Daily/User.bot.js @@ -598,38 +598,25 @@ Read the candles and volumes from Bruce and produce a file for each day and for if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> filePath = " + filePath); } - utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFolderCreated(err) { + function onFileCreated(err) { - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> onFolderCreated -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> onFileCreated -> Entering function."); } if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeCandles -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] start -> writeFiles -> writeCandles -> onFileCreated -> err = " + err.message); callBackFunction(err); return; } - oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - - function onFileCreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> err = " + err.message); - callBackFunction(err); - return; - } - - if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); - } - - logger.write("[WARN] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName); - - writeVolumes(); + if (LOG_FILE_CONTENT === true) { + logger.write("[INFO] start -> writeFiles -> writeCandles -> onFileCreated -> Content written = " + fileContent); } + + logger.write("[WARN] start -> writeFiles -> writeCandles -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName); + + writeVolumes(); } } @@ -662,38 +649,25 @@ Read the candles and volumes from Bruce and produce a file for each day and for if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> filePath = " + filePath); } - utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFolderCreated(err) { + function onFileCreated(err) { - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFolderCreated -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFileCreated -> Entering function."); } if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeVolumes -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] start -> writeFiles -> writeVolumes -> onFileCreated -> err = " + err.message); callBackFunction(err); return; } - oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - - function onFileCreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> err = " + err.message); - callBackFunction(err); - return; - } - - if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); - } - - logger.write("[WARN] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName); - - callBack(); + if (LOG_FILE_CONTENT === true) { + logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFileCreated -> Content written = " + fileContent); } + + logger.write("[WARN] start -> writeFiles -> writeVolumes -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName); + + callBack(); } } } @@ -763,36 +737,23 @@ Read the candles and volumes from Bruce and produce a file for each day and for if (FULL_LOG === true) { logger.write("[INFO] start -> writeDataRange -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> writeDataRange -> filePath = " + filePath); } - utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFolderCreated(err) { + function onFileCreated(err) { - if (FULL_LOG === true) { logger.write("[INFO] start -> writeDataRange -> onFolderCreated -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] start -> writeDataRange -> onFileCreated -> Entering function."); } if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeDataRange -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] start -> writeDataRange -> onFileCreated -> err = " + err.message); callBack(err); return; } - oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - - function onFileCreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> writeDataRange -> onFolderCreated -> onFileCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeDataRange -> onFolderCreated -> onFileCreated -> err = " + err.message); - callBack(err); - return; - } - - if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> writeDataRange -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); - } - - callBack(global.DEFAULT_OK_RESPONSE); + if (LOG_FILE_CONTENT === true) { + logger.write("[INFO] start -> writeDataRange -> onFileCreated -> Content written = " + fileContent); } + + callBack(global.DEFAULT_OK_RESPONSE); } } catch (err) { diff --git a/Multi-Period-Market/User.bot.js b/Multi-Period-Market/User.bot.js index da6e869d2..5948ec3f5 100644 --- a/Multi-Period-Market/User.bot.js +++ b/Multi-Period-Market/User.bot.js @@ -771,38 +771,25 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> filePath = " + filePath); } - utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFolderCreated(err) { + function onFileCreated(err) { - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> onFolderCreated -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> onFileCreated -> Entering function."); } if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeCandles -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] start -> writeFiles -> writeCandles -> onFileCreated -> err = " + err.message); callBackFunction(err); return; } - oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - - function onFileCreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> err = " + err.message); - callBackFunction(err); - return; - } - - if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); - } - - logger.write("[WARN] start -> writeFiles -> writeCandles -> onFolderCreated -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName ); - - writeVolumes(); + if (LOG_FILE_CONTENT === true) { + logger.write("[INFO] start -> writeFiles -> writeCandles -> onFileCreated -> Content written = " + fileContent); } + + logger.write("[WARN] start -> writeFiles -> writeCandles -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName ); + + writeVolumes(); } } @@ -834,38 +821,25 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> filePath = " + filePath); } - utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFolderCreated(err) { + function onFileCreated(err) { - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFolderCreated -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFileCreated -> Entering function."); } if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeVolumes -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] start -> writeFiles -> writeVolumes -> onFileCreated -> err = " + err.message); callBackFunction(err); return; } - oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - - function onFileCreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> err = " + err.message); - callBackFunction(err); - return; - } - - if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); - } - - logger.write("[WARN] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName); - - callBack(); + if (LOG_FILE_CONTENT === true) { + logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFileCreated -> Content written = " + fileContent); } + + logger.write("[WARN] start -> writeFiles -> writeVolumes -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName); + + callBack(); } } }