diff options
Diffstat (limited to 'public/bundle.js')
| -rw-r--r-- | public/bundle.js | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/public/bundle.js b/public/bundle.js index 512f74c..fb762ee 100644 --- a/public/bundle.js +++ b/public/bundle.js @@ -1769,8 +1769,8 @@ var renderFrames = exports.renderFrames = function renderFrames(file, _ref) { dispatch({ type: _types2.default.wav2pix.loaded_buffer }); var canvases = []; - for (var offset = 0, count = 0, _len = pcm.length - FRAME_LENGTH; offset < _len && count < max; offset += frame_offset, count += 1) { - canvases.push(render(pcm.slice(offset, offset + FRAME_LENGTH), sr, count)); + for (var offset = 0, _count = 0, _len = pcm.length - FRAME_LENGTH; offset < _len && _count < max; offset += frame_offset, _count += 1) { + canvases.push(render(pcm.slice(offset, offset + FRAME_LENGTH), sr, _count)); } dispatch({ type: _types2.default.wav2pix.draw_finish }); resolve(canvases); @@ -1779,25 +1779,28 @@ var renderFrames = exports.renderFrames = function renderFrames(file, _ref) { }; }; -var buildZip = exports.buildZip = function buildZip(name, file, opt) { +var buildZip = exports.buildZip = function buildZip(name, file, _ref3) { + var _ref3$frame_offset = _ref3.frame_offset, + frame_offset = _ref3$frame_offset === undefined ? FRAME_OFFSET : _ref3$frame_offset, + _ref3$max = _ref3.max, + max = _ref3$max === undefined ? 10000 : _ref3$max; return function (dispatch) { return new Promise(function (resolve, reject) { - var frame_offset = opt.frame_offset || FRAME_OFFSET; - loadPCM(file).then(function (_ref3) { - var buffer = _ref3.buffer, - pcm = _ref3.pcm, - sr = _ref3.sr; + loadPCM(file).then(function (_ref4) { + var buffer = _ref4.buffer, + pcm = _ref4.pcm, + sr = _ref4.sr; dispatch({ type: _types2.default.wav2pix.loaded_buffer }); var zip = new _jszip2.default(); var zip_folder = zip.folder("wav2pix_" + name); - for (var offset = 0, count = 0, _len = pcm.length - FRAME_LENGTH; offset < _len; offset += frame_offset, count += 1) { - if (count % 100 === 0) { - dispatch({ type: _types2.default.wav2pix.draw_progress, count: count }); + for (var offset = 0, _count2 = 0, _len = pcm.length - FRAME_LENGTH; offset < _len && _count2 < max; offset += frame_offset, _count2 += 1) { + if (_count2 % 100 === 0) { + dispatch({ type: _types2.default.wav2pix.draw_progress, count: _count2 }); } - render(pcm.slice(offset, offset + FRAME_LENGTH), sr, count, zip_folder); + render(pcm.slice(offset, offset + FRAME_LENGTH), sr, _count2, zip_folder); } // dispatch event @@ -1805,7 +1808,7 @@ var buildZip = exports.buildZip = function buildZip(name, file, opt) { zip.generateAsync({ type: "blob" }).then(function (content) { dispatch({ type: _types2.default.wav2pix.load_zip }); // FileSaver.saveAs(content, "wav2pix_" + name + ".zip") - resolve(content); + resolve({ zip: content, count: count }); }); }); }); @@ -3948,6 +3951,7 @@ var createFolder = exports.createFolder = function createFolder(module, name) { }; }; // import socket from '../socket' var updateFolder = exports.updateFolder = function updateFolder(module, folder, name) { + var opt = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {}; return function (dispatch) { if (!folder || !folder.id) { return null; @@ -3957,7 +3961,8 @@ var updateFolder = exports.updateFolder = function updateFolder(module, folder, module: module.name, datatype: module.datatype, activity: 'dataset', - name: name + name: name, + opt: opt }); }; }; @@ -7730,8 +7735,11 @@ var SpectrogramUpload = function (_Component) { var file = this.state.file; - this.props.wav2pix.buildZip(file, {}).then(function (zip) { - _this3.props.datasetActions.uploadFile(_pix2wav4.default, _this3.props.pix2wav.folder_id, zip); + this.props.wav2pix.buildZip(this.state.name, file, {}).then(function (_ref) { + var zip = _ref.zip, + count = _ref.count; + + _this3.props.datasetActions.uploadFile(_pix2wav4.default, _this3.props.pix2wav.folder_id, zip, { count: count }); }); } }, { |