ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity

s3 urls anonymous and refactored

Browse Source 
zencoder with multiple thumbnail sizes
This commit is contained in:
diminator 2015-07-20 18:59:32 +02:00
parent d0e5fe50cb
commit 11fb512763
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_media/media_player.js
View File

@ -153,7 +153,7 @@ let MediaPlayer = React.createClass({
if (this.props.mimetype === 'video' && this.props.encodingStatus !== undefined && this.props.encodingStatus !== 100) { if (this.props.mimetype === 'video' && this.props.encodingStatus !== undefined && this.props.encodingStatus !== 100) {
return ( return (
<div className="ascribe-detail-header ascribe-media-player"> <div className="ascribe-detail-header ascribe-media-player">
<p><em>Please be patient, the video is been encoded</em></p> <p><em>Please be patient, the video is being encoded</em></p>
<ProgressBar now={this.props.encodingStatus} <ProgressBar now={this.props.encodingStatus}
label='%(percent)s%' /> label='%(percent)s%' />
</div> </div>

4
js/components/ascribe_uploader/react_s3_fine_uploader.js
View File

@ -209,6 +209,7 @@ var ReactS3FineUploader = React.createClass({
requestKey(fileId) { requestKey(fileId) {
let defer = new fineUploader.Promise(); let defer = new fineUploader.Promise();
let filename = this.state.uploader.getName(fileId); let filename = this.state.uploader.getName(fileId);
let uuid = this.state.uploader.getUuid(fileId);
window.fetch(this.props.keyRoutine.url, { window.fetch(this.props.keyRoutine.url, {
method: 'post', method: 'post',
@ -220,7 +221,8 @@ var ReactS3FineUploader = React.createClass({
credentials: 'include', credentials: 'include',
body: JSON.stringify({ body: JSON.stringify({
'filename': filename, 'filename': filename,
'file_class': this.props.keyRoutine.fileClass, 'category': this.props.keyRoutine.fileClass,
'uuid': uuid,
'piece_id': this.props.keyRoutine.pieceId 'piece_id': this.props.keyRoutine.pieceId
}) })
}) })