move views into own folder and begin prising away dataset code

1 files changed, 633 insertions, 631 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 8963cd6..0eb8310 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -4445,15 +4445,6 @@ function links() {
       null,
       (0, _preact.h)(
         _reactRouterDom.Link,
-        { to: '/pix2pix/graph/' },
-        'graph'
-      )
-    ),
-    (0, _preact.h)(
-      'span',
-      null,
-      (0, _preact.h)(
-        _reactRouterDom.Link,
         { to: '/pix2pix/live/' },
         'live'
       )
@@ -5008,30 +4999,26 @@ var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/prea
 
 var _reactRouterDom = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/es/index.js");
 
-var _samplernn = __webpack_require__(/*! ./samplernn.new */ "./app/client/modules/samplernn/samplernn.new.js");
+var _samplernn = __webpack_require__(/*! ./views/samplernn.new */ "./app/client/modules/samplernn/views/samplernn.new.js");
 
 var _samplernn2 = _interopRequireDefault(_samplernn);
 
-var _samplernn3 = __webpack_require__(/*! ./samplernn.show */ "./app/client/modules/samplernn/samplernn.show.js");
+var _samplernn3 = __webpack_require__(/*! ./views/samplernn.show */ "./app/client/modules/samplernn/views/samplernn.show.js");
 
 var _samplernn4 = _interopRequireDefault(_samplernn3);
 
-var _samplernn5 = __webpack_require__(/*! ./samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js");
+var _samplernn5 = __webpack_require__(/*! ./views/samplernn.import */ "./app/client/modules/samplernn/views/samplernn.import.js");
 
 var _samplernn6 = _interopRequireDefault(_samplernn5);
 
-var _samplernn7 = __webpack_require__(/*! ./samplernn.import */ "./app/client/modules/samplernn/samplernn.import.js");
+var _samplernn7 = __webpack_require__(/*! ./views/samplernn.results */ "./app/client/modules/samplernn/views/samplernn.results.js");
 
 var _samplernn8 = _interopRequireDefault(_samplernn7);
 
-var _samplernn9 = __webpack_require__(/*! ./samplernn.results */ "./app/client/modules/samplernn/samplernn.results.js");
+var _samplernn9 = __webpack_require__(/*! ./views/samplernn.graph */ "./app/client/modules/samplernn/views/samplernn.graph.js");
 
 var _samplernn10 = _interopRequireDefault(_samplernn9);
 
-var _samplernn11 = __webpack_require__(/*! ./samplernn.loss */ "./app/client/modules/samplernn/samplernn.loss.js");
-
-var _samplernn12 = _interopRequireDefault(_samplernn11);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function router() {
@@ -5039,11 +5026,11 @@ function router() {
     'section',
     null,
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/new/', component: _samplernn2.default }),
-    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/graph/', 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: _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 })
+    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/import/', component: _samplernn6.default }),
+    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/results/', component: _samplernn8.default }),
+    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/graph/', component: _samplernn10.default })
   );
 }
 
@@ -5516,54 +5503,20 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 var SampleRNNDatasets = function (_Component) {
   _inherits(SampleRNNDatasets, _Component);
 
-  function SampleRNNDatasets(props) {
+  function SampleRNNDatasets() {
     _classCallCheck(this, SampleRNNDatasets);
 
-    var _this = _possibleConstructorReturn(this, (SampleRNNDatasets.__proto__ || Object.getPrototypeOf(SampleRNNDatasets)).call(this, props));
-
-    _this.pickFile = _this.pickFile.bind(_this);
-    return _this;
+    return _possibleConstructorReturn(this, (SampleRNNDatasets.__proto__ || Object.getPrototypeOf(SampleRNNDatasets)).apply(this, arguments));
   }
 
   _createClass(SampleRNNDatasets, [{
-    key: 'componentWillMount',
-    value: function componentWillMount() {
-      var id = this.props.id;
-      console.log('load dataset:', id, this.props.id);
-      var _props = this.props,
-          match = _props.match,
-          samplernn = _props.samplernn,
-          actions = _props.actions;
-
-      if (id === 'new') return;
-      if (id) {
-        if (parseInt(id)) localStorage.setItem('samplernn.last_id', id);
-        if (!samplernn.folder || samplernn.folder.id !== id) {
-          actions.load_directories(id);
-        }
-      }
-    }
-  }, {
-    key: 'pickFile',
-    value: function pickFile(file) {
-      console.log('pick', file);
-    }
-  }, {
-    key: 'onDeleteFile',
-    value: function onDeleteFile(file) {
-      var yes = confirm('Are you sure you want to delete this file?');
-      if (yes) {
-        _actions2.default.file.destroy(file);
-      }
-    }
-  }, {
     key: 'render',
     value: function render() {
-      var _props2 = this.props,
-          samplernn = _props2.samplernn,
-          folder = _props2.folder,
-          match = _props2.match,
-          history = _props2.history;
+      var _props = this.props,
+          samplernn = _props.samplernn,
+          folder = _props.folder,
+          match = _props.match,
+          history = _props.history;
 
       if (samplernn.loading) {
         return (0, _preact.h)(_loading2.default, { progress: samplernn.progress });
@@ -5608,13 +5561,13 @@ var SampleRNNDatasets = function (_Component) {
     value: function renderGroups() {
       var _this2 = this;
 
-      var _props3 = this.props,
-          samplernn = _props3.samplernn,
-          folder = _props3.folder,
-          runner = _props3.runner,
-          onPickDataset = _props3.onPickDataset,
-          onPickFile = _props3.onPickFile,
-          datasetActions = _props3.datasetActions;
+      var _props2 = this.props,
+          samplernn = _props2.samplernn,
+          folder = _props2.folder,
+          runner = _props2.runner,
+          onPickDataset = _props2.onPickDataset,
+          onPickFile = _props2.onPickFile,
+          datasetActions = _props2.datasetActions;
       var _samplernn$data = samplernn.data,
           datasetLookup = _samplernn$data.datasetLookup,
           fileLookup = _samplernn$data.fileLookup;
@@ -5697,6 +5650,20 @@ var SampleRNNDatasets = function (_Component) {
       });
       return datasets;
     }
+  }, {
+    key: 'onDeleteFile',
+    value: function onDeleteFile(file) {
+      var yes = confirm('Are you sure you want to delete this file?');
+      if (yes) {
+        console.log('delete: confirmed');
+        if (this.props.onDeleteFile) {
+          console.log('calling custom deletefile function');
+          this.props.onDeleteFile(file);
+        } else {
+          _actions2.default.file.destroy(file);
+        }
+      }
+    }
   }]);
 
   return SampleRNNDatasets;
@@ -5705,14 +5672,13 @@ var SampleRNNDatasets = function (_Component) {
 var mapStateToProps = function mapStateToProps(state) {
   return {
     samplernn: state.module.samplernn,
-    runner: state.system.runner,
-    task: state.task
+    runner: state.system.runner
   };
 };
 
 var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
   return {
-    actions: (0, _redux.bindActionCreators)(samplernnActions, dispatch)
+    samplernnActions: (0, _redux.bindActionCreators)(samplernnActions, dispatch)
   };
 };
 
@@ -5720,9 +5686,9 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 
 /***/ }),
 
-/***/ "./app/client/modules/samplernn/samplernn.import.js":
+/***/ "./app/client/modules/samplernn/samplernn.module.js":
 /*!**********************************************************!*\
-  !*** ./app/client/modules/samplernn/samplernn.import.js ***!
+  !*** ./app/client/modules/samplernn/samplernn.module.js ***!
   \**********************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
@@ -5733,233 +5699,328 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var samplernnModule = {
+  name: 'samplernn',
+  datatype: 'audio'
+};
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+exports.default = samplernnModule;
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+/***/ }),
 
-var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
+/***/ "./app/client/modules/samplernn/samplernn.reducer.js":
+/*!***********************************************************!*\
+  !*** ./app/client/modules/samplernn/samplernn.reducer.js ***!
+  \***********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
 
-var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js");
+"use strict";
 
-var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
 
-var _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-var util = _interopRequireWildcard(_util);
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
+var _types = __webpack_require__(/*! ../../types */ "./app/client/types.js");
 
