1 files changed, 79 insertions, 40 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 2d278d5..b8cbad4 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -4327,8 +4327,8 @@ function router() {
     null,
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/loss/', component: _samplernn6.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/inspect/', component: _samplernn4.default }),
-    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/', component: _samplernn2.default }),
-    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/dataset/new/', component: _samplernn2.default })
+    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/:id/', component: _samplernn2.default }),
+    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/new/', component: _samplernn2.default })
   );
 }
 
@@ -4397,74 +4397,91 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }
 
-var load_directories = exports.load_directories = function load_directories() {
+var load_directories = exports.load_directories = function load_directories(id) {
   return function (dispatch) {
     // console.log(actions)
-    Promise.all([_actions2.default.folder.index({ module: 'samplernn' }), _actions2.default.file.index({ module: 'samplernn' }), _actions2.default.task.index({ module: 'samplernn' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'results' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'datasets' })]).then(function (res) {
+    Promise.all([_actions2.default.folder.index({ module: 'samplernn' }), _actions2.default.file.index({ module: 'samplernn' }), _actions2.default.task.index({ module: 'samplernn' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'datasets' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'results' }), _actions2.default.socket.list_directory({ module: 'samplernn', dir: 'output' })]).then(function (res) {
       // console.log(res)
-      var _res = _slicedToArray(res, 5),
+      var _res = _slicedToArray(res, 6),
           folders = _res[0],
           files = _res[1],
           tasks = _res[2],
-          results = _res[3],
-          datasets = _res[4];
+          datasets = _res[3],
+          results = _res[4],
+          output = _res[5];
 
+      var empty_dataset = function empty_dataset(name) {
+        return {
+          name: name,
+          input: null,
+          checkpoints: [],
+          results: []
+        };
+      };
+
+      // take all of the folders and put them in a lookup
       var folderLookup = folders.reduce(function (folderLookup, folder) {
         folderLookup[folder.id] = folder;
-        folder.files = [];
-        folder.results = [];
+        folder.datasets = [];
         return folderLookup;
       }, {
         'unsorted': {
           id: 0,
           name: 'unsorted',
-          files: [],
-          results: []
+          datasets: []
         }
       });
 
+      // prepare the files by splitting into two groups
       var processedFiles = files.filter(function (file) {
         return file.processed;
       });
       var unprocessedFiles = files.filter(function (file) {
         return !file.processed;
       });
-      var fileLookup = unprocessedFiles.reduce(function (fileLookup, file) {
+
+      // build the initial dataset lookup table using the unprocessed files
+      var datasetLookup = unprocessedFiles.reduce(function (datasetLookup, file) {
         file.checkpoints = [];
         if (!file.name) {
           file.name = (file.opt || {}).token || file.url;
-          // fileLookup[(file.name || 'unsorted').split('.')[0]] = file
-        } else {
-          fileLookup[file.name.split('.')[0]] = file;
+          // datasetLookup[(file.name || 'unsorted').split('.')[0]] = file
         }
-        folderLookup[file.folder_id] && folderLookup[file.folder_id].files.push(file);
-        return fileLookup;
+        var dataset = empty_dataset(file.name.split('.')[0]);
+        datasetLookup[dataset.name] = dataset;
+        dataset.input = input;
+        folderLookup[file.folder_id].datasets.push(dataset);
+        return datasetLookup;
       }, {
-        unsorted: {
-          checkpoints: [],
-          results: []
-        }
+        unsorted: empty_dataset('unsorted')
       });
-      processedFiles.map(function (result) {
-        var pair = result.name.split('.')[0].split('-');
-        var file = fileLookup[pair[0]];
-        if (file) {
-          file.results.push(result);
-        } else {
-          folderLookup[file.folder_id] && folderLookup[file.folder_id].results.push(file);
+
+      // go over the processed files and add addl datasets (if the files were deleted)
+      processedFiles.map(function (file) {
+        var pair = file.name.split('.')[0].split('-');
+        var dataset = datasetLookup[pair[0]];
+        if (!dataset) {
+          dataset = empty_dataset(pair[0]);
+          datasetLookup[dataset.name] = dataset;
+          folderLookup[file.folder_id].datasets.push(dataset);
         }
-        result.epoch = result.epoch || pair[1];
+        dataset.results.push(file);
+        file.epoch = file.epoch || pair[1];
       });
-      folderLookup.unsorted.files.push(fileLookup.unsorted);
 
       // console.log(datasets)
       // const flatDatasets = datasets.filter(s => s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir)
       var builtDatasets = datasets.filter(function (s) {
         return s.dir;
       });
-      builtDatasets.forEach(function (dataset) {
-        var file = fileLookup[dataset.name] || fileLookup.unsorted;
-        file.hasDataset = true;
+      builtDatasets.forEach(function (dir) {
+        var dataset = datasetLookup[dir.name];
+        if (!dataset) {
+          dataset = empty_dataset(dir.name);
+          datasetLookup[dataset.name] = dataset;
+          folderLookup.unsorted.datasets.push(dataset);
+        }
+        dataset.isBuilt = true;
       });
 
       // exp:coccokit_3-frame_sizes:8,2-n_rnn:2-dataset:coccokit_3
@@ -4479,26 +4496,44 @@ var load_directories = exports.load_directories = function load_directories() {
           return (a[b[0]] = b[1]) && a;
         }, {});
         // console.log(checkpoint.dataset)
-        checkpoint.name = checkpoint.dataset;
+        checkpoint.name = checkpoint.dataset || checkpoint.exp;
         checkpoint.dir = s;
-        var file = fileLookup[checkpoint.dataset] || fileLookup.unsorted;
-        file.checkpoints.push(checkpoint);
+        var dataset = datasetLookup[checkpoint.dataset];
+        if (!dataset) {
+          dataset = empty_dataset(checkpoint.dataset);
+          datasetLookup[dataset.name] = dataset;
+          folderLookup.unsorted.datasets.push(dataset);
+        }
+        dataset.checkpoints.push(checkpoint);
         return checkpoint;
       });
 
+      output.map(function (file) {
+        var pair = file.name.split('.')[0].split('-');
+        var dataset = datasetLookup[pair[0]];
+        if (!dataset) {
+          dataset = empty_dataset(pair[0]);
+          datasetLookup[dataset.name] = dataset;
+          folderLookup.unsorted.datasets.push(dataset);
+        }
+        dataset.results.push(file);
+        file.epoch = file.epoch || pair[1];
+      });
+
       dispatch({
         type: _types2.default.samplernn.init,
         data: {
           folderLookup: folderLookup,
           folders: folders, files: files,
           checkpoints: checkpoints,
-          builtDatasets: builtDatasets
+          builtDatasets: builtDatasets,
+          output: output
         }
       });
-      if (folders.length) {
+      if (id) {
         dispatch({
           type: _types2.default.samplernn.set_folder,
-          folder: folders[0]
+          folder: folderLookup[parseInt(id)]
         });
       }
     }).catch(function (e) {
@@ -4629,7 +4664,11 @@ var SampleRNNDatasets = function (_Component) {
 
     _this.fileOptions = _this.fileOptions.bind(_this);
     _this.pickFile = _this.pickFile.bind(_this);
-    props.actions.load_directories();
+    var id = props.match.params.id;
+    if (!id && props.location.pathname.match(/\/new\//)) {
+      id = 'new';
+    }
+    props.actions.load_directories(id);
     return _this;
   }