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

use tar-fs and zlib for content extraction

Browse source
This commit is contained in:
Stephen Birarda 2016-04-11 17:04:20 -07:00
parent f24c2c7714
commit 7dbdc9ca0a
2 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server-console/package.json
View file

@ -32,7 +32,7 @@
"os-homedir": "^1.0.1", "os-homedir": "^1.0.1",
"request": "2.67.0", "request": "2.67.0",
"request-progress": "1.0.2", "request-progress": "1.0.2",
"unzip": "0.1.11", "tar-fs": "^1.12.0",
"yargs": "^3.30.0" "yargs": "^3.30.0"
} }
} }

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

@ -17,7 +17,8 @@ const path = require('path');
const fs = require('fs-extra'); const fs = require('fs-extra');
const Tail = require('always-tail'); const Tail = require('always-tail');
const http = require('http'); const http = require('http');
const unzip = require('unzip'); const zlib = require('zlib');
const tar = require('tar-fs');
const request = require('request'); const request = require('request');
const progress = require('request-progress'); const progress = require('request-progress');
@ -90,6 +91,10 @@ function getRootHifiDataDirectory() {
} }
} }
function getDomainServerClientResourcesDirectory() {
return path.join(getRootHifiDataDirectory(), '/domain-server');
}
function getAssignmentClientResourcesDirectory() { function getAssignmentClientResourcesDirectory() {
return path.join(getRootHifiDataDirectory(), '/assignment-client'); return path.join(getRootHifiDataDirectory(), '/assignment-client');
} }
@ -477,18 +482,34 @@ function updateTrayMenu(serverState) {
const httpStatusPort = 60332; const httpStatusPort = 60332;
function maybeInstallDefaultContentSet(onComplete) { function maybeInstallDefaultContentSet(onComplete) {
// Check for existing AC data // Check for existing data
const acResourceDirectory = getAssignmentClientResourcesDirectory(); const acResourceDirectory = getAssignmentClientResourcesDirectory();
console.log("Checking for existence of " + acResourceDirectory); console.log("Checking for existence of " + acResourceDirectory);
var userHasExistingServerData = true;
var userHasExistingACData = true;
try { try {
fs.accessSync(acResourceDirectory); fs.accessSync(acResourceDirectory);
console.log("Found directory " + acResourceDirectory);
} catch (e) { } catch (e) {
console.log(e); console.log(e);
userHasExistingServerData = false; userHasExistingACData = false;
} }
if (userHasExistingServerData) { const dsResourceDirectory = getDomainServerClientResourcesDirectory();
console.log("checking for existence of " + dsResourceDirectory);
var userHasExistingDSData = true;
try {
fs.accessSync(dsResourceDirectory);
console.log("Found directory " + dsResourceDirectory);
} catch (e) {
console.log(e);
userHasExistingDSData = false;
}
if (userHasExistingACData || userHasExistingDSData) {
console.log("User has existing data, suppressing downloader"); console.log("User has existing data, suppressing downloader");
onComplete(); onComplete();
return; return;
@ -514,16 +535,19 @@ function maybeInstallDefaultContentSet(onComplete) {
electron.ipcMain.on('ready', function() { electron.ipcMain.on('ready', function() {
console.log("got ready"); console.log("got ready");
var currentState = '';
function sendStateUpdate(state, args) { function sendStateUpdate(state, args) {
// console.log(state, window, args); // console.log(state, window, args);
window.webContents.send('update', { state: state, args: args }); window.webContents.send('update', { state: state, args: args });
currentState = state;
} }
var aborted = false; var aborted = false;
// Start downloading content set // Start downloading content set
var req = progress(request.get({ var req = progress(request.get({
url: "https://s3.amazonaws.com/hifi-public/homeset/ContentSet-Lounge.zip" url: "http://cachefly.highfidelity.com/home.tgz"
}, function(error, responseMessage, responseData) { }, function(error, responseMessage, responseData) {
if (aborted) { if (aborted) {
return; return;
@ -546,24 +570,21 @@ function maybeInstallDefaultContentSet(onComplete) {
sendStateUpdate('downloading', state); sendStateUpdate('downloading', state);
} }
}); });
var unzipper = unzip.Extract({
path: acResourceDirectory, req.pipe(zlib.createGunzip()).pipe(tar.extract(getRootHifiDataDirectory())).on('error', function(){
verbose: true console.log("Aborting request because gunzip/untar failed");
});
unzipper.on('close', function() {
console.log("Done", arguments);
sendStateUpdate('complete');
});
unzipper.on('error', function (err) {
console.log("aborting");
aborted = true; aborted = true;
req.abort(); req.abort();
console.log("ERROR"); console.log("ERROR" + err);
sendStateUpdate('error', { sendStateUpdate('error', {
message: "Error installing resources." message: "Error installing resources."
}); });
}).on('finish', function(){
// response and decompression complete, return
console.log("Done", arguments);
sendStateUpdate('complete');
}); });
req.pipe(unzipper);
window.on('closed', function() { window.on('closed', function() {
if (currentState == 'downloading') { if (currentState == 'downloading') {