-var samplernnActions = _interopRequireWildcard(_samplernn);
+var _types2 = _interopRequireDefault(_types);
 
-var _select = __webpack_require__(/*! ../../common/select.component */ "./app/client/common/select.component.js");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _select2 = _interopRequireDefault(_select);
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var _textInput = __webpack_require__(/*! ../../common/textInput.component */ "./app/client/common/textInput.component.js");
+var samplernnInitialState = {
+  loading: true,
+  progress: { i: 0, n: 0 },
+  error: null,
+  folders: [],
+  folder_id: 0,
+  data: null,
+  lossReport: null
+};
 
-var _textInput2 = _interopRequireDefault(_textInput);
+var samplernnReducer = function samplernnReducer() {
+  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : samplernnInitialState;
+  var action = arguments[1];
 
-var _button = __webpack_require__(/*! ../../common/button.component */ "./app/client/common/button.component.js");
+  // console.log(action.type)
+  switch (action.type) {
+    case _types2.default.samplernn.init:
+      return _extends({}, state, {
+        loading: false,
+        data: action.data
+      });
 
-var _button2 = _interopRequireDefault(_button);
+    case _types2.default.folder.create:
+      if (action.data.module === 'samplernn') {
+        return _extends({}, state, {
+          loading: false,
+          data: {
+            folders: state.data.folders.concat([action.data.id]),
+            folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.id, action.data))
+          },
+          folder: _extends({}, action.data, {
+            datasets: [],
+            files: []
+          })
+        });
+      }
+      return state;
 
-var _samplernn2 = __webpack_require__(/*! ./samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js");
+    case _types2.default.file.create:
+      if (action.data.module === 'samplernn') {
+        console.log(action.data);
+        var dataset = void 0,
+            old_dataset = void 0,
+            folder = void 0,
+            old_folder = void 0;
+        var dataset_name = void 0;
+        if (action.data.dataset) {
+          dataset_name = action.data.dataset;
+        } else if (action.data.name) {
+          dataset_name = action.data.name.split('.')[0];
+        } else if (action.data.url) {
+          dataset_name = action.data.url;
+        } else {
+          dataset_name = null;
+        }
+        if (dataset_name in state.data.datasetLookup) {
+          old_dataset = state.data.datasetLookup[dataset_name];
+          dataset = _extends({}, old_dataset, {
+            input: action.data.generated ? old_dataset.input : [action.data.id].concat(old_dataset.input),
+            output: !action.data.generated ? old_dataset.output : [action.data.id].concat(old_dataset.output)
+          });
+        } else {
+          console.log(action.data.created_at, action.data.date);
+          dataset = {
+            name: dataset_name,
+            date: action.data.created_at || action.data.date,
+            input: action.data.generated ? [] : [action.data.id],
+            checkpoints: [],
+            output: !action.data.generated ? [] : [action.data.id]
+          };
+        }
+        old_folder = state.data.folderLookup[action.data.folder_id];
+        folder = _extends({}, old_folder, {
+          datasets: old_folder.datasets.concat([dataset_name]),
+          files: old_folder.files.concat([action.data.id])
+        });
+        return _extends({}, state, {
+          loading: false,
+          data: _extends({}, state.data, {
+            files: state.data.files.concat([action.data.id]),
+            folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.folder_id, folder)),
+            fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)),
+            datasetLookup: _extends({}, state.data.datasetLookup, _defineProperty({}, dataset_name, dataset))
+          })
+        });
+      }
+      return state;
 
-var _samplernn3 = _interopRequireDefault(_samplernn2);
+    case _types2.default.file.update:
+      if (action.data.module === 'samplernn') {
+        var _extends6;
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+        var _old_dataset = void 0;
+        var new_dataset = state.data.datasetLookup[action.data.dataset];
+        var old_file = state.data.fileLookup[action.data.id];
+        var new_dataset_update = void 0;
+        if (old_file && action.data.dataset !== old_file.dataset) {
+          if (state.data.datasetLookup[old_file.dataset]) {
+            _old_dataset = state.data.datasetLookup[old_file.dataset];
+            old_dataset_update = _extends({}, _old_dataset, {
+              input: _old_dataset.input.filter(function (id) {
+                return id !== action.data.id;
+              }),
+              output: _old_dataset.output.filter(function (id) {
+                return id !== action.data.id;
+              })
+            });
+          }
+          new_dataset_update = _extends({}, new_dataset, {
+            input: action.data.generated ? [] : [action.data.id],
+            output: !action.data.generated ? [] : [action.data.id]
+          });
+        }
+        console.log('old_dataset', old_dataset_update.name);
+        console.log('new_dataset', new_dataset_update.name);
+        return _extends({}, state, {
+          loading: false,
+          data: _extends({}, state.data, {
+            datasetLookup: _old_dataset ? _extends({}, state.data.datasetLookup, (_extends6 = {}, _defineProperty(_extends6, _old_dataset.name, old_dataset_update), _defineProperty(_extends6, new_dataset.name, new_dataset_update), _extends6)) : new_dataset_update ? _extends({}, state.data.datasetLookup, _defineProperty({}, new_dataset.name, new_dataset_update)) : state.data.datasetLookup,
+            fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data))
+          })
+        });
+      }
+      return state;
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+    case _types2.default.file.destroy:
+      if (action.data.module === 'samplernn') {
+        // delete the key from fileLookup
+        var fileLookup = _extends({}, state.data.fileLookup);
+        var datasetLookup = _extends({}, state.data.datasetLookup);
+        var folderLookup = _extends({}, state.data.folderLookup);
+        var _old_file = fileLookup[action.data.id];
+        if (!_old_file) return state;
+        var _old_dataset2 = state.data.datasetLookup[_old_file.dataset];
+        var _dataset = void 0;
+        if (_old_dataset2) {
+          _dataset = _extends({}, _old_dataset2, {
+            input: _old_dataset2.input.filter(function (id) {
+              return id !== _old_file.id;
+            }),
+            output: _old_dataset2.output.filter(function (id) {
+              return id !== _old_file.id;
+            })
+          });
+          if (!_dataset.input.length && !_dataset.checkpoints.length && !_dataset.output.length) {
+            delete datasetLookup[_old_file.dataset];
+            var _old_folder = folderLookup[_old_file.folder_id];
+            folderLookup[_old_file.folder_id] = _extends({}, _old_folder, {
+              datasets: _old_folder.datasets.filter(function (name) {
+                return name !== _old_file.dataset;
+              })
+            });
+          } else {
+            console.log('dataset just needs sweeping');
+            datasetLookup[_old_file.dataset] = _dataset;
+          }
+        }
+        delete fileLookup[_old_file.id];
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+        return _extends({}, state, {
+          loading: false,
+          data: _extends({}, state.data, {
+            folderLookup: folderLookup,
+            fileLookup: fileLookup,
+            datasetLookup: datasetLookup
+          })
+        });
+      }
+      return state;
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+    case _types2.default.samplernn.set_folder:
+      return _extends({}, state, {
+        folder_id: action.folder_id
+      });
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+    case _types2.default.samplernn.load_loss:
+      return _extends({}, state, {
+        lossReport: action.lossReport
+      });
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+    case _types2.default.app.load_progress:
+      return _extends({}, state, {
+        progress: action.progress
+      });
 
-var samplernnModule = {
-  name: 'samplernn',
-  datatype: 'audio'
+    default:
+      return state;
+  }
 };
 
-var SampleRNNImport = function (_Component) {
-  _inherits(SampleRNNImport, _Component);
+exports.default = samplernnReducer;
 
-  function SampleRNNImport() {
-    _classCallCheck(this, SampleRNNImport);
+/***/ }),
 
