From c481d45767f76015f10a3793183d41a2df1306ae Mon Sep 17 00:00:00 2001 From: Christian Berger Date: Wed, 29 Aug 2018 12:16:15 +0200 Subject: [PATCH] * Updating webm generator Signed-off-by: Christian Berger --- README.md | 2 +- webapp/index.js.amd64 | 2 +- webapp/views/main.hbs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 58ec183..a4e488e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ OpenDLV Standard Message Set that are exchanged in a running OpenDLV.io session (running at 111 in the example), simply run it as follows: ``` -docker run --rm --init --net=host --name=opendlv-vehicle-view -v ~/recordings:/opt/vehicle-view/recordings -v /var/run/docker.sock:/var/run/docker.sock -p 8081:8081 chalmersrevere/opendlv-vehicle-view-multi:v0.0.33 +docker run --rm --init --net=host --name=opendlv-vehicle-view -v ~/recordings:/opt/vehicle-view/recordings -v /var/run/docker.sock:/var/run/docker.sock -p 8081:8081 chalmersrevere/opendlv-vehicle-view-multi:v0.0.34 ``` Now, simply point your web-browser to the IP address and port 8081 where you diff --git a/webapp/index.js.amd64 b/webapp/index.js.amd64 index d67ec94..3782e96 100644 --- a/webapp/index.js.amd64 +++ b/webapp/index.js.amd64 @@ -224,7 +224,7 @@ app.post('/convertrec2csvpng', (req, res) => { }); app.post('/convertrec2webm', (req, res) => { - var process_cluonrec2webm = execSync('if [ "$(docker images -q chalmersrevere/rec2csv-png 2> /dev/null)" == "" ]; then docker build -t chalmersrevere/rec2csv-png https://github.com/chalmers-revere/rec2csv-png.git; fi && rm -f ' + req.body.recordingFile + '.webm.zip && mkdir -p recordings/tmp && if [ -f external.odvd ]; then cp external.odvd recordings/tmp/messages.odvd; else cp opendlv-standard-message-set-v0.9.6.odvd recordings/tmp/messages.odvd; fi && docker run --rm --volumes-from=opendlv-vehicle-view -w /opt/vehicle-view/recordings/tmp chalmersrevere/rec2csv-png --rec=../' + req.body.recordingFile + ' --odvd=messages.odvd && docker run --rm --volumes-from=opendlv-vehicle-view -w /opt/vehicle-view/recordings/tmp --entrypoint="" chalmersrevere/rec2csv-png /usr/bin/generate_webm.sh && cd recordings/tmp && zip -r9 ../../' + req.body.recordingFile + '.webm.zip *.webm && cd .. && rm -fr tmp && cd ..', { shell: '/bin/bash' }); + var process_cluonrec2webm = execSync('if [ "$(docker images -q chalmersrevere/rec2csv-png:v0.0.1 2> /dev/null)" == "" ]; then docker build -t chalmersrevere/rec2csv-png:v0.0.1 https://github.com/chalmers-revere/rec2csv-png.git; fi && rm -f ' + req.body.recordingFile + '.webm.zip && mkdir -p recordings/tmp && if [ -f external.odvd ]; then cp external.odvd recordings/tmp/messages.odvd; else cp opendlv-standard-message-set-v0.9.6.odvd recordings/tmp/messages.odvd; fi && docker run --rm --volumes-from=opendlv-vehicle-view -w /opt/vehicle-view/recordings/tmp chalmersrevere/rec2csv-png --rec=../' + req.body.recordingFile + ' --odvd=messages.odvd && docker run --rm --volumes-from=opendlv-vehicle-view -w /opt/vehicle-view/recordings/tmp --entrypoint="" chalmersrevere/rec2csv-png /usr/bin/generate_webm.sh && cd recordings/tmp && zip -r9 ../../' + req.body.recordingFile + '.webm.zip *.webm && cd .. && rm -fr tmp && cd ..', { shell: '/bin/bash' }); console.log(process_cluonrec2webm.toString()); diff --git a/webapp/views/main.hbs b/webapp/views/main.hbs index b7388d0..b346c7d 100644 --- a/webapp/views/main.hbs +++ b/webapp/views/main.hbs @@ -155,7 +155,7 @@

- +
OpenDLV Vehicle View (disconnected)