form make more sense

3 files changed, 30 insertions, 16 deletions

diff --git a/app/client/audio/wav2pix.js b/app/client/audio/wav2pix.js
index 2fbca73..d39262d 100644
--- a/app/client/audio/wav2pix.js
+++ b/app/client/audio/wav2pix.js
@@ -3,6 +3,7 @@ import types from '../types'
 import Tone from 'tone'
 import JSZip from 'jszip'
 import FileSaver from 'file-saver'
+import { sprintf } from 'sprintf-js'
 
 import * as draw from './lib/draw'
 import output from './lib/output'
@@ -73,11 +74,12 @@ export const buildZip = (name, file, { frame_offset=FRAME_OFFSET, max=10000 }) =
       const zip = new JSZip()
       const zip_folder = zip.folder("wav2pix_" + name);
 
-      for (let offset = 0, count = 0, _len = pcm.length - FRAME_LENGTH;
+      let offset = 0, count = 0, _len = pcm.length - FRAME_LENGTH
+      for (;
             offset < _len && count < max;
             offset += frame_offset, count += 1
           ) {
-        if ((count % 100) === 0) {
+        if ((count % 10) === 0) {
           dispatch({ type: types.wav2pix.draw_progress, count })
         }
         render(pcm.slice(offset, offset+FRAME_LENGTH), sr, count, zip_folder)
@@ -88,7 +90,11 @@ export const buildZip = (name, file, { frame_offset=FRAME_OFFSET, max=10000 }) =
       zip.generateAsync({ type: "blob" }).then(content => {
         dispatch({ type: types.wav2pix.load_zip })
         // FileSaver.saveAs(content, "wav2pix_" + name + ".zip")
-        resolve({ zip: content, count })
+        resolve({
+          zip: content,
+          name: "wav2pix_" + name + ".zip",
+          count
+        })
       })
     })
   })
diff --git a/app/client/modules/pix2wav/pix2wav.reducer.js b/app/client/modules/pix2wav/pix2wav.reducer.js
index 8db1046..def4f30 100644
--- a/app/client/modules/pix2wav/pix2wav.reducer.js
+++ b/app/client/modules/pix2wav/pix2wav.reducer.js
@@ -1,5 +1,6 @@
 import types from '../../types'
 import datasetReducer from '../../dataset/dataset.reducer'
+import util from '../../util'
 
 const pix2wavInitialState = {
   loading: true,
@@ -25,7 +26,7 @@ const pix2wavReducer = (state = pix2wavInitialState, action) => {
       console.log(action)
       return {
         ...state,
-        status: 'Rendering frame /',
+        status: 'Rendering frame ' + action.count,
       }
     case types.wav2pix.draw_finish:
       return {
@@ -37,6 +38,11 @@ const pix2wavReducer = (state = pix2wavInitialState, action) => {
         ...state,
         status: 'Built zip file',
       }
+    case types.wav2pix.uploading:
+      return {
+        ...state,
+        status: 'Uploading zip file (' + util.hush_size(action.size) + ')',
+      }
     default:
       return state
   }
diff --git a/app/client/modules/pix2wav/views/spectrogram.upload.js b/app/client/modules/pix2wav/views/spectrogram.upload.js
index fc469e1..0279e80 100644
--- a/app/client/modules/pix2wav/views/spectrogram.upload.js
+++ b/app/client/modules/pix2wav/views/spectrogram.upload.js
@@ -40,7 +40,7 @@ class SpectrogramUpload extends Component {
     this.audioElement.src = URL.createObjectURL(file)
     console.log(file.size)
     if (file.size < 2 << 20) {
-      console.log('booooooooo')
+      console.log('running le test!!!!!')
       this.props.wav2pix.renderFrames(file, {})
       .then(frames => {
         console.log(frames)
@@ -56,7 +56,7 @@ class SpectrogramUpload extends Component {
     const { file } = this.state
     this.props.wav2pix.buildZip(this.state.name, file, {})
     .then(({ zip, count }) => {
-      this.props.datasetActions.uploadFile(pix2wavModule, this.props.pix2wav.folder_id, zip, { count })
+      this.props.datasetActions.uploadFile(pix2wavModule, this.props.id, zip, { count })
     })
   }
   render(){
@@ -66,6 +66,7 @@ class SpectrogramUpload extends Component {
     // module={pix2wavModule}
     // data={pix2wav.data}
     // folder={folder}
+    console.log(this.props)
     const { file, frames } = this.state
     return (
       <div className='row'>
@@ -81,15 +82,6 @@ class SpectrogramUpload extends Component {
               mime='image.*'
               onUpload={file => this.pickFile(file)}
             />
-            <TextInput
-              title='Dataset name'
-              onChange={e => this.setState({ name: e.target.value })}
-              value={this.state.name}
-            />
-            <Button
-              onClick={() => this.buildZip()}
-            >Build Zip</Button>
-            <Progress />
             {file && this.renderMetadata(file)}
           </Group>
         </div>
@@ -112,7 +104,16 @@ class SpectrogramUpload extends Component {
         <Param title='Date'>{moment(file.lastModifiedDate).format("YYYY-MM-DD h:mm a")}</Param>
         <Param title='Duration'>{Math.floor(duration) + ' s.'}</Param>
         <br />
-        <Param title='Status'>{this.props.pix2wav.status}</Param>
+        <Param title='Status'>{this.props.pix2wav.status}{this.props.upload.status}</Param>
+        <TextInput
+          title='Dataset name'
+          onChange={e => this.setState({ name: e.target.value })}
+          value={this.state.name}
+        />
+        <Button
+          onClick={() => this.buildZip()}
+        >Build Zip</Button>
+        <Progress />
       </div>
     )
   }
@@ -125,6 +126,7 @@ class SpectrogramUpload extends Component {
 
 const mapStateToProps = state => ({
   pix2wav: state.module.pix2wav,
+  upload: state.upload,
 })
 
 const mapDispatchToProps = (dispatch, ownProps) => ({