-    var _this = _possibleConstructorReturn(this, (SampleRNNImport.__proto__ || Object.getPrototypeOf(SampleRNNImport)).call(this));
+/***/ "./app/client/modules/samplernn/samplernn.tasks.js":
+/*!*********************************************************!*\
+  !*** ./app/client/modules/samplernn/samplernn.tasks.js ***!
+  \*********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
 
-    _this.state = {
-      folder: 1,
-      import_action: 'Hotlink',
-      url_base: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4279/',
-      selected: {}
-    };
-    return _this;
-  }
+"use strict";
 
-  _createClass(SampleRNNImport, [{
-    key: 'render',
-    value: function render() {
-      var _this2 = this;
 
-      var datasets = [],
-          folder = void 0;
-      if (this.props.samplernn.data) {
-        datasets = (this.props.samplernn.data.folders || []).map(function (folder) {
-          return [folder.name, folder.id];
-        });
-        folder = this.props.samplernn.data.folderLookup.unsorted;
-      }
-      return (0, _preact.h)(
-        'div',
-        { className: 'app top' },
-        (0, _preact.h)(
-          'div',
-          { 'class': 'heading' },
-          (0, _preact.h)(
-            'h1',
-            null,
-            'Import'
-          )
-        ),
-        (0, _preact.h)(
-          'div',
-          { 'class': 'params form row datasets' },
-          (0, _preact.h)(
-            'div',
-            { 'class': 'row dataset' },
-            (0, _preact.h)('div', { 'class': 'col' }),
-            (0, _preact.h)('div', { 'class': 'col' }),
-            (0, _preact.h)('div', { 'class': 'col' }),
-            (0, _preact.h)(
-              'div',
-              { 'class': 'col' },
-              (0, _preact.h)(
-                'h2',
-                null,
-                'Import to dataset'
-              ),
-              (0, _preact.h)(_select2.default, {
-                title: 'Destination dataset',
-                options: datasets,
-                name: 'folder',
-                opt: this.state,
-                onChange: function onChange(name, value) {
-                  return _this2.setState({ folder: value });
-                }
-              }),
-              (0, _preact.h)(_select2.default, {
-                title: 'Import action',
-                options: ['Hotlink', 'Upload'],
-                name: 'import_action',
-                opt: this.state,
-                onChange: function onChange(name, value) {
-                  return _this2.setState({ import_action: value });
-                }
-              }),
-              (0, _preact.h)(_textInput2.default, {
-                title: 'Remote URL base',
-                value: this.state.url_base,
-                placeholder: 'http://',
-                onSave: function onSave(value) {
-                  return _this2.setState({ url_base: value });
-                }
-              }),
-              (0, _preact.h)(
-                _button2.default,
-                {
-                  title: '',
-                  onClick: function onClick() {
-                    return _this2.doImport();
-                  }
-                },
-                'Import'
-              )
-            )
-          )
-        ),
-        (0, _preact.h)(_samplernn3.default, {
-          id: 'unsorted',
-          folder: folder,
-          history: this.props.history,
-          onPickDataset: function onPickDataset(dataset) {
-            return _this2.toggle(dataset.name, _this2.state.selected[name]);
-          },
-          beforeRow: function beforeRow(dataset) {
-            return _this2.beforeRow(dataset);
-          },
-          afterRow: function afterRow(dataset) {
-            return _this2.afterRow(dataset);
-          }
-        })
-      );
-    }
-  }, {
-    key: 'toggle',
-    value: function toggle(name) {
-      this.setState(_extends({}, this.state, {
-        selected: _extends({}, this.state.selected, _defineProperty({}, name, !this.state.selected[name]))
-      }));
-    }
-  }, {
-    key: 'beforeRow',
-    value: function beforeRow(dataset) {
-      // console.log(dataset)
-    }
-  }, {
-    key: 'afterRow',
-    value: function afterRow(dataset) {
-      var name = dataset.name;
-      return (0, _preact.h)(
-        'div',
-        null,
-        (0, _preact.h)('input', {
-          type: 'checkbox',
-          value: name,
-          checked: !!this.state.selected[name]
-        })
-      );
-    }
-  }, {
-    key: 'doImport',
-    value: function doImport() {
-      var samplernn = this.props.samplernn;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clear_cache_task = exports.log_task = exports.fetch_task = exports.train_task = undefined;
 
-      console.log(this.state);
-      this.props.actions.import_files(this.state, samplernn.data.datasetLookup, samplernn.data.fileLookup);
-    }
-  }]);
+var _v = __webpack_require__(/*! uuid/v1 */ "./node_modules/uuid/v1.js");
 
