mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-15 17:37:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #167 from arillo/fix/upload-conversion-progress

Browse Source 
fix double %
This commit is contained in:
banglashi
2021-02-14 12:54:48 +01:00
committed by GitHub
parent 56988fc1c4 176b383cbd
commit 20bbb5aa08
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/artifact_converter.js
View File

@@ -171,7 +171,7 @@ function convertVideo(fileName, filePath, codec, callback, progressCallback) {
ff.stderr.on('data', function (data) { ff.stderr.on('data', function (data) {
console.log('[ffmpeg-video] stderr: ' + data); console.log('[ffmpeg-video] stderr: ' + data);
if (progressCallback) { if (progressCallback) {
progressCallback(getConversionProgress(""+data)); progressCallback(getConversionProgress(""+data)+"%");
} }
}); });

4
views/partials/space.html
View File

@@ -156,10 +156,10 @@
<source v-for="rep in a.view.payload_alternatives" v-bind:src="rep.payload_uri" v-bind:type="rep.mime" /> <source v-for="rep in a.view.payload_alternatives" v-bind:src="rep.payload_uri" v-bind:type="rep.mime" />
<source v-if="a.view.payload_uri && a.view.mime" v-bind:src="a.view.payload_uri" v-bind:type="a.view.mime" /> <source v-if="a.view.payload_uri && a.view.mime" v-bind:src="a.view.payload_uri" v-bind:type="a.view.mime" />
</video> </video>
<div class="progress" v-bind:style="{width: a.description+'%'}"> <div class="progress" v-bind:style="{width: a.description}">
<div class="progress-container"> <div class="progress-container">
<h3> <h3>
{{a.description}}% {{a.description}}
</h3> </h3>
</div> </div>
</div> </div>