pix2pix datasets in full effect

1 files changed, 74 insertions, 77 deletions

diff --git a/public/bundle.js b/public/bundle.js
index c647396..9ebb79a 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -120,7 +120,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 exports.default = Object.keys(_api.actions).map(function (a) {
   return [a, _api.actions[a]];
 }).concat([['live', liveActions], ['queue', queueActions], ['system', systemActions], ['dataset', datasetActions], ['audioPlayer', audioPlayerActions]]).map(function (p) {
-  return [p[0], (0, _redux.bindActionCreators)(p[1], _store.dispatch)];
+  return [p[0], (0, _redux.bindActionCreators)(p[1], _store.store.dispatch)];
 }).concat([['socket', socketActions]]).reduce(function (a, b) {
   return (a[b[0]] = b[1]) && a;
 }, {});
@@ -1620,7 +1620,6 @@ function Header(_ref) {
     );
   });
   var Links = _modules2.default[app.tool].links;
-  console.log(app, site, Object.keys(_modules2.default));
   return (0, _preact.h)(
     'header',
     null,
@@ -3432,10 +3431,12 @@ var getDataset = exports.getDataset = function getDataset(module, datasetLookup,
 };
 
 var load = exports.load = function load(module) {
-  return Promise.all([_actions2.default.folder.index({ module: module }), _actions2.default.file.index({ module: module })]).then(function (res) {
-    var _res = _slicedToArray(res, 2),
+  console.log(module);
+  return Promise.all([_actions2.default.folder.index({ module: module }), _actions2.default.file.index({ module: module }), _actions2.default.task.index({ module: module })]).then(function (res) {
+    var _res = _slicedToArray(res, 3),
         folders = _res[0],
-        files = _res[1];
+        files = _res[1],
+        tasks = _res[2];
 
     var datasetLookup = {};
     var folderLookup = {};
@@ -3570,7 +3571,7 @@ function NewDatasetForm(props) {
         title: 'Name your dataset',
         onSave: function onSave(name) {
           actions.createFolder(module, name).then(function (folder) {
-            window.location.href = '/samplernn/datasets/' + folder.id + '/';
+            window.location.href = '/' + module.name + '/datasets/' + folder.id + '/';
           });
         }
       })
@@ -3627,7 +3628,8 @@ var datasetInitialState = function datasetInitialState() {
   return {
     loading: true,
     error: null,
-    data: null
+    data: null,
+    folder_id: 0
   };
 };
 
@@ -3636,12 +3638,22 @@ var datasetReducer = function datasetReducer() {
   var action = arguments[1];
 
   switch (action.type) {
+    case _types2.default.app.load_progress:
+      return _extends({}, state, {
+        progress: action.progress
+      });
+
     case _types2.default.dataset.load:
       return _extends({}, state, {
         loading: false,
         data: action.data
       });
 
+    case _types2.default.dataset.set_folder:
+      return _extends({}, state, {
+        folder_id: action.data.folder_id
+      });
+
     case _types2.default.folder.create:
       if (action.data.module === 'samplernn') {
         return _extends({}, state, {
@@ -5052,7 +5064,7 @@ exports.default = {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.set_folder = exports.load_directories = undefined;
+exports.load_directories = undefined;
 
 var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
@@ -5078,20 +5090,24 @@ var _actions2 = _interopRequireDefault(_actions);
 
 var _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
 
+var _pix2pix = __webpack_require__(/*! ./pix2pix.module */ "./app/client/modules/pix2pix/pix2pix.module.js");
+
+var _pix2pix2 = _interopRequireDefault(_pix2pix);
+
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var load_directories = exports.load_directories = function load_directories(id) {
   return function (dispatch) {
-    var module = 'samplernn';
-    (0, _util.allProgress)([datasetLoader.load(module), _actions2.default.task.index({ module: module })], function (percent, i, n) {
+    var module = _pix2pix2.default.name;
+    (0, _util.allProgress)([datasetLoader.load(module)], function (percent, i, n) {
       dispatch({ type: _types2.default.app.load_progress, progress: { i: i, n: n } });
     }).then(function (res) {
       // console.log(res)
-      var _res = _slicedToArray(res, 2),
-          datasetApiReport = _res[0],
-          tasks = _res[1]; //, datasets, results, output, datasetUsage, lossReport] = res
+      var _res = _slicedToArray(res, 1),
+          datasetApiReport = _res[0]; //, datasets, results, output, datasetUsage, lossReport] = res
+
 
       var folderLookup = datasetApiReport.folderLookup,
           fileLookup = datasetApiReport.fileLookup,
@@ -5168,16 +5184,19 @@ var load_directories = exports.load_directories = function load_directories(id)
           folderLookup: folderLookup,
           fileLookup: fileLookup,
           datasetLookup: datasetLookup,
-          folders: folders, files: files,
-          checkpoints: checkpoints,
-          output: output
+          folders: folders, files: files
+          // checkpoints,
+          // output,
         }
       });
       if (id) {
         console.log('folder id', id);
         dispatch({
-          type: _types2.default.pix2pix.set_folder,
-          folder_id: id
+          type: _types2.default.dataset.set_folder,
+          data: {
+            folder_id: id,
+            module: module
+          }
         });
       }
     }).catch(function (e) {
@@ -5186,10 +5205,6 @@ var load_directories = exports.load_directories = function load_directories(id)
   };
 };
 
-var set_folder = exports.set_folder = function set_folder(folder) {
-  _types2.default.pix2pix.set_folder, folder;
-};
-
 /***/ }),
 
 /***/ "./app/client/modules/pix2pix/pix2pix.module.js":
@@ -5207,7 +5222,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var pix2pixModule = {
   name: 'pix2pix',
-  datatype: 'audio'
+  datatype: 'video'
 };
 
 exports.default = pix2pixModule;
@@ -5228,44 +5243,33 @@ 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 _types = __webpack_require__(/*! ../../types */ "./app/client/types.js");
 
 var _types2 = _interopRequireDefault(_types);
 
+var _dataset = __webpack_require__(/*! ../../dataset/dataset.reducer */ "./app/client/dataset/dataset.reducer.js");
+
+var _dataset2 = _interopRequireDefault(_dataset);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var pix2pixInitialState = {
   loading: true,
+  progress: { i: 0, n: 0 },
   error: null,
-  folders: [],
   folder_id: 0,
-  data: null,
-  lossReport: null
+  data: null
 };
 
 var pix2pixReducer = function pix2pixReducer() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : pix2pixInitialState;
   var action = arguments[1];
 
-  // console.log(action.type)
-  switch (action.type) {
-    case _types2.default.pix2pix.init:
-      return _extends({}, state, {
-        loading: false,
-        data: action.data
-      });
-
-    case _types2.default.socket.connect:
-      return _extends({}, state);
-
-    case _types2.default.task.task_begin:
-      return _extends({}, state);
-
-    case _types2.default.task.task_finish:
-      return _extends({}, state);
+  if (action.data && action.data.module === 'pix2pix') {
+    state = (0, _dataset2.default)(state, action);
+  }
 
+  switch (action.type) {
     default:
       return state;
   }
@@ -5815,6 +5819,7 @@ var Pix2pixShow = function (_Component) {
           folderLookup = _ref.folderLookup;
 
       var folder = (folderLookup || {})[pix2pix.folder_id] || {};
+
       return (0, _preact.h)(
         'div',
         { className: 'app pix2pix' },
@@ -6178,7 +6183,7 @@ exports.default = {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.set_folder = exports.import_files = exports.load_loss = exports.load_directories = undefined;
+exports.import_files = exports.load_loss = exports.load_directories = undefined;
 
 var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
@@ -6204,6 +6209,10 @@ var _actions2 = _interopRequireDefault(_actions);
 
 var _util = __webpack_require__(/*! ../../util */ "./app/client/util/index.js");
 
+var _samplernn = __webpack_require__(/*! ./samplernn.module */ "./app/client/modules/samplernn/samplernn.module.js");
+
+var _samplernn2 = _interopRequireDefault(_samplernn);
+
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -6212,19 +6221,18 @@ function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }
 
 var load_directories = exports.load_directories = function load_directories(id) {
   return function (dispatch) {
-    var module = 'samplernn';
-    (0, _util.allProgress)([datasetLoader.load(module), _actions2.default.task.index({ module: module }), _actions2.default.socket.list_directory({ module: module, dir: 'datasets' }), _actions2.default.socket.list_directory({ module: module, dir: 'results' }), _actions2.default.socket.list_directory({ module: module, dir: 'output' }), _actions2.default.socket.disk_usage({ module: module, dir: 'datasets' }), load_loss()(dispatch)], function (percent, i, n) {
+    var module = _samplernn2.default.name;
+    (0, _util.allProgress)([datasetLoader.load(module), _actions2.default.socket.list_directory({ module: module, dir: 'datasets' }), _actions2.default.socket.list_directory({ module: module, dir: 'results' }), _actions2.default.socket.list_directory({ module: module, dir: 'output' }), _actions2.default.socket.disk_usage({ module: module, dir: 'datasets' }), load_loss()(dispatch)], function (percent, i, n) {
       dispatch({ type: _types2.default.app.load_progress, progress: { i: i, n: n } });
     }).then(function (res) {
       // console.log(res)
-      var _res = _slicedToArray(res, 7),
+      var _res = _slicedToArray(res, 6),
           datasetApiReport = _res[0],
-          tasks = _res[1],
-          datasets = _res[2],
-          results = _res[3],
-          output = _res[4],
-          datasetUsage = _res[5],
-          lossReport = _res[6];
+          datasets = _res[1],
+          results = _res[2],
+          output = _res[3],
+          datasetUsage = _res[4],
+          lossReport = _res[5];
 
       var folderLookup = datasetApiReport.folderLookup,
           fileLookup = datasetApiReport.fileLookup,
@@ -6316,10 +6324,12 @@ var load_directories = exports.load_directories = function load_directories(id)
         }
       });
       if (id) {
-        console.log('folder id', id);
         dispatch({
-          type: _types2.default.samplernn.set_folder,
-          folder_id: id
+          type: _types2.default.dataset.set_folder,
+          data: {
+            folder_id: id,
+            module: module
+          }
         });
       }
     }).catch(function (e) {
@@ -6435,10 +6445,6 @@ var import_files = exports.import_files = function import_files(state, datasetLo
   };
 };
 
-var set_folder = exports.set_folder = function set_folder(folder) {
-  _types2.default.samplernn.set_folder, folder;
-};
-
 /***/ }),
 
 /***/ "./app/client/modules/samplernn/samplernn.module.js":
@@ -6508,22 +6514,11 @@ var samplernnReducer = function samplernnReducer() {
   }
 
   switch (action.type) {
-
-    case _types2.default.samplernn.set_folder:
-      return _extends({}, state, {
-        folder_id: action.folder_id
-      });
-
     case _types2.default.samplernn.load_loss:
       return _extends({}, state, {
         lossReport: action.lossReport
       });
 
-    case _types2.default.app.load_progress:
-      return _extends({}, state, {
-        progress: action.progress
-      });
-
     default:
       return state;
   }
@@ -7448,6 +7443,7 @@ var SampleRNNShow = function (_Component) {
       if (id) {
         if (parseInt(id)) localStorage.setItem('samplernn.last_id', id);
         if (!samplernn.folder || samplernn.folder.id !== id) {
+          console.log('looooooooooad', id);
           actions.load_directories(id);
         }
       }
@@ -8990,10 +8986,6 @@ var _moment = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js
 
 var _moment2 = _interopRequireDefault(_moment);
 
-var _modules = __webpack_require__(/*! ../modules */ "./app/client/modules/index.js");
-
-var _modules2 = _interopRequireDefault(_modules);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -9041,6 +9033,10 @@ var systemInitialState = {
   stderr: ""
 };
 
+var modules = ['samplernn', 'pix2pix', 'pix2wav'].reduce(function (a, b) {
+  return a[b] = b, a;
+}, {});
+
 var systemReducer = function systemReducer() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : systemInitialState;
   var action = arguments[1];
@@ -9124,7 +9120,7 @@ var systemReducer = function systemReducer() {
       document.querySelector('title').innerHTML = action.site.name + '.cortex';
       var tool = state.site.tool;
       var path = window.location.pathname.split('/')[1];
-      if (path in _modules2.default) {
+      if (path in modules) {
         tool = path;
       }
       return _extends({}, state, {
@@ -9290,6 +9286,7 @@ exports.default = {
 	},
 	dataset: {
 		load: 'DATASET_LOAD',
+		set_folder: 'DATASET_SET_FOLDER',
 		upload_files: 'DATASET_UPLOAD_FILES',
 		file_progress: 'DATASET_FILE_PROGRESS',
 		file_uploaded: 'DATASET_FILE_UPLOADED',