Skip to content
This repository has been archived by the owner on Mar 27, 2024. It is now read-only.

Commit

Permalink
* Updating webm generator
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Berger <christian.berger@gu.se>
  • Loading branch information
chrberger committed Aug 29, 2018
1 parent c54f7b8 commit c481d45
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion webapp/index.js.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion webapp/views/main.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<div class="col-md-12">
<br>
<center>
<i id="connectionStatusSymbol" class="fa fa-taxi" style="font-size:30px;color:#555"></i>
<i id="connectionStatusSymbol" class="fa fa-taxi" style="font-size:30px;color:#555" title="OpenDLV Vehicle View - v0.0.34"></i>
<div id="connectionStatusText">OpenDLV Vehicle View (disconnected)</div>
</center>
</div>
Expand Down

0 comments on commit c481d45

Please sign in to comment.