-  return SampleRNNImport;
-}(_preact.Component);
+var _v2 = _interopRequireDefault(_v);
 
-var mapStateToProps = function mapStateToProps(state) {
-  return {
-    samplernn: state.module.samplernn,
-    runner: state.system.runner,
-    task: state.task
+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, folder_id) {
+  var epochs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'train',
+      dataset: dataset.name,
+      epochs: epochs,
+      opt: {
+        folder_id: folder_id,
+        sample_length: 44100 * 5,
+        n_samples: 6,
+        keep_old_checkpoints: false
+      }
+    };
+    console.log(task);
+    return _actions2.default.queue.add_task(task);
   };
 };
-
-var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
-  return {
-    actions: (0, _redux.bindActionCreators)(samplernnActions, dispatch)
+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 = {
+      module: 'samplernn',
+      activity: 'fetch',
+      dataset: dataset,
+      opt: {
+        url: url,
+        file_id: file_id,
+        dataset: dataset
+      }
+    };
+    return _actions2.default.queue.add_task(task);
+  };
+};
+var log_task = exports.log_task = function log_task(dataset) {
+  return function (dispatch) {
+    var task = {
+      module: 'samplernn',
+      activity: 'log',
+      dataset: dataset.name
+    };
+    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.name
+    };
+    return _actions2.default.queue.add_task(task);
   };
 };
-
-exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(SampleRNNImport);
 
 /***/ }),
 
-/***/ "./app/client/modules/samplernn/samplernn.loss.js":
-/*!********************************************************!*\
-  !*** ./app/client/modules/samplernn/samplernn.loss.js ***!
-  \********************************************************/
+/***/ "./app/client/modules/samplernn/views/samplernn.graph.js":
+/*!***************************************************************!*\
+  !*** ./app/client/modules/samplernn/views/samplernn.graph.js ***!
+  \***************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -5978,31 +6039,31 @@ 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 _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
+var _util = __webpack_require__(/*! ../../../util */ "./app/client/util/index.js");
 
-var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
+var _samplernn = __webpack_require__(/*! ../samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
 
 var samplernnActions = _interopRequireWildcard(_samplernn);
 
-var _group = __webpack_require__(/*! ../../common/group.component */ "./app/client/common/group.component.js");
+var _group = __webpack_require__(/*! ../../../common/group.component */ "./app/client/common/group.component.js");
 
 var _group2 = _interopRequireDefault(_group);
 
-var _slider = __webpack_require__(/*! ../../common/slider.component */ "./app/client/common/slider.component.js");
+var _slider = __webpack_require__(/*! ../../../common/slider.component */ "./app/client/common/slider.component.js");
 
 var _slider2 = _interopRequireDefault(_slider);
 
-var _select = __webpack_require__(/*! ../../common/select.component */ "./app/client/common/select.component.js");
+var _select = __webpack_require__(/*! ../../../common/select.component */ "./app/client/common/select.component.js");
 
 var _select2 = _interopRequireDefault(_select);
 
-var _button = __webpack_require__(/*! ../../common/button.component */ "./app/client/common/button.component.js");
+var _button = __webpack_require__(/*! ../../../common/button.component */ "./app/client/common/button.component.js");
 
 var _button2 = _interopRequireDefault(_button);
 
-var _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js");
+var _fileList = __webpack_require__(/*! ../../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
-var _textInput = __webpack_require__(/*! ../../common/textInput.component */ "./app/client/common/textInput.component.js");
+var _textInput = __webpack_require__(/*! ../../../common/textInput.component */ "./app/client/common/textInput.component.js");
 
 var _textInput2 = _interopRequireDefault(_textInput);
 
