Skip to content
Snippets Groups Projects
Commit 63b3ea18 authored by Josefine Wegert's avatar Josefine Wegert
Browse files

work in progress: add backend to zip and strange behaviour in frontend

parent ba6763e3
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
const downloadFiles = require('./downloadFiles.json'); const downloadFiles = require('./downloadFiles.json');
const downloadNames = Object.keys(downloadFiles); const downloadNames = Object.keys(downloadFiles);
let app = express(); var app = express();
app.use(bodyParser.urlencoded({ app.use(bodyParser.urlencoded({
extended: true extended: true
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
function backendClean(){ function backendClean(){
return new Promise((resolve,reject)=>{ return new Promise((resolve,reject)=>{
exec('cd explorviz-ui-backend/plugins/net/explorviz/plugins/ && rm *', (error, stdout,stderr)=>{ exec('cd explorviz-ui-backend/plugins/net/explorviz/ && rm -rf plugins/*', (error, stdout,stderr)=>{
if (error) { if (error) {
reject(error); reject(error);
return; return;
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
if(checkedPlugins.length !== 0 ){ if(checkedPlugins.length !== 0 ){
checkedPlugins.forEach((pluginName) => { checkedPlugins.forEach((pluginName) => {
exec('git clone ' + downloadFiles[pluginName] + 'cd ' + pluginName + 'cp -r . explorviz-ui-backend/plugins/net/explorviz/plugins/', (error, stdout, stderr) => { //'cd explorviz-ui-backend/plugins/net/explorviz/plugins/ ' + exec('git clone ' + downloadFiles[pluginName] + ' && cp -R '+ pluginName + '/ '+' explorviz-ui-backend/plugins/net/explorviz/plugins/', (error, stdout, stderr) => { //'cd explorviz-ui-backend/plugins/net/explorviz/plugins/ ' +
if (error) { if (error) {
reject(error); reject(error);
...@@ -179,7 +179,6 @@ ...@@ -179,7 +179,6 @@
function backendAll(){ function backendAll(){
return backendClean().then(function(){ return backendClean().then(function(){
return backendPull().then(function(){ return backendPull().then(function(){
return backendInstallAddons().then(function(){ return backendInstallAddons().then(function(){
return backendBuild() return backendBuild()
...@@ -275,6 +274,7 @@ ...@@ -275,6 +274,7 @@
}) })
console.log('resolve build:', resolve);
} }
function frontendAll() { function frontendAll() {
...@@ -316,21 +316,29 @@ function streamFilesToZip(){ ...@@ -316,21 +316,29 @@ function streamFilesToZip(){
let finishedArray=[]; let finishedArray=[];
files.forEach(file => { files.forEach(file => {
if (file.zipFileName === 'backend.war'){ if (file.zipFileName === 'backend.war'){
const backendSteam = fsReaddir(file.path).on('data', function(data){ // console.log('backendStream:');
const backendReadStream = fs.createReadStream(data); // backendStream = fs.createReadStream(file.path);
zip.file(zipFileName, backendReadStream); // console.log('zip.file:');
}).on('error', function(){ // zip.file(file.zipFileName, backendStream);
console.log('error:', error); // console.log('backend done:');
}).on('finish', function(){ // finishedArray.push('backend done');
const backendStream = fs.readFileSync(file.path, "base64", function(error, data){
if(error){
console.log('error:', error)
}
});
//console.log('backendStream:', backendStream);
const backendReadStream = fs.createReadStream(backendStream);
zip.file(file.zipFileName, backendReadStream);
finishedArray.push('backend finished'); finishedArray.push('backend finished');
if(finishedArray.length === files.length){ if(finishedArray.length === files.length){
resolve(); resolve();
} }
})
// backendStream = fs.createReadStream(file.path);
// zip.file(file.zipFileName, backendStream);
// finishedArray.push('backend done');
} }
if(file.zipFileName === 'frontend'){ if(file.zipFileName === 'frontend'){
const frontendStream = fsReaddir(file.path) const frontendStream = fsReaddir(file.path)
...@@ -338,7 +346,8 @@ function streamFilesToZip(){ ...@@ -338,7 +346,8 @@ function streamFilesToZip(){
console.log('error:', err); console.log('error:', err);
}).on('data', function(data){ }).on('data', function(data){
for (let i=0; i<data.length; i++) { for (let i=0; i<data.length; i++) {
const frontendReadsStream = fs.createReadStream(data[i]); const frontendReadStream = fs.createReadStream(data[i]);
console.log('data[i]:', data[i]);
zip.file(data[i], frontendReadStream); zip.file(data[i], frontendReadStream);
} }
...@@ -365,7 +374,9 @@ function createZip(){ ...@@ -365,7 +374,9 @@ function createZip(){
console.log('in createZip'); console.log('in createZip');
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
zip.generateNodeStream({type:'nodebuffer',streamFiles:true}).pipe(fs.createWriteStream('explorviz-builds.zip')).on('finish', function () { zip.generateNodeStream({type:'nodebuffer',streamFiles:true}).pipe(fs.createWriteStream('explorviz-builds.zip')).on('error', function(error){
console.log('error in createZip:', error);
}).on('finish', function () {
console.log('explorviz-builds.zip written.'); console.log('explorviz-builds.zip written.');
res.download('explorviz-builds.zip'); res.download('explorviz-builds.zip');
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment