hitting right upload endpoint

1 files changed, 38 insertions, 25 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 3f0a8dc..186b0ac 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -364,6 +364,8 @@ function crud_upload(type, fd, data, dispatch) {
       }
     });
 
+    console.log('/api/' + type + '/' + id + '/upload/');
+
     var xhr = new XMLHttpRequest();
     xhr.upload.addEventListener("progress", uploadProgress, false);
     xhr.addEventListener("load", uploadComplete, false);
@@ -1685,7 +1687,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildZip = exports.renderFrames = exports.loadPCM = exports.loadBuffer = undefined;
+exports.buildZip = exports.renderFrames = exports.loadPCM = exports.loadBuffer = exports.FRAME_STEP = exports.FRAME_LENGTH = undefined;
 
 var _types = __webpack_require__(/*! ../types */ "./app/client/types.js");
 
@@ -1723,8 +1725,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var FRAME_LENGTH = 126 * 255;
-var FRAME_OFFSET = FRAME_LENGTH / 4;
+var FRAME_LENGTH = exports.FRAME_LENGTH = 126 * 255;
+var FRAME_STEP = exports.FRAME_STEP = Math.round(FRAME_LENGTH / 4);
 
 var _r = 8;
 var _i = 8;
@@ -1758,8 +1760,8 @@ var loadPCM = exports.loadPCM = function loadPCM(file) {
 };
 
 var renderFrames = exports.renderFrames = function renderFrames(file, _ref) {
-  var _ref$frame_offset = _ref.frame_offset,
-      frame_offset = _ref$frame_offset === undefined ? FRAME_OFFSET : _ref$frame_offset,
+  var _ref$frame_step = _ref.frame_step,
+      frame_step = _ref$frame_step === undefined ? FRAME_STEP : _ref$frame_step,
       _ref$max = _ref.max,
       max = _ref$max === undefined ? 10 : _ref$max;
   return function (dispatch) {
@@ -1771,7 +1773,7 @@ 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) {
+        for (var offset = 0, count = 0, _len = pcm.length - FRAME_LENGTH; offset < _len && count < max; offset += frame_step, count += 1) {
           canvases.push(render(pcm.slice(offset, offset + FRAME_LENGTH), sr, count));
         }
         dispatch({ type: _types2.default.wav2pix.draw_finish });
@@ -1782,8 +1784,8 @@ var renderFrames = exports.renderFrames = function renderFrames(file, _ref) {
 };
 
 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,
+  var _ref3$frame_step = _ref3.frame_step,
+      frame_step = _ref3$frame_step === undefined ? FRAME_STEP : _ref3$frame_step,
       _ref3$max = _ref3.max,
       max = _ref3$max === undefined ? 10000 : _ref3$max;
   return function (dispatch) {
@@ -1801,7 +1803,7 @@ var buildZip = exports.buildZip = function buildZip(name, file, _ref3) {
         var offset = 0,
             count = 0,
             _len = pcm.length - FRAME_LENGTH;
-        for (; offset < _len && count < max; offset += frame_offset, count += 1) {
+        for (; offset < _len && count < max; offset += frame_step, count += 1) {
           if (count % 10 === 0) {
             dispatch({ type: _types2.default.wav2pix.draw_progress, count: count });
           }
@@ -1815,7 +1817,7 @@ var buildZip = exports.buildZip = function buildZip(name, file, _ref3) {
           // FileSaver.saveAs(content, "wav2pix_" + name + ".zip")
           resolve({
             zip: content,
-            name: "wav2pix_" + name + ".zip",
+            filename: "wav2pix_" + name + ".zip",
             count: count
           });
         });
@@ -3976,17 +3978,18 @@ var updateFolder = exports.updateFolder = function updateFolder(module, folder,
   };
 };
 
-var uploadFile = exports.uploadFile = function uploadFile(module, folder, file) {
+var uploadFile = exports.uploadFile = function uploadFile(module, folder, file, filename, opt) {
   return function (dispatch) {
     var fd = new FormData();
-    fd.append('file', file);
+    fd.append('file', file, filename);
     _actions2.default.folder.upload(fd, {
       id: folder.id,
       module: module.name,
       activity: 'file',
       epoch: 0,
       processed: false,
-      generated: false
+      generated: false,
+      opt: opt
     });
   };
 };
@@ -7274,6 +7277,7 @@ var pix2wavReducer = function pix2wavReducer() {
   if (action.data && action.data.module === 'pix2wav') {
     state = (0, _dataset2.default)(state, action);
   }
+  console.log(action.type);
 
   switch (action.type) {
     case _types2.default.wav2pix.loaded_buffer:
@@ -7716,7 +7720,8 @@ var SpectrogramUpload = function (_Component) {
       file: null,
       name: "",
       frames: [],
-      max: 3000
+      max: 3000,
+      frame_step: wav2pixActions.FRAME_STEP
     };
     var audioElement = document.createElement('audio');
     audioElement.addEventListener('loadedmetadata', function () {
@@ -7736,28 +7741,29 @@ var SpectrogramUpload = function (_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(function (frames) {
-          console.log(frames);
+          console.log('got frames', frames.length);
           _this2.setState(_extends({}, _this2.state, { frames: frames
           }));
         });
       }
-      console.log(file);
-      // get info on the file... size, etc
     }
   }, {
     key: 'buildZip',
     value: function buildZip() {
       var _this3 = this;
 
-      var file = this.state.file;
+      var _state = this.state,
+          file = _state.file,
+          max = _state.max,
+          frame_step = _state.frame_step;
 
       this.props.wav2pix.buildZip(this.state.name, file, {}).then(function (_ref) {
         var zip = _ref.zip,
+            filename = _ref.filename,
             count = _ref.count;
 
-        _this3.props.datasetActions.uploadFile(_pix2wav4.default, _this3.props.id, zip, { count: count });
+        _this3.props.datasetActions.uploadFile(_this3.props.module, _this3.props.folder, zip, filename, { count: count, max: max, frame_step: frame_step });
       });
     }
   }, {
@@ -7771,9 +7777,9 @@ var SpectrogramUpload = function (_Component) {
       // module={pix2wavModule}
       // data={pix2wav.data}
       // folder={folder}
-      var _state = this.state,
-          file = _state.file,
-          frames = _state.frames;
+      var _state2 = this.state,
+          file = _state2.file,
+          frames = _state2.frames;
 
       return (0, _preact.h)(
         'div',
@@ -7866,8 +7872,7 @@ var SpectrogramUpload = function (_Component) {
           (0, _preact.h)(
             _common.Param,
             { title: 'Status' },
-            this.props.pix2wav.status,
-            this.props.upload.status
+            this.props.pix2wav.status
           ),
           (0, _preact.h)('br', null)
         ),
@@ -7889,6 +7894,14 @@ var SpectrogramUpload = function (_Component) {
               return _this5.setState({ max: max });
             }
           }),
+          (0, _preact.h)(_common.Slider, {
+            name: 'frame step',
+            min: 10, max: 10000, type: 'int',
+            value: this.state.frame_step,
+            onChange: function onChange(frame_step) {
+              return _this5.setState({ frame_step: frame_step });
+            }
+          }),
           (0, _preact.h)(
             _common.Button,
             {