Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 01:10:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8656 from Atlante45/home-content-update

Browse source 
Ask if user want to update home content when available
This commit is contained in:
Stephen Birarda 2016-09-26 13:26:41 -07:00 committed by GitHub
commit 43a3a9a7bd
1 changed files with 134 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
server-console/src/main.js
View file

@ -42,6 +42,8 @@ const appIcon = path.join(__dirname, '../resources/console.png');
const DELETE_LOG_FILES_OLDER_THAN_X_SECONDS = 60 * 60 * 24 * 7; // 7 Days
const LOG_FILE_REGEX = /(domain-server|ac-monitor|ac)-.*-std(out|err).txt/;
const HOME_CONTENT_URL = "http://cachefly.highfidelity.com/home.tgz";
function getBuildInfo() {
var buildInfoPath = null;
@ -486,6 +488,76 @@ function updateTrayMenu(serverState) {
const httpStatusPort = 60332;
function deleteResourceDirectories() {
const dsResourceDirectory = getDomainServerClientResourcesDirectory();
try {
fs.removeSync(dsResourceDirectory);
console.log("Deleted directory " + dsResourceDirectory);
} catch (e) {
console.log(e);
}
const acResourceDirectory = getAssignmentClientResourcesDirectory();
try {
fs.removeSync(acResourceDirectory);
console.log("Deleted directory " + acResourceDirectory);
} catch (e) {
console.log(e);
}
}
function deleteResourceDirectoriesAndRestart() {
homeServer.stop();
deleteResourceDirectories();
maybeInstallDefaultContentSet(onContentLoaded);
}
function checkNewContent() {
// Start downloading content set
var req = request.head({
url: HOME_CONTENT_URL
}, function (error, response, body) {
if (error === null) {
var localContent = Date.parse(userConfig.get('homeContentLastModified'));
var remoteContent = Date.parse(response.headers['last-modified']);
var shouldUpdate = isNaN(localContent) || (!isNaN(remoteContent) && (remoteContent > localContent));
var wantDebug = false;
if (wantDebug) {
console.log('Last Modified: ' + response.headers['last-modified']);
console.log(localContent + " " + remoteContent + " " + shouldUpdate + " " + new Date());
console.log("Remote content is " + (shouldUpdate ? "newer" : "older") + " that local content.");
}
if (shouldUpdate) {
dialog.showMessageBox({
type: 'question',
buttons: ['Yes', 'No'],
title: 'New home content',
message: 'A newer version of the home content set is available.\nDo you wish to update?'
}, function(idx) {
if (idx === 0) {
dialog.showMessageBox({
type: 'question',
buttons: ['Yes', 'No'],
title: 'Are you sure?',
message: 'This action will delete your current sandbox content.\nDo you wish to continue?'
}, function(idx) {
if (idx === 0 && homeServer) {
deleteResourceDirectoriesAndRestart();
}
});
} else {
// They don't want to update, mark content set as current
userConfig.set('homeContentLastModified', new Date());
}
});
}
}
});
}
function maybeInstallDefaultContentSet(onComplete) {
// Check for existing data
const acResourceDirectory = getAssignmentClientResourcesDirectory();
@ -517,6 +589,8 @@ function maybeInstallDefaultContentSet(onComplete) {
if (userHasExistingACData || userHasExistingDSData) {
console.log("User has existing data, suppressing downloader");
onComplete();
checkNewContent();
return;
}
@ -528,6 +602,7 @@ function maybeInstallDefaultContentSet(onComplete) {
return console.error(err)
}
console.log('Copied home content over to: ' + getRootHifiDataDirectory());
userConfig.set('homeContentLastModified', new Date());
onComplete();
});
return;
@ -566,7 +641,7 @@ function maybeInstallDefaultContentSet(onComplete) {
// Start downloading content set
var req = progress(request.get({
url: "http://cachefly.highfidelity.com/home.tgz"
url: HOME_CONTENT_URL
}, function(error, responseMessage, responseData) {
if (aborted) {
return;
@ -607,6 +682,7 @@ function maybeInstallDefaultContentSet(onComplete) {
req.pipe(gunzip).pipe(tar.extract(getRootHifiDataDirectory())).on('error', extractError).on('finish', function(){
// response and decompression complete, return
console.log("Finished unarchiving home content set");
userConfig.set('homeContentLastModified', new Date());
sendStateUpdate('complete');
});
@ -663,26 +739,7 @@ for (var key in trayIcons) {
const notificationIcon = path.join(__dirname, '../resources/console-notification.png');
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
app.on('ready', function() {
if (app.dock) {
// hide the dock icon on OS X
app.dock.hide();
}
// Create tray icon
tray = new Tray(trayIcons[ProcessGroupStates.STOPPED]);
tray.setToolTip('High Fidelity Sandbox');
tray.on('click', function() {
tray.popUpContextMenu(tray.menu);
});
updateTrayMenu(ProcessGroupStates.STOPPED);
maybeInstallDefaultContentSet(function() {
function onContentLoaded() {
maybeShowSplash();
if (buildInfo.releaseType == 'PRODUCTION') {
@ -735,5 +792,27 @@ app.on('ready', function() {
// start the home server
homeServer.start();
}
}
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
app.on('ready', function() {
if (app.dock) {
// hide the dock icon on OS X
app.dock.hide();
}
// Create tray icon
tray = new Tray(trayIcons[ProcessGroupStates.STOPPED]);
tray.setToolTip('High Fidelity Sandbox');
tray.on('click', function() {
tray.popUpContextMenu(tray.menu);
});
updateTrayMenu(ProcessGroupStates.STOPPED);
maybeInstallDefaultContentSet(onContentLoaded);
});