@@ -6016,19 +6077,19 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-var SampleRNNLoss = function (_Component) {
-  _inherits(SampleRNNLoss, _Component);
+var SampleRNNGraph = function (_Component) {
+  _inherits(SampleRNNGraph, _Component);
 
-  function SampleRNNLoss(props) {
-    _classCallCheck(this, SampleRNNLoss);
+  function SampleRNNGraph(props) {
+    _classCallCheck(this, SampleRNNGraph);
 
-    var _this = _possibleConstructorReturn(this, (SampleRNNLoss.__proto__ || Object.getPrototypeOf(SampleRNNLoss)).call(this));
+    var _this = _possibleConstructorReturn(this, (SampleRNNGraph.__proto__ || Object.getPrototypeOf(SampleRNNGraph)).call(this));
 
     props.actions.load_loss();
     return _this;
   }
 
-  _createClass(SampleRNNLoss, [{
+  _createClass(SampleRNNGraph, [{
     key: 'render',
     value: function render() {
       var _this2 = this;
@@ -6043,7 +6104,7 @@ var SampleRNNLoss = function (_Component) {
           (0, _preact.h)(
             'h3',
             null,
-            'SampleRNN Loss'
+            'SampleRNN Loss Graph'
           ),
           (0, _preact.h)('canvas', { ref: function ref(_ref) {
               return _this2.refs['canvas'] = _ref;
@@ -6176,7 +6237,7 @@ var SampleRNNLoss = function (_Component) {
     }
   }]);
 
-  return SampleRNNLoss;
+  return SampleRNNGraph;
 }(_preact.Component);
 
 var mapStateToProps = function mapStateToProps(state) {
@@ -6191,14 +6252,14 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(SampleRNNLoss);
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(SampleRNNGraph);
 
 /***/ }),
 
-/***/ "./app/client/modules/samplernn/samplernn.module.js":
-/*!**********************************************************!*\
-  !*** ./app/client/modules/samplernn/samplernn.module.js ***!
-  \**********************************************************/
+/***/ "./app/client/modules/samplernn/views/samplernn.import.js":
+/*!****************************************************************!*\
+  !*** ./app/client/modules/samplernn/views/samplernn.import.js ***!
+  \****************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6208,28 +6269,8 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var samplernnModule = {
-  name: 'samplernn',
-  datatype: 'audio'
-};
 
-exports.default = samplernnModule;
-
-/***/ }),
-
-/***/ "./app/client/modules/samplernn/samplernn.new.js":
-/*!*******************************************************!*\
-  !*** ./app/client/modules/samplernn/samplernn.new.js ***!
-  \*******************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -6239,25 +6280,27 @@ 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 _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
+var _util = __webpack_require__(/*! ../../../util */ "./app/client/util/index.js");
 
 var util = _interopRequireWildcard(_util);
 
-var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
+var _samplernn = __webpack_require__(/*! ../samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
 
 var samplernnActions = _interopRequireWildcard(_samplernn);
 
-var _dataset = __webpack_require__(/*! ../../dataset/dataset.form */ "./app/client/dataset/dataset.form.js");
+var _select = __webpack_require__(/*! ../../../common/select.component */ "./app/client/common/select.component.js");
 
-var _dataset2 = _interopRequireDefault(_dataset);
+var _select2 = _interopRequireDefault(_select);
 
-var _dataset3 = __webpack_require__(/*! ../../dataset/dataset.new */ "./app/client/dataset/dataset.new.js");
+var _textInput = __webpack_require__(/*! ../../../common/textInput.component */ "./app/client/common/textInput.component.js");
 
-var _dataset4 = _interopRequireDefault(_dataset3);
+var _textInput2 = _interopRequireDefault(_textInput);
 
-var _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js");
+var _button = __webpack_require__(/*! ../../../common/button.component */ "./app/client/common/button.component.js");
 
-var _samplernn2 = __webpack_require__(/*! ./samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js");
+var _button2 = _interopRequireDefault(_button);
+
+var _samplernn2 = __webpack_require__(/*! ../samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js");
 
 var _samplernn3 = _interopRequireDefault(_samplernn2);
 
@@ -6265,40 +6308,195 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-var SampleRNNNew = function (_Component) {
-  _inherits(SampleRNNNew, _Component);
+var samplernnModule = {
+  name: 'samplernn',
+  datatype: 'audio'
+};
 
-  function SampleRNNNew(props) {
-    _classCallCheck(this, SampleRNNNew);
+var SampleRNNImport = function (_Component) {
+  _inherits(SampleRNNImport, _Component);
 
-    return _possibleConstructorReturn(this, (SampleRNNNew.__proto__ || Object.getPrototypeOf(SampleRNNNew)).call(this, props));
+  function SampleRNNImport() {
+    _classCallCheck(this, SampleRNNImport);
+
+    var _this = _possibleConstructorReturn(this, (SampleRNNImport.__proto__ || Object.getPrototypeOf(SampleRNNImport)).call(this));
+
+    _this.state = {
+      folder: 1,
+      import_action: 'Hotlink',
+      url_base: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4279/',
+      selected: {}
+    };
+    return _this;
   }
 
-  _createClass(SampleRNNNew, [{
+  _createClass(SampleRNNImport, [{
+    key: 'componentWillMount',
+    value: function componentWillMount() {
+      var id = this.props.match.params.id || localStorage.getItem('samplernn.last_id');
+      console.log('load dataset:', id);
+      var _props = this.props,
+          match = _props.match,
+          samplernn = _props.samplernn,
+          samplernnActions = _props.samplernnActions;
+
+      if (id === 'new') return;
+      if (id) {
+        if (parseInt(id)) localStorage.setItem('samplernn.last_id', id);
+        if (!samplernn.folder || samplernn.folder.id !== id) {
+          samplernnActions.load_directories(id);
+        }
+      }
+    }
+  }, {
     key: 'render',
     value: function render() {
-      var history = this.props.history;
+      var _this2 = this;
 
+      var datasets = [],
+          folder = void 0;
+      if (this.props.samplernn.data) {
+        datasets = (this.props.samplernn.data.folders || []).map(function (folder) {
+          return [folder.name, folder.id];
+        });
+        folder = this.props.samplernn.data.folderLookup.unsorted;
+      }
       return (0, _preact.h)(
         'div',
-        { 'class': 'app samplernn' },
-        (0, _preact.h)(_dataset4.default, { module: _samplernn3.default, history: history })
+        { className: 'app top' },
+        (0, _preact.h)(
+          'div',
+          { 'class': 'heading' },
+          (0, _preact.h)(
+            'h1',
+            null,
+            'Import'
+          )
+        ),
+        (0, _preact.h)(
+          'div',
+          { 'class': 'params form row datasets' },
+          (0, _preact.h)(
+            'div',
+            { 'class': 'row dataset' },
+            (0, _preact.h)('div', { 'class': 'col' }),
+            (0, _preact.h)('div', { 'class': 'col' }),
+            (0, _preact.h)('div', { 'class': 'col' }),
+            (0, _preact.h)(
+              'div',
+              { 'class': 'col' },
+              (0, _preact.h)(
+                'h2',
+                null,
+                'Import to dataset'
+              ),
+              (0, _preact.h)(_select2.default, {
+                title: 'Destination dataset',
+                options: datasets,
+                name: 'folder',
+                opt: this.state,
+                onChange: function onChange(name, value) {
+                  return _this2.setState({ folder: value });
+                }
+              }),
+              (0, _preact.h)(_select2.default, {
+                title: 'Import action',
+                options: ['Hotlink', 'Upload'],
+                name: 'import_action',
+                opt: this.state,
+                onChange: function onChange(name, value) {
+                  return _this2.setState({ import_action: value });
+                }
+              }),
+              (0, _preact.h)(_textInput2.default, {
+                title: 'Remote URL base',
+                value: this.state.url_base,
+                placeholder: 'http://',
+                onSave: function onSave(value) {
+                  return _this2.setState({ url_base: value });
+                }
+              }),
+              (0, _preact.h)(
+                _button2.default,
+                {
+                  title: '',
+                  onClick: function onClick() {
+                    return _this2.doImport();
+                  }
+                },
+                'Import'
+              )
+            )
+          )
+        ),
+        (0, _preact.h)(_samplernn3.default, {
+          id: 'unsorted',
+          folder: folder,
+          history: this.props.history,
+          onPickDataset: function onPickDataset(dataset) {
+            return _this2.toggle(dataset.name, _this2.state.selected[name]);
+          },
+          beforeRow: function beforeRow(dataset) {
+            return _this2.beforeRow(dataset);
+          },
+          afterRow: function afterRow(dataset) {
+            return _this2.afterRow(dataset);
+          }
+        })
       );
     }
+  }, {
+    key: 'toggle',
+    value: function toggle(name) {
+      this.setState(_extends({}, this.state, {
+        selected: _extends({}, this.state.selected, _defineProperty({}, name, !this.state.selected[name]))
+      }));
+    }
+  }, {
+    key: 'beforeRow',
+    value: function beforeRow(dataset) {
+      // console.log(dataset)
+    }
+  }, {
+    key: 'afterRow',
+    value: function afterRow(dataset) {
+      var name = dataset.name;
+      return (0, _preact.h)(
+        'div',
+        null,
+        (0, _preact.h)('input', {
+          type: 'checkbox',
+          value: name,
+          checked: !!this.state.selected[name]
+        })
+      );
+    }
+  }, {
+    key: 'doImport',
+    value: function doImport() {
+      var samplernn = this.props.samplernn;
+
+      console.log(this.state);
+      this.props.actions.import_files(this.state, samplernn.data.datasetLookup, samplernn.data.fileLookup);
+    }
   }]);
 
-  return SampleRNNNew;
+  return SampleRNNImport;
 }(_preact.Component);
 
 var mapStateToProps = function mapStateToProps(state) {
   return {
-    samplernn: state.module.samplernn
+    samplernn: state.module.samplernn,
+    runner: state.system.runner,
+    task: state.task
   };
 };
 
@@ -6308,14 +6506,14 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(SampleRNNNew);
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(SampleRNNImport);
 
 /***/ }),
 
-/***/ "./app/client/modules/samplernn/samplernn.reducer.js":
-/*!***********************************************************!*\
-  !*** ./app/client/modules/samplernn/samplernn.reducer.js ***!
-  \***********************************************************/
+/***/ "./app/client/modules/samplernn/views/samplernn.new.js":
+/*!*************************************************************!*\
+  !*** ./app/client/modules/samplernn/views/samplernn.new.js ***!
+  \*************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6326,214 +6524,91 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
-var _types = __webpack_require__(/*! ../../types */ "./app/client/types.js");
+var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
 
-var _types2 = _interopRequireDefault(_types);
+var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+var _util = __webpack_require__(/*! ../../../util */ "./app/client/util/index.js");
 
-var samplernnInitialState = {
-  loading: true,
-  progress: { i: 0, n: 0 },
-  error: null,
-  folders: [],
-  folder_id: 0,
-  data: null,
-  lossReport: null
-};
+var util = _interopRequireWildcard(_util);
 
-var samplernnReducer = function samplernnReducer() {
-  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : samplernnInitialState;
-  var action = arguments[1];
+var _samplernn = __webpack_require__(/*! ../samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
 
-  // console.log(action.type)
-  switch (action.type) {
-    case _types2.default.samplernn.init:
-      return _extends({}, state, {
-        loading: false,
-        data: action.data
-      });
+var samplernnActions = _interopRequireWildcard(_samplernn);
 
-    case _types2.default.folder.create:
-      if (action.data.module === 'samplernn') {
-        return _extends({}, state, {
-          loading: false,
-          data: {
-            folders: state.data.folders.concat([action.data.id]),
-            folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.id, action.data))
-          },
-          folder: _extends({}, action.data, {
-            datasets: [],
-            files: []
-          })
-        });
-      }
-      return state;
+var _dataset = __webpack_require__(/*! ../../../dataset/dataset.form */ "./app/client/dataset/dataset.form.js");
 
-    case _types2.default.file.create:
-      if (action.data.module === 'samplernn') {
-        console.log(action.data);
-        var dataset = void 0,
-            old_dataset = void 0,
-            folder = void 0,
-            old_folder = void 0;
-        var dataset_name = void 0;
-        if (action.data.dataset) {
-          dataset_name = action.data.dataset;
-        } else if (action.data.name) {
-          dataset_name = action.data.name.split('.')[0];
-        } else if (action.data.url) {
-          dataset_name = action.data.url;
-        } else {
-          dataset_name = null;
-        }
-        if (dataset_name in state.data.datasetLookup) {
-          old_dataset = state.data.datasetLookup[dataset_name];
-          dataset = _extends({}, old_dataset, {
-            input: action.data.generated ? old_dataset.input : [action.data.id].concat(old_dataset.input),
-            output: !action.data.generated ? old_dataset.output : [action.data.id].concat(old_dataset.output)
-          });
-        } else {
-          console.log(action.data.created_at, action.data.date);
-          dataset = {
-            name: dataset_name,
-            date: action.data.created_at || action.data.date,
-            input: action.data.generated ? [] : [action.data.id],
-            checkpoints: [],
-            output: !action.data.generated ? [] : [action.data.id]
-          };
-        }
-        old_folder = state.data.folderLookup[action.data.folder_id];
-        folder = _extends({}, old_folder, {
-          datasets: old_folder.datasets.concat([dataset_name]),
-          files: old_folder.files.concat([action.data.id])
-        });
-        return _extends({}, state, {
-          loading: false,
-          data: _extends({}, state.data, {
-            files: state.data.files.concat([action.data.id]),
-            folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.folder_id, folder)),
-            fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)),
-            datasetLookup: _extends({}, state.data.datasetLookup, _defineProperty({}, dataset_name, dataset))
-          })
-        });
-      }
-      return state;
+var _dataset2 = _interopRequireDefault(_dataset);
 
-    case _types2.default.file.update:
-      if (action.data.module === 'samplernn') {
-        var _extends6;
+var _dataset3 = __webpack_require__(/*! ../../../dataset/dataset.new */ "./app/client/dataset/dataset.new.js");
 
-        var _old_dataset = void 0;
-        var new_dataset = state.data.datasetLookup[action.data.dataset];
-        var old_file = state.data.fileLookup[action.data.id];
-        var new_dataset_update = void 0;
-        if (old_file && action.data.dataset !== old_file.dataset) {
-          if (state.data.datasetLookup[old_file.dataset]) {
-            _old_dataset = state.data.datasetLookup[old_file.dataset];
-            old_dataset_update = _extends({}, _old_dataset, {
-              input: _old_dataset.input.filter(function (id) {
-                return id !== action.data.id;
-              }),
-              output: _old_dataset.output.filter(function (id) {
-                return id !== action.data.id;
-              })
-            });
-          }
-          new_dataset_update = _extends({}, new_dataset, {
-            input: action.data.generated ? [] : [action.data.id],
-            output: !action.data.generated ? [] : [action.data.id]
-          });
-        }
-        console.log('old_dataset', old_dataset_update.name);
-        console.log('new_dataset', new_dataset_update.name);
-        return _extends({}, state, {
-          loading: false,
-          data: _extends({}, state.data, {
-            datasetLookup: _old_dataset ? _extends({}, state.data.datasetLookup, (_extends6 = {}, _defineProperty(_extends6, _old_dataset.name, old_dataset_update), _defineProperty(_extends6, new_dataset.name, new_dataset_update), _extends6)) : new_dataset_update ? _extends({}, state.data.datasetLookup, _defineProperty({}, new_dataset.name, new_dataset_update)) : state.data.datasetLookup,
-            fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data))
-          })
-        });
-      }
-      return state;
+var _dataset4 = _interopRequireDefault(_dataset3);
 
