upload status

1 files changed, 154 insertions, 16 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 1f8ad85..c89c342 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -3202,6 +3202,12 @@ var datasetReducer = function datasetReducer() {
         loading: true,
         status: 'Waiting for server to finish processing...'
       };
+    case _types2.default.folder.upload_complete:
+      return {
+        error: null,
+        loading: true,
+        status: 'Upload complete'
+      };
     case _types2.default.file.create_loading:
       return {
         error: null,
@@ -3227,6 +3233,52 @@ exports.default = datasetReducer;
 
 /***/ }),
 
+/***/ "./app/client/dataset/dataset.status.js":
+/*!**********************************************!*\
+  !*** ./app/client/dataset/dataset.status.js ***!
+  \**********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
+
+var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js");
+
+var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
+
+var _loading = __webpack_require__(/*! ../common/loading.component */ "./app/client/common/loading.component.js");
+
+var _loading2 = _interopRequireDefault(_loading);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function DatasetStatus(props) {
+  return (0, _preact.h)(
+    'div',
+    { 'class': 'status' },
+    props.status
+  );
+}
+
+var mapStateToProps = function mapStateToProps(state) {
+  return state.dataset;
+};
+
+var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
+  return {};
+};
+
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(DatasetStatus);
+
+/***/ }),
+
 /***/ "./app/client/index.jsx":
 /*!******************************!*\
   !*** ./app/client/index.jsx ***!
@@ -5338,7 +5390,7 @@ var SampleRNNDatasets = function (_Component) {
           mapFn = _util$sort$orderByFn.mapFn,
           sortFn = _util$sort$orderByFn.sortFn;
 
-      var moduleOnGPU = runner.gpu.task.module === samplernnModule.name;
+      var moduleOnGPU = 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) {
@@ -6066,7 +6118,7 @@ var samplernnReducer = function samplernnReducer() {
     case _types2.default.file.create:
     case _types2.default.folder.upload_complete:
       if (action.data.module === 'samplernn') {
-        console.log(action.data, state.folder);
+        console.log(action.data);
         var dataset = void 0,
             old_dataset = void 0,
             folder = void 0,
@@ -6089,7 +6141,7 @@ var samplernnReducer = function samplernnReducer() {
         }
         old_folder = state.data.folderLookup[action.data.folder_id];
         folder = _extends({}, old_folder, {
-          files: old_folder.files.concat[action.data.id]
+          files: old_folder.files.concat([action.data.id])
         });
         return _extends({}, state, {
           loading: false,
@@ -6425,6 +6477,10 @@ var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/mo
 
 var samplernnActions = _interopRequireWildcard(_samplernn);
 
+var _samplernn2 = __webpack_require__(/*! ./samplernn.tasks */ "./app/client/modules/samplernn/samplernn.tasks.js");
+
+var samplernnTasks = _interopRequireWildcard(_samplernn2);
+
 var _audioPlayer = __webpack_require__(/*! ../../common/audioPlayer/audioPlayer.actions */ "./app/client/common/audioPlayer/audioPlayer.actions.js");
 
 var audioPlayerActions = _interopRequireWildcard(_audioPlayer);
