From 16261518dfcf757e8bcc9d7fbbef25150ad576a3 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 6 Jun 2018 04:41:26 +0200 Subject: hitting right upload endpoint --- app/client/modules/pix2wav/pix2wav.reducer.js | 1 + .../modules/pix2wav/views/spectrogram.upload.js | 26 +++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) (limited to 'app/client/modules/pix2wav') diff --git a/app/client/modules/pix2wav/pix2wav.reducer.js b/app/client/modules/pix2wav/pix2wav.reducer.js index def4f30..80ee4f7 100644 --- a/app/client/modules/pix2wav/pix2wav.reducer.js +++ b/app/client/modules/pix2wav/pix2wav.reducer.js @@ -15,6 +15,7 @@ const pix2wavReducer = (state = pix2wavInitialState, action) => { if (action.data && action.data.module === 'pix2wav') { state = datasetReducer(state, action) } + console.log(action.type) switch (action.type) { case types.wav2pix.loaded_buffer: diff --git a/app/client/modules/pix2wav/views/spectrogram.upload.js b/app/client/modules/pix2wav/views/spectrogram.upload.js index 087af6a..534263a 100644 --- a/app/client/modules/pix2wav/views/spectrogram.upload.js +++ b/app/client/modules/pix2wav/views/spectrogram.upload.js @@ -25,6 +25,7 @@ class SpectrogramUpload extends Component { name: "", frames: [], max: 3000, + frame_step: wav2pixActions.FRAME_STEP, } const audioElement = document.createElement('audio') audioElement.addEventListener('loadedmetadata', () => { @@ -41,23 +42,26 @@ class SpectrogramUpload extends Component { this.audioElement.src = URL.createObjectURL(file) console.log(file.size) if (file.size < 2 << 20) { - console.log('running le test!!!!!') this.props.wav2pix.renderFrames(file, {}) .then(frames => { - console.log(frames) + console.log('got frames', frames.length) this.setState({ ...this.state, frames }) }) } - console.log(file) - // get info on the file... size, etc } buildZip(){ - const { file } = this.state + const { file, max, frame_step } = this.state this.props.wav2pix.buildZip(this.state.name, file, {}) - .then(({ zip, count }) => { - this.props.datasetActions.uploadFile(pix2wavModule, this.props.id, zip, { count }) + .then(({ zip, filename, count }) => { + this.props.datasetActions.uploadFile( + this.props.module, + this.props.folder, + zip, + filename, + { count, max, frame_step } + ) }) } render(){ @@ -105,7 +109,7 @@ class SpectrogramUpload extends Component { {moment(file.lastModifiedDate).format("YYYY-MM-DD h:mm a")} {Math.floor(duration) + ' s.'}
- {this.props.pix2wav.status}{this.props.upload.status} + {this.props.pix2wav.status}
@@ -120,6 +124,12 @@ class SpectrogramUpload extends Component { value={this.state.max} onChange={max => this.setState({ max })} /> + this.setState({ frame_step })} + /> -- cgit v1.2.3-70-g09d2