promises progress

1 files changed, 26 insertions, 10 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 1ef6fd4..7372568 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -4552,7 +4552,7 @@ function router() {
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/graph/', component: _samplernn14.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/inspect/', component: _samplernn12.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/import/', component: _samplernn8.default }),
-    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/', component: _samplernn6.default }),
+    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/', component: _samplernn4.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/:id/', component: _samplernn4.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/results/', component: _samplernn10.default })
   );
@@ -4628,6 +4628,8 @@ var _actions = __webpack_require__(/*! ../../actions */ "./app/client/actions.js
 
 var _actions2 = _interopRequireDefault(_actions);
 
+var _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }
@@ -4635,7 +4637,9 @@ function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }
 var load_directories = exports.load_directories = function load_directories(id) {
   return function (dispatch) {
     // console.log(actions)
-    Promise.all([_actions2.default.folder.index({ module: 'samplernn' }), _actions2.default.file.index({ module: 'samplernn' }), _actions2.default.task.index({ module: 'samplernn' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'datasets' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'results' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'output' }), load_loss()(dispatch)]).then(function (res) {
+    (0, _util.allProgress)([_actions2.default.folder.index({ module: 'samplernn' }), _actions2.default.file.index({ module: 'samplernn' }), _actions2.default.task.index({ module: 'samplernn' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'datasets' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'results' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'output' }), load_loss()(dispatch)], function (percent, i, n) {
+      console.log(percent + "%");
+    }).then(function (res) {
       // console.log(res)
       var _res = _slicedToArray(res, 7),
           folders = _res[0],
@@ -5015,8 +5019,8 @@ var SampleRNNDatasets = function (_Component) {
   _createClass(SampleRNNDatasets, [{
     key: 'componentWillMount',
     value: function componentWillMount() {
-      var id = this.props.id || this.props.match.params.id || localStorage.getItem('samplernn.last_id');
-      console.log('load dataset:', id);
+      var id = this.props.id;
+      console.log('load dataset:', id, this.props.id);
       var _props = this.props,
           match = _props.match,
           samplernn = _props.samplernn,
@@ -5083,7 +5087,6 @@ var SampleRNNDatasets = function (_Component) {
           match = _props2.match,
           history = _props2.history;
 
-      var id = this.props.id || localStorage.getItem('samplernn.last_id');
       if (samplernn.loading) {
         // console.log('loading')
         return (0, _preact.h)(
@@ -6364,7 +6367,6 @@ var SampleRNNShow = function (_Component) {
       var _ref = samplernn || {},
           folder = _ref.folder;
 
-      console.log(folder);
       return (0, _preact.h)(
         'div',
         { className: 'app' },
@@ -6377,14 +6379,14 @@ var SampleRNNShow = function (_Component) {
             folder ? folder.name : 'Loading...'
           )
         ),
-        folder && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
+        folder && folder.name && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
           title: 'Add Files',
           module: samplernnModule,
           folder: folder,
           canUpload: true, canAddURL: true
         }),
         (0, _preact.h)(_samplernn3.default, {
-          id: this.props.match.params.id
+          id: this.props.match.params.id || localStorage.getItem('samplernn.last_id')
         })
       );
     }
@@ -6395,7 +6397,8 @@ var SampleRNNShow = function (_Component) {
 
 var mapStateToProps = function mapStateToProps(state) {
   return {
-    samplernn: state.module.samplernn
+    samplernn: state.module.samplernn,
+    dataset: state.dataset
   };
 };
 
@@ -7850,7 +7853,7 @@ exports.default = (_system$app$folder$fi = {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.is_desktop = exports.is_mobile = exports.is_android = exports.is_ipad = exports.is_iphone = exports.sort = undefined;
+exports.allProgress = exports.is_desktop = exports.is_mobile = exports.is_android = exports.is_ipad = exports.is_iphone = exports.sort = undefined;
 exports.clamp = clamp;
 exports.norm = norm;
 exports.lerp = lerp;
@@ -7908,6 +7911,19 @@ function randrange(a, b) {
 
 document.body.style.backgroundImage = 'linear-gradient(' + (randint(40) + 40) + 'deg, #fde, #ffe)';
 
+var allProgress = exports.allProgress = function allProgress(promises, progress_cb) {
+  var d = 0;
+  progress_cb(0);
+  promises.forEach(function (p) {
+    p.then(function (s) {
+      d += 1;
+      progress_cb(d * 100 / promises.length, d, promises.length);
+      return s;
+    });
+  });
+  return Promise.all(promises);
+};
+
 function timeInSeconds(n) {
   return (n / 10).toFixed(1) + ' s.';
 }