-    case _types2.default.file.destroy:
-      if (action.data.module === 'samplernn') {
-        // delete the key from fileLookup
-        var fileLookup = _extends({}, state.data.fileLookup);
-        var datasetLookup = _extends({}, state.data.datasetLookup);
-        var folderLookup = _extends({}, state.data.folderLookup);
-        var _old_file = fileLookup[action.data.id];
-        if (!_old_file) return state;
-        var _old_dataset2 = state.data.datasetLookup[_old_file.dataset];
-        var _dataset = void 0;
-        if (_old_dataset2) {
-          _dataset = _extends({}, _old_dataset2, {
-            input: _old_dataset2.input.filter(function (id) {
-              return id !== _old_file.id;
-            }),
-            output: _old_dataset2.output.filter(function (id) {
-              return id !== _old_file.id;
-            })
-          });
-          if (!_dataset.input.length && !_dataset.checkpoints.length && !_dataset.output.length) {
-            delete datasetLookup[_old_file.dataset];
-            var _old_folder = folderLookup[_old_file.folder_id];
-            folderLookup[_old_file.folder_id] = _extends({}, _old_folder, {
-              datasets: _old_folder.datasets.filter(function (name) {
-                return name !== _old_file.dataset;
-              })
-            });
-          } else {
-            console.log('dataset just needs sweeping');
-            datasetLookup[_old_file.dataset] = _dataset;
-          }
-        }
-        delete fileLookup[_old_file.id];
+var _fileList = __webpack_require__(/*! ../../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
-        return _extends({}, state, {
-          loading: false,
-          data: _extends({}, state.data, {
-            folderLookup: folderLookup,
-            fileLookup: fileLookup,
-            datasetLookup: datasetLookup
-          })
-        });
-      }
-      return state;
+var _samplernn2 = __webpack_require__(/*! ../samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js");
 
-    case _types2.default.samplernn.set_folder:
-      return _extends({}, state, {
-        folder_id: action.folder_id
-      });
+var _samplernn3 = _interopRequireDefault(_samplernn2);
 
-    case _types2.default.samplernn.load_loss:
-      return _extends({}, state, {
-        lossReport: action.lossReport
-      });
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-    case _types2.default.app.load_progress:
-      return _extends({}, state, {
-        progress: action.progress
-      });
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-    default:
-      return state;
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var SampleRNNNew = function (_Component) {
+  _inherits(SampleRNNNew, _Component);
+
+  function SampleRNNNew(props) {
+    _classCallCheck(this, SampleRNNNew);
+
+    return _possibleConstructorReturn(this, (SampleRNNNew.__proto__ || Object.getPrototypeOf(SampleRNNNew)).call(this, props));
   }
+
+  _createClass(SampleRNNNew, [{
+    key: 'render',
+    value: function render() {
+      var history = this.props.history;
+
+      return (0, _preact.h)(
+        'div',
+        { 'class': 'app samplernn' },
+        (0, _preact.h)(_dataset4.default, { module: _samplernn3.default, history: history })
+      );
+    }
+  }]);
+
+  return SampleRNNNew;
+}(_preact.Component);
+
+var mapStateToProps = function mapStateToProps(state) {
+  return {
+    samplernn: state.module.samplernn
+  };
 };
 
-exports.default = samplernnReducer;
+var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
+  return {
+    actions: (0, _redux.bindActionCreators)(samplernnActions, dispatch)
+  };
+};
+
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(SampleRNNNew);
 
 /***/ }),
 