@@ -6441,11 +6497,15 @@ var _dataset3 = __webpack_require__(/*! ../../dataset/dataset.new */ "./app/clie
 
 var _dataset4 = _interopRequireDefault(_dataset3);
 
+var _dataset5 = __webpack_require__(/*! ../../dataset/dataset.status */ "./app/client/dataset/dataset.status.js");
+
+var _dataset6 = _interopRequireDefault(_dataset5);
+
 var _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
-var _samplernn2 = __webpack_require__(/*! ./samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js");
+var _samplernn3 = __webpack_require__(/*! ./samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js");
 
-var _samplernn3 = _interopRequireDefault(_samplernn2);
+var _samplernn4 = _interopRequireDefault(_samplernn3);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -6492,9 +6552,14 @@ var SampleRNNShow = function (_Component) {
           'div',
           { 'class': 'heading' },
           (0, _preact.h)(
-            'h1',
-            null,
-            folder ? folder.name : (0, _preact.h)(_loading2.default, null)
+            'div',
+            { 'class': 'spaced' },
+            (0, _preact.h)(
+              'h1',
+              null,
+              folder ? folder.name : (0, _preact.h)(_loading2.default, null)
+            ),
+            (0, _preact.h)(_dataset6.default, null)
           )
         ),
         folder && folder.name && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
@@ -6503,7 +6568,7 @@ var SampleRNNShow = function (_Component) {
           folder: folder,
           canUpload: true, canAddURL: true
         }),
-        (0, _preact.h)(_samplernn3.default, {
+        (0, _preact.h)(_samplernn4.default, {
           id: this.props.match.params.id || localStorage.getItem('samplernn.last_id'),
           folder: folder,
           history: history,
@@ -6532,35 +6597,35 @@ var SampleRNNShow = function (_Component) {
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return actions.train_task(dataset, 1);
+                return samplernnTasks.train_task(dataset, 1);
               } },
             'train'
           ),
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return actions.train_task(dataset, 2);
+                return samplernnTasks.train_task(dataset, 2);
               } },
             '2x'
           ),
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return actions.train_task(dataset, 4);
+                return samplernnTasks.train_task(dataset, 4);
               } },
             '4x'
           ),
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return actions.train_task(dataset, 6);
+                return samplernnTasks.train_task(dataset, 6);
               } },
             '6x'
           ),
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return actions.train_task(dataset, 18);
+                return samplernnTasks.train_task(dataset, 18);
               } },
             '18x'
           )
@@ -6572,7 +6637,7 @@ var SampleRNNShow = function (_Component) {
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return actions.clear_cache_task(dataset);
+                return samplernnTasks.clear_cache_task(dataset);
               } },
             'rm'
           )
@@ -6582,7 +6647,7 @@ var SampleRNNShow = function (_Component) {
           (0, _preact.h)(
             'span',
             { 'class': 'link', onClick: function onClick() {
-                return actions.fetch_task(dataset);
+                return samplernnTasks.fetch_task(dataset);
               } },
             'fetch'
           )
@@ -6617,6 +6682,79 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 
 /***/ }),
 
+/***/ "./app/client/modules/samplernn/samplernn.tasks.js":
+/*!*********************************************************!*\
+  !*** ./app/client/modules/samplernn/samplernn.tasks.js ***!
+  \*********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clear_cache_task = exports.fetch_task = exports.train_task = undefined;
+
+var _v = __webpack_require__(/*! uuid/v1 */ "./node_modules/uuid/v1.js");
+
+var _v2 = _interopRequireDefault(_v);
+
+var _socket = __webpack_require__(/*! ../../socket */ "./app/client/socket/index.js");
+
+var _socket2 = _interopRequireDefault(_socket);
+
+var _types = __webpack_require__(/*! ../../types */ "./app/client/types.js");
+
+var _types2 = _interopRequireDefault(_types);
+
+var _actions = __webpack_require__(/*! ../../actions */ "./app/client/actions.js");
+
+var _actions2 = _interopRequireDefault(_actions);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var train_task = exports.train_task = function train_task(dataset) {
+  var epochs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'train',
+      dataset: dataset,
+      epochs: epochs,
+      opt: {
+        sample_length: 44100 * 5,
+        n_samples: 6,
+        keep_old_checkpoints: false
+      }
+    };
+    return _actions2.default.queue.add_task(task);
+  };
+};
+var fetch_task = exports.fetch_task = function fetch_task(dataset) {
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'fetch',
+      dataset: dataset
+    };
+    return _actions2.default.queue.add_task(task);
+  };
+};
+var clear_cache_task = exports.clear_cache_task = function clear_cache_task(dataset) {
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'clear_cache',
+      dataset: dataset
+    };
+    return _actions2.default.queue.add_task(task);
+  };
+};
+
+/***/ }),
+
 /***/ "./app/client/queue/queue.actions.js":
 /*!*******************************************!*\
   !*** ./app/client/queue/queue.actions.js ***!