woooo smoother

1 files changed, 34 insertions, 15 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 3b1160e..1d42db3 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -5422,13 +5422,22 @@ var SampleRNNDatasets = function (_Component) {
           mapFn = _util$sort$orderByFn.mapFn,
           sortFn = _util$sort$orderByFn.sortFn;
 
+      var moduleOnCPU = runner && runner.cpu.task && runner.cpu.task.module === samplernnModule.name;
       var moduleOnGPU = runner && runner.gpu.task && runner.gpu.task.module === samplernnModule.name;
       var datasets = folder.datasets.map(function (name) {
         return datasetLookup[name];
       }).map(mapFn).sort(sortFn).map(function (pair) {
         var dataset = pair[1];
-        var isProcessing = moduleOnGPU && runner.gpu.task.dataset === dataset;
-        var status = isProcessing ? util.gerund(runner.gpu.task.activity) : '';
+        var status = '';
+        var isProcessing = false,
+            isFetching = false;
+        if (moduleOnGPU && runner.gpu.task.dataset === dataset) {
+          status = util.gerund(runner.gpu.task.activity);
+          isProcessing = true;
+        } else if (moduleOnCPU && runner.cpu.task.activity === 'fetch' && runner.cpu.task.opt.file_id === dataset.input[0]) {
+          isProcessing = true;
+          isFetching = true;
+        }
         return (0, _preact.h)(
           'div',
           { key: dataset.name, className: 'row dataset', onClick: function onClick() {
@@ -5455,9 +5464,9 @@ var SampleRNNDatasets = function (_Component) {
           ),
           (0, _preact.h)(
             'div',
-            { className: 'col quiet ' + (dataset.isBuilt ? 'built' : 'not_built') },
-            status,
-            _this3.props.datasetActions && _this3.props.datasetActions(dataset)
+            { className: ['col', 'quiet', dataset.isBuilt ? 'built' : 'not_built', isProcessing ? 'processing' : 'not_processing'].join(' ') },
+            _this3.props.datasetActions && _this3.props.datasetActions(dataset, isFetching, isProcessing),
+            status
           ),
           (0, _preact.h)(
             'div',
@@ -6517,10 +6526,13 @@ var samplernnModule = {
 var SampleRNNShow = function (_Component) {
   _inherits(SampleRNNShow, _Component);
 
-  function SampleRNNShow() {
+  function SampleRNNShow(props) {
     _classCallCheck(this, SampleRNNShow);
 
-    return _possibleConstructorReturn(this, (SampleRNNShow.__proto__ || Object.getPrototypeOf(SampleRNNShow)).apply(this, arguments));
+    var _this = _possibleConstructorReturn(this, (SampleRNNShow.__proto__ || Object.getPrototypeOf(SampleRNNShow)).call(this, props));
+
+    _this.datasetActions = _this.datasetActions.bind(_this);
+    return _this;
   }
 
   _createClass(SampleRNNShow, [{
@@ -6570,15 +6582,15 @@ var SampleRNNShow = function (_Component) {
             console.log('picked a file', file);
             _this2.handlePick(file);
           },
-          datasetActions: function datasetActions(dataset) {
-            return _this2.datasetActions(dataset);
-          }
+          datasetActions: this.datasetActions
         })
       );
     }
   }, {
     key: 'datasetActions',
     value: function datasetActions(dataset) {
+      var isFetching = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      var isProcessing = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var _props2 = this.props,
           samplernn = _props2.samplernn,
           remote = _props2.remote;
@@ -6640,13 +6652,17 @@ var SampleRNNShow = function (_Component) {
               } },
             'rm'
           )
+        ) : isFetching ? (0, _preact.h)(
+          'div',
+          { 'class': 'subtext' },
+          'fetching'
         ) : (0, _preact.h)(
           'div',
           { 'class': 'subtext' },
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return remote.fetch_task(input.url);
+                return remote.fetch_task(input.url, input.id, dataset.name);
               } },
             'fetch'
           )
@@ -6733,7 +6749,7 @@ var train_task = exports.train_task = function train_task(dataset) {
     return _actions2.default.queue.add_task(task);
   };
 };
-var fetch_task = exports.fetch_task = function fetch_task(url) {
+var fetch_task = exports.fetch_task = function fetch_task(url, file_id, dataset) {
   return function (dispatch) {
     if (!url) return console.log('input file inaccessible (no url)');
     var task = {
@@ -6741,7 +6757,9 @@ var fetch_task = exports.fetch_task = function fetch_task(url) {
       activity: 'fetch',
       dataset: name,
       opt: {
-        url: url
+        url: url,
+        file_id: file_id,
+        dataset: dataset
       }
     };
     return _actions2.default.queue.add_task(task);
@@ -8178,6 +8196,7 @@ var systemReducer = function systemReducer() {
         }
       });
     case _types2.default.task.task_begin:
+      console.log('task begin', action.task, action.task.processor);
       return _extends({}, state, {
         runner: _extends({}, state.runner, _defineProperty({}, action.task.processor, { status: 'RUNNING', task: action.task })),
         cmd: _extends({}, state.cmd, {
@@ -8189,9 +8208,9 @@ var systemReducer = function systemReducer() {
         stderr: ""
       });
     case _types2.default.task.task_finish:
-      if (action.task === 'cpu' || state.runner.cpu.task.uuid === action.task.uuid) {
+      if (action.task === 'cpu' || state.runner.cpu.task && action.task && state.runner.cpu.task.uuid === action.task.uuid) {
         processor = 'cpu';
-      } else if (action.task === 'gpu' || state.runner.gpu.task.uuid === action.task.uuid) {
+      } else if (action.task === 'gpu' || state.runner.cpu.task && action.task && state.runner.gpu.task.uuid === action.task.uuid) {
         processor = 'gpu';
       } else {
         processor = null;