-/***/ "./app/client/modules/samplernn/samplernn.results.js":
-/*!***********************************************************!*\
-  !*** ./app/client/modules/samplernn/samplernn.results.js ***!
-  \***********************************************************/
+/***/ "./app/client/modules/samplernn/views/samplernn.results.js":
+/*!*****************************************************************!*\
+  !*** ./app/client/modules/samplernn/views/samplernn.results.js ***!
+  \*****************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6554,23 +6629,23 @@ var _reactRouterDom = __webpack_require__(/*! react-router-dom */ "./node_module
 
 var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
 
-var _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
+var _util = __webpack_require__(/*! ../../../util */ "./app/client/util/index.js");
 
 var util = _interopRequireWildcard(_util);
 
-var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
+var _samplernn = __webpack_require__(/*! ../samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
 
 var samplernnActions = _interopRequireWildcard(_samplernn);
 
-var _audioPlayer = __webpack_require__(/*! ../../common/audioPlayer/audioPlayer.actions */ "./app/client/common/audioPlayer/audioPlayer.actions.js");
+var _audioPlayer = __webpack_require__(/*! ../../../common/audioPlayer/audioPlayer.actions */ "./app/client/common/audioPlayer/audioPlayer.actions.js");
 
 var audioPlayerActions = _interopRequireWildcard(_audioPlayer);
 
