setup updates:

- add ./build-wr.sh to build webrecorder submodule - rename 'webrecorder' -> 'webrecorder_player' in python-binary and in code to match built binary - set version to 1.5.0 instead of 2.0.0 - update node packages
webrecorder · Sep 21, 2018 · 6d60677 · 6d60677
1 parent 9f56482
commit 6d60677
Show file tree

Hide file tree

Showing 7 changed files with 309 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,9 +2,9 @@
 *~
 
 node_modules
-python-binaries/webrecorder
+python-binaries/*
 dll
 app/static/
 
 app/main.prod.js
-app/main.prod.js.map
+app/main.prod.js.map
diff --git a/app/main.dev.js b/app/main.dev.js
@@ -32,7 +32,7 @@ let spawnOptions;
 let webrecorderProcess;
 
 const projectDir = path.join(__dirname, '../');
-const webrecorderDir = path.join(projectDir, 'python-binaries', 'webrecorder');
+const webrecorderBin = path.join(projectDir, 'python-binaries', 'webrecorder_player');
 const stdio = ['ignore', 'pipe', 'pipe'];
 const wrConfig = {};
 const pluginDir = 'plugins';
@@ -130,7 +130,7 @@ function killProcess() {
 
 const registerOpenWarc = function () {
   // get versions for stack
-  child_process.execFile(webrecorderDir, ['--version'], (err, stdout, stderr) => {
+  child_process.execFile(webrecorderBin, ['--version'], (err, stdout, stderr) => {
     const electronVersion = `electron ${process.versions.electron}<BR>
                              chrome ${process.versions.chrome}`;
     Object.assign(wrConfig, {
@@ -150,14 +150,14 @@ const registerOpenWarc = function () {
     killProcess();
 
     webrecorderProcess = child_process.spawn(
-      webrecorderDir,
+      webrecorderBin,
       ['--no-browser', '--loglevel', 'error', '--cache-dir', '_warc_cache', '--port', 0, warc],
       spawnOptions
     );
 
     // catch any errors spawning webrecorder binary and add to debug info
     webrecorderProcess.on('error', (err) => {
-      debugOutput.push(`Error spawning ${webrecorderDir} binary:\n ${err}\n\n`);
+      debugOutput.push(`Error spawning ${webrecorderBin} binary:\n ${err}\n\n`);
     });
 
     // log any stderr notices
@@ -285,14 +285,14 @@ ipcMain.on('sync-dat', (evt, datKey) => {
         killProcess();
 
         webrecorderProcess = child_process.spawn(
-          webrecorderDir,
+          webrecorderBin,
           ['--no-browser', '--loglevel', 'error', '--cache-dir', '_warc_cache', '--port', 0, '--coll-dir', dlDir],
           spawnOptions
         );
 
         // catch any errors spawning webrecorder binary and add to debug info
         webrecorderProcess.on('error', (err) => {
-          debugOutput.push(`Error spawning ${webrecorderDir} binary:\n ${err}\n\n`);
+          debugOutput.push(`Error spawning ${webrecorderBin} binary:\n ${err}\n\n`);
         });
 
         // log any stderr notices

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webrecorder-player",
   "productName": "Webrecorder Player",
-  "version": "2.0.0",
+  "version": "1.5.0",
   "description": "Webrecorder Player -- Standalone Web Archive Browser App",
   "main": "./main.prod.js",
   "scripts": {

diff --git a/build-wr.sh b/build-wr.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+bash ./webrecorder/webrecorder/webrecorder/standalone/build_player.sh 
+mv ./webrecorder/webrecorder/webrecorder/standalone/dist/webrecorder_player ./python-binaries/
+chmod a+x ./python-binaries/webrecorder_player
+
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webrecorderplayer",
   "productName": "Webrecorder Player",
-  "version": "2.0.0",
+  "version": "1.5.0",
   "description": "Webrecorder Player -- Standalone Web Archive Browser App",
   "scripts": {
     "build": "concurrently \"npm run build-main\" \"npm run build-frontend\"",
@@ -79,6 +79,7 @@
     "electron-devtools-installer": "^2.2.1",
     "electron-publisher-s3": "^19.15.0",
     "electron-window-state": "^4.1.1",
+    "node-sass": "^4.9.3",
     "webpack": "3.10.0"
   },
   "devEngines": {

diff --git a/webrecorder b/webrecorder