From e021039539a258f36d0596bfe4fdfc8a62aba129 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 14 Jan 2016 13:00:54 -0800 Subject: [PATCH] Add migration of Stack Manager data --- console/src/main.js | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/console/src/main.js b/console/src/main.js index bf054e4e2e..0cb5a2d891 100644 --- a/console/src/main.js +++ b/console/src/main.js @@ -29,11 +29,26 @@ var ProcessStates = hfprocess.ProcessStates; var ProcessGroup = hfprocess.ProcessGroup; var ProcessGroupStates = hfprocess.ProcessGroupStates; -function getApplicationDataDirectory() { + +function getRootHifiDataDirectory() { var rootDirectory = app.getPath('appData'); - return path.join(rootDirectory, '/High Fidelity/Console'); + return path.join(rootDirectory, '/High Fidelity'); } +function getStackManagerDataDirectory() { + return path.join(getRootHifiDataDirectory(), "../../Local/High Fidelity"); +} + +function getAssignmentClientResourcesDirectory() { + return path.join(getRootHifiDataDirectory(), '/assignment-client/resources'); +} + +function getApplicationDataDirectory() { + return path.join(getRootHifiDataDirectory(), '/Console'); +} + + +console.log("Root directory is: ", getRootHifiDataDirectory()); const ipcMain = electron.ipcMain; @@ -300,6 +315,19 @@ function maybeInstallDefaultContentSet() { return; } + // Check for existing Stack Manager data + const stackManagerDataPath = getStackManagerDataDirectory(); + console.log("Checking for existence of " + stackManagerDataPath); + var userHasExistingServerData = true; + try { + fs.accessSync(stackManagerDataPath); + } catch (e) { + console.log(e); + userHasExistingServerData = false; + } + + console.log("Existing data?", userHasExistingServerData); + // Show popup var window = new BrowserWindow({ icon: APP_ICON, @@ -319,7 +347,10 @@ function maybeInstallDefaultContentSet() { window.webContents.send('update', { state: state, args: args }); } - var unzipper = unzip.Extract({ path: 'download2', verbose: true }); + var unzipper = unzip.Extract({ + path: getAssignmentClientResourcesDirectory(), + verbose: true + }); unzipper.on('close', function() { console.log("Done", arguments); sendStateUpdate('complete'); @@ -336,8 +367,8 @@ function maybeInstallDefaultContentSet() { // Start downloading content set progress(request.get({ - url: "http://localhost:8000/contentSet.zip", - // url: "http://builds.highfidelity.com/interface-win64-3908.xe" + // url: "http://localhost:8000/contentSet.zip", + url: "http://builds.highfidelity.com/interface-win64-3914.exe" }, function(error, responseMessage, responseData) { if (error || responseMessage.statusCode != 200) { var message = '';