diff --git a/.vs/AAOlivia-Indicator-Bot/v15/.suo b/.vs/AAOlivia-Indicator-Bot/v15/.suo index dd2c232af..782f96eaf 100644 Binary files a/.vs/AAOlivia-Indicator-Bot/v15/.suo and b/.vs/AAOlivia-Indicator-Bot/v15/.suo differ diff --git a/Commons.js b/Commons.js index 384080203..fd8e99e35 100644 --- a/Commons.js +++ b/Commons.js @@ -22,7 +22,7 @@ return thisObject; - function initializeStorage(oliviaFileStorage, bruceFileStorage, callBackFunction) { + function initializeStorage(oliviaStorage, bruceStorage, callBackFunction) { try { @@ -32,7 +32,7 @@ function initializeBruceStorage() { - bruceFileStorage.initialize("AABruce", onBruceInizialized); + bruceStorage.initialize({ bot: "AABruce", devTeam: "AAMasters" }, onBruceInizialized); function onBruceInizialized(err) { @@ -49,7 +49,7 @@ function initializeOliviaStorage() { - oliviaFileStorage.initialize("AAOlivia", onOliviaInizialized); + oliviaStorage.initialize({ bot: "AAOlivia", devTeam: "AAMasters" }, onOliviaInizialized); function onOliviaInizialized(err) { diff --git a/Multi-Period-Daily/User.bot.js b/Multi-Period-Daily/User.bot.js index e98c68fc6..beadcdfb5 100644 --- a/Multi-Period-Daily/User.bot.js +++ b/Multi-Period-Daily/User.bot.js @@ -1,4 +1,4 @@ -exports.newUserBot = function newUserBot(BOT, COMMONS, UTILITIES, DEBUG_MODULE, FILE_STORAGE) { +exports.newUserBot = function newUserBot(BOT, COMMONS, UTILITIES, DEBUG_MODULE, FILE_STORAGE, BLOB_STORAGE) { const FULL_LOG = true; const LOG_FILE_CONTENT = false; @@ -32,8 +32,8 @@ start: start }; - let oliviaFileStorage = FILE_STORAGE.newFileStorage(bot); - let bruceFileStorage = FILE_STORAGE.newFileStorage(bot); + let oliviaStorage = FILE_STORAGE.newFileStorage(bot); + let bruceStorage = FILE_STORAGE.newFileStorage(bot); let utilities = UTILITIES.newUtilities(bot); @@ -51,7 +51,7 @@ dependencies = pDependencies; - commons.initializeStorage(oliviaFileStorage, bruceFileStorage, onInizialized); + commons.initializeStorage(oliviaStorage, bruceStorage, onInizialized); function onInizialized(err) { @@ -287,7 +287,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextCandleFile -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextCandleFile -> filePath = " + filePath); } - bruceFileStorage.getTextFile(filePath, fileName, onFileReceived, true); + bruceStorage.getTextFile(filePath, fileName, onFileReceived, true); function onFileReceived(err, text) { @@ -403,7 +403,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextVolumeFile -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextVolumeFile -> filePath = " + filePath); } - bruceFileStorage.getTextFile(filePath, fileName, onFileReceived, true); + bruceStorage.getTextFile(filePath, fileName, onFileReceived, true); function onFileReceived(err, text) { @@ -550,7 +550,7 @@ 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, oliviaFileStorage, onFolderCreated); + utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); function onFolderCreated(err) { @@ -562,7 +562,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for return; } - oliviaFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); function onFileCreated(err) { @@ -614,7 +614,7 @@ 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, oliviaFileStorage, onFolderCreated); + utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); function onFolderCreated(err) { @@ -626,7 +626,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for return; } - oliviaFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); function onFileCreated(err) { diff --git a/Multi-Period-Market/User.bot.js b/Multi-Period-Market/User.bot.js index 197bc3b44..6bf8d14c3 100644 --- a/Multi-Period-Market/User.bot.js +++ b/Multi-Period-Market/User.bot.js @@ -1,4 +1,4 @@ -exports.newUserBot = function newUserBot(BOT, COMMONS, UTILITIES, DEBUG_MODULE, FILE_STORAGE) { +exports.newUserBot = function newUserBot(BOT, COMMONS, UTILITIES, DEBUG_MODULE, FILE_STORAGE, BLOB_STORAGE) { const FULL_LOG = true; const LOG_FILE_CONTENT = false; @@ -32,8 +32,8 @@ start: start }; - let oliviaFileStorage = FILE_STORAGE.newFileStorage(bot); - let bruceFileStorage = FILE_STORAGE.newFileStorage(bot); + let oliviaStorage = BLOB_STORAGE.newBlobStorage(bot); + let bruceStorage = BLOB_STORAGE.newBlobStorage(bot); let utilities = UTILITIES.newUtilities(bot); @@ -51,7 +51,7 @@ dependencies = pDependencies; - commons.initializeStorage(oliviaFileStorage, bruceFileStorage, onInizialized); + commons.initializeStorage(oliviaStorage, bruceStorage, onInizialized); function onInizialized(err) { @@ -238,7 +238,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark if (FULL_LOG === true) { logger.write("[INFO] start -> findPreviousContent -> loopBody -> getCandles -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> findPreviousContent -> loopBody -> getCandles -> filePath = " + filePath); } - oliviaFileStorage.getTextFile(filePath, fileName, onFileReceived, true); + oliviaStorage.getTextFile(filePath, fileName, onFileReceived, true); function onFileReceived(err, text) { @@ -278,7 +278,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark if (FULL_LOG === true) { logger.write("[INFO] start -> findPreviousContent -> loopBody -> getVolumes -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> findPreviousContent -> loopBody -> getVolumes -> filePath = " + filePath); } - oliviaFileStorage.getTextFile(filePath, fileName, onFileReceived, true); + oliviaStorage.getTextFile(filePath, fileName, onFileReceived, true); function onFileReceived(err, text) { @@ -477,7 +477,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextCandleFile -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextCandleFile -> filePath = " + filePath); } - bruceFileStorage.getTextFile(filePath, fileName, onFileReceived, true); + bruceStorage.getTextFile(filePath, fileName, onFileReceived, true); function onFileReceived(err, text) { @@ -593,7 +593,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextVolumeFile -> fileName = " + fileName); } if (FULL_LOG === true) { logger.write("[INFO] start -> buildCandles -> periodsLoop -> loopBody -> nextVolumeFile -> filePath = " + filePath); } - bruceFileStorage.getTextFile(filePath, fileName, onFileReceived, true); + bruceStorage.getTextFile(filePath, fileName, onFileReceived, true); function onFileReceived(err, text) { @@ -739,7 +739,7 @@ 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, oliviaFileStorage, onFolderCreated); + utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); function onFolderCreated(err) { @@ -751,7 +751,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark return; } - oliviaFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); function onFileCreated(err) { @@ -802,7 +802,7 @@ 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, oliviaFileStorage, onFolderCreated); + utilities.createFolderIfNeeded(filePath, oliviaStorage, onFolderCreated); function onFolderCreated(err) { @@ -814,7 +814,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark return; } - oliviaFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); + oliviaStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); function onFileCreated(err) {