summaryrefslogtreecommitdiff
path: root/app/client
diff options
context:
space:
mode:
Diffstat (limited to 'app/client')
-rw-r--r--app/client/audio/wav2pix.js7
-rw-r--r--app/client/dataset/dataset.actions.js5
-rw-r--r--app/client/modules/pix2wav/views/spectrogram.upload.js6
3 files changed, 9 insertions, 9 deletions
diff --git a/app/client/audio/wav2pix.js b/app/client/audio/wav2pix.js
index e9233e5..2fbca73 100644
--- a/app/client/audio/wav2pix.js
+++ b/app/client/audio/wav2pix.js
@@ -65,9 +65,8 @@ export const renderFrames = (file, { frame_offset=FRAME_OFFSET, max=10 }) => dis
})
}
-export const buildZip = (name, file, opt) => dispatch => {
+export const buildZip = (name, file, { frame_offset=FRAME_OFFSET, max=10000 }) => dispatch => {
return new Promise((resolve, reject) => {
- const frame_offset = opt.frame_offset || FRAME_OFFSET
loadPCM(file).then(({ buffer, pcm, sr }) => {
dispatch({ type: types.wav2pix.loaded_buffer })
@@ -75,7 +74,7 @@ export const buildZip = (name, file, opt) => dispatch => {
const zip_folder = zip.folder("wav2pix_" + name);
for (let offset = 0, count = 0, _len = pcm.length - FRAME_LENGTH;
- offset < _len;
+ offset < _len && count < max;
offset += frame_offset, count += 1
) {
if ((count % 100) === 0) {
@@ -89,7 +88,7 @@ export const buildZip = (name, file, opt) => dispatch => {
zip.generateAsync({ type: "blob" }).then(content => {
dispatch({ type: types.wav2pix.load_zip })
// FileSaver.saveAs(content, "wav2pix_" + name + ".zip")
- resolve(content)
+ resolve({ zip: content, count })
})
})
})
diff --git a/app/client/dataset/dataset.actions.js b/app/client/dataset/dataset.actions.js
index f68f337..6cdd15a 100644
--- a/app/client/dataset/dataset.actions.js
+++ b/app/client/dataset/dataset.actions.js
@@ -14,7 +14,7 @@ export const createFolder = (module, name) => dispatch => {
})
}
-export const updateFolder = (module, folder, name) => dispatch => {
+export const updateFolder = (module, folder, name, opt={}) => dispatch => {
if (! folder || ! folder.id) {
return null
}
@@ -23,7 +23,8 @@ export const updateFolder = (module, folder, name) => dispatch => {
module: module.name,
datatype: module.datatype,
activity: 'dataset',
- name
+ name,
+ opt,
})
}
diff --git a/app/client/modules/pix2wav/views/spectrogram.upload.js b/app/client/modules/pix2wav/views/spectrogram.upload.js
index 48ef644..fc469e1 100644
--- a/app/client/modules/pix2wav/views/spectrogram.upload.js
+++ b/app/client/modules/pix2wav/views/spectrogram.upload.js
@@ -54,9 +54,9 @@ class SpectrogramUpload extends Component {
}
buildZip(){
const { file } = this.state
- this.props.wav2pix.buildZip(file, {})
- .then(zip => {
- this.props.datasetActions.uploadFile(pix2wavModule, this.props.pix2wav.folder_id, zip)
+ this.props.wav2pix.buildZip(this.state.name, file, {})
+ .then(({ zip, count }) => {
+ this.props.datasetActions.uploadFile(pix2wavModule, this.props.pix2wav.folder_id, zip, { count })
})
}
render(){