-var _loading = __webpack_require__(/*! ../../common/loading.component */ "./app/client/common/loading.component.js");
+var _loading = __webpack_require__(/*! ../../../common/loading.component */ "./app/client/common/loading.component.js");
 
 var _loading2 = _interopRequireDefault(_loading);
 
-var _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js");
+var _fileList = __webpack_require__(/*! ../../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -6708,10 +6783,10 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 
 /***/ }),
 
-/***/ "./app/client/modules/samplernn/samplernn.show.js":
-/*!********************************************************!*\
-  !*** ./app/client/modules/samplernn/samplernn.show.js ***!
-  \********************************************************/
+/***/ "./app/client/modules/samplernn/views/samplernn.show.js":
+/*!**************************************************************!*\
+  !*** ./app/client/modules/samplernn/views/samplernn.show.js ***!
+  \**************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -6730,45 +6805,45 @@ 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 _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
+var _util = __webpack_require__(/*! ../../../util */ "./app/client/util/index.js");
 
 var util = _interopRequireWildcard(_util);
 
-var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
+var _samplernn = __webpack_require__(/*! ../samplernn.actions */ "./app/client/modules/samplernn/samplernn.actions.js");
 
 var samplernnActions = _interopRequireWildcard(_samplernn);
 
-var _samplernn2 = __webpack_require__(/*! ./samplernn.tasks */ "./app/client/modules/samplernn/samplernn.tasks.js");
+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 _audioPlayer = __webpack_require__(/*! ../../../common/audioPlayer/audioPlayer.actions */ "./app/client/common/audioPlayer/audioPlayer.actions.js");
 
 var audioPlayerActions = _interopRequireWildcard(_audioPlayer);
 
-var _loading = __webpack_require__(/*! ../../common/loading.component */ "./app/client/common/loading.component.js");
+var _loading = __webpack_require__(/*! ../../../common/loading.component */ "./app/client/common/loading.component.js");
 
 var _loading2 = _interopRequireDefault(_loading);
 
-var _dataset = __webpack_require__(/*! ../../dataset/dataset.form */ "./app/client/dataset/dataset.form.js");
+var _dataset = __webpack_require__(/*! ../../../dataset/dataset.form */ "./app/client/dataset/dataset.form.js");
 
 var _dataset2 = _interopRequireDefault(_dataset);
 
-var _dataset3 = __webpack_require__(/*! ../../dataset/dataset.new */ "./app/client/dataset/dataset.new.js");
+var _dataset3 = __webpack_require__(/*! ../../../dataset/dataset.new */ "./app/client/dataset/dataset.new.js");
 
 var _dataset4 = _interopRequireDefault(_dataset3);
 
-var _dataset5 = __webpack_require__(/*! ../../dataset/dataset.status */ "./app/client/dataset/dataset.status.js");
+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 _fileList = __webpack_require__(/*! ../../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
-var _samplernn3 = __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 _samplernn4 = _interopRequireDefault(_samplernn3);
 
-var _samplernn5 = __webpack_require__(/*! ./samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js");
+var _samplernn5 = __webpack_require__(/*! ../samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js");
 
 var _samplernn6 = _interopRequireDefault(_samplernn5);
 
@@ -6795,14 +6870,32 @@ var SampleRNNShow = function (_Component) {
   }
 
   _createClass(SampleRNNShow, [{
+    key: 'componentWillMount',
+    value: function componentWillMount() {
+      var id = this.props.match.params.id || localStorage.getItem('samplernn.last_id');
+      console.log('load dataset:', id);
+      var _props = this.props,
+          match = _props.match,
+          samplernn = _props.samplernn,
+          actions = _props.actions;
+
+      if (id === 'new') return;
+      if (id) {
+        if (parseInt(id)) localStorage.setItem('samplernn.last_id', id);
+        if (!samplernn.folder || samplernn.folder.id !== id) {
+          actions.load_directories(id);
+        }
+      }
+    }
+  }, {
     key: 'render',
     value: function render() {
       var _this2 = this;
 
-      var _props = this.props,
-          samplernn = _props.samplernn,
-          match = _props.match,
-          history = _props.history;
+      var _props2 = this.props,
+          samplernn = _props2.samplernn,
+          match = _props2.match,
+          history = _props2.history;
 
       var _ref = samplernn.data || {},
           folderLookup = _ref.folderLookup;
@@ -6832,7 +6925,7 @@ var SampleRNNShow = function (_Component) {
           canUpload: true, canAddURL: true
         }),
         (0, _preact.h)(_samplernn4.default, {
-          id: this.props.match.params.id || localStorage.getItem('samplernn.last_id'),
+          id: samplernn.folder_id,
           folder: folder,
           history: history,
           onPickFile: function onPickFile(file, e) {
@@ -6850,11 +6943,11 @@ var SampleRNNShow = function (_Component) {
     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;
+      var _props3 = this.props,
+          samplernn = _props3.samplernn,
+          remote = _props3.remote;
 
-      var input = fileLookup[dataset.input[0]];
+      var input = samplernn.data.fileLookup[dataset.input[0]];
       if (!input) return null;
       if (input.name && input.name.match(/(gif|jpe?g|png)$/i)) return null;
       return (0, _preact.h)(
@@ -6956,97 +7049,6 @@ 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.log_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, folder_id) {
-  var epochs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  return function (dispatch) {
-    var task = {
-      module: 'samplernn',
-      activity: 'train',
-      dataset: dataset.name,
-      epochs: epochs,
-      opt: {
-        folder_id: folder_id,
-        sample_length: 44100 * 5,
-        n_samples: 6,
-        keep_old_checkpoints: false
-      }
-    };
-    console.log(task);
-    return _actions2.default.queue.add_task(task);
-  };
-};
-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 = {
-      module: 'samplernn',
-      activity: 'fetch',
-      dataset: dataset,
-      opt: {
-        url: url,
-        file_id: file_id,
-        dataset: dataset
-      }
-    };
-    return _actions2.default.queue.add_task(task);
-  };
-};
-var log_task = exports.log_task = function log_task(dataset) {
-  return function (dispatch) {
-    var task = {
-      module: 'samplernn',
-      activity: 'log',
-      dataset: dataset.name
-    };
-    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.name
-    };
-    return _actions2.default.queue.add_task(task);
-  };
-};
-
-/***/ }),
-
 /***/ "./app/client/queue/queue.actions.js":
 /*!*******************************************!*\
   !*** ./app/client/queue/queue.actions.js ***!