basic dataset viewer with stuff clustered how i want it

1 files changed, 110 insertions, 36 deletions

diff --git a/public/bundle.js b/public/bundle.js
index b8cbad4..c5ce68f 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -4325,7 +4325,7 @@ function router() {
   return (0, _preact.h)(
     'div',
     null,
-    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/loss/', component: _samplernn6.default }),
+    (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/graph/', 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/:id/', component: _samplernn2.default }),
     (0, _preact.h)(_reactRouterDom.Route, { exact: true, path: '/samplernn/datasets/new/', component: _samplernn2.default })
@@ -4350,6 +4350,15 @@ function links() {
       null,
       (0, _preact.h)(
         _reactRouterDom.Link,
+        { to: '/samplernn/graph/' },
+        'graph'
+      )
+    ),
+    (0, _preact.h)(
+      'span',
+      null,
+      (0, _preact.h)(
+        _reactRouterDom.Link,
         { to: '/samplernn/results/' },
         'results'
       )
@@ -4413,15 +4422,15 @@ var load_directories = exports.load_directories = function load_directories(id)
       var empty_dataset = function empty_dataset(name) {
         return {
           name: name,
-          input: null,
+          input: [],
           checkpoints: [],
-          results: []
+          output: []
         };
       };
 
       // take all of the folders and put them in a lookup
       var folderLookup = folders.reduce(function (folderLookup, folder) {
-        folderLookup[folder.id] = folder;
+        folderLookup[folder.id] = { id: folder.id, name: folder.name, folder: folder, datasets: [] };
         folder.datasets = [];
         return folderLookup;
       }, {
@@ -4433,31 +4442,36 @@ var load_directories = exports.load_directories = function load_directories(id)
       });
 
       // prepare the files by splitting into two groups
-      var processedFiles = files.filter(function (file) {
-        return file.processed;
+      var generatedFiles = files.filter(function (file) {
+        return file.generated;
       });
-      var unprocessedFiles = files.filter(function (file) {
-        return !file.processed;
+      var ungeneratedFiles = files.filter(function (file) {
+        return !file.generated;
       });
 
-      // build the initial dataset lookup table using the unprocessed files
-      var datasetLookup = unprocessedFiles.reduce(function (datasetLookup, file) {
+      // build the initial dataset lookup table using the ungenerated files
+      var datasetLookup = ungeneratedFiles.reduce(function (datasetLookup, file) {
         file.checkpoints = [];
         if (!file.name) {
           file.name = (file.opt || {}).token || file.url;
-          // datasetLookup[(file.name || 'unsorted').split('.')[0]] = file
+          // datasetLookup[] = file
+        }
+        var name = (file.name || 'unsorted').split('.')[0];
+        if (!datasetLookup[name]) {
+          var dataset = empty_dataset(name);
+          datasetLookup[dataset.name] = dataset;
+          dataset.input.push(file);
+          folderLookup[file.folder_id].datasets.push(dataset);
+        } else {
+          datasetLookup[name].input.push(file);
         }
-        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: empty_dataset('unsorted')
       });
 
-      // go over the processed files and add addl datasets (if the files were deleted)
-      processedFiles.map(function (file) {
+      // go over the generated files and add addl datasets (if the files were deleted)
+      generatedFiles.map(function (file) {
         var pair = file.name.split('.')[0].split('-');
         var dataset = datasetLookup[pair[0]];
         if (!dataset) {
@@ -4465,7 +4479,7 @@ var load_directories = exports.load_directories = function load_directories(id)
           datasetLookup[dataset.name] = dataset;
           folderLookup[file.folder_id].datasets.push(dataset);
         }
-        dataset.results.push(file);
+        dataset.output.push(file);
         file.epoch = file.epoch || pair[1];
       });
 
@@ -4495,7 +4509,6 @@ var load_directories = exports.load_directories = function load_directories(id)
         }).reduce(function (a, b) {
           return (a[b[0]] = b[1]) && a;
         }, {});
-        // console.log(checkpoint.dataset)
         checkpoint.name = checkpoint.dataset || checkpoint.exp;
         checkpoint.dir = s;
         var dataset = datasetLookup[checkpoint.dataset];
@@ -4516,7 +4529,7 @@ var load_directories = exports.load_directories = function load_directories(id)
           datasetLookup[dataset.name] = dataset;
           folderLookup.unsorted.datasets.push(dataset);
         }
-        dataset.results.push(file);
+        dataset.output.push(file);
         file.epoch = file.epoch || pair[1];
       });
 
@@ -4531,9 +4544,10 @@ var load_directories = exports.load_directories = function load_directories(id)
         }
       });
       if (id) {
+        var folder = id === 'unsorted' ? folderLookup.unsorted : folderLookup[id];
         dispatch({
           type: _types2.default.samplernn.set_folder,
-          folder: folderLookup[parseInt(id)]
+          folder: folder
         });
       }
     }).catch(function (e) {
@@ -4638,8 +4652,6 @@ var _button2 = _interopRequireDefault(_button);
 
 var _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
-var _fileList2 = _interopRequireDefault(_fileList);
-
 var _textInput = __webpack_require__(/*! ../../common/textInput.component */ "./app/client/common/textInput.component.js");
 
 var _textInput2 = _interopRequireDefault(_textInput);
@@ -4724,9 +4736,41 @@ var SampleRNNDatasets = function (_Component) {
     key: 'render',
     value: function render() {
       var samplernn = this.props.samplernn;
-      // console.log(samplernn.upload)
-      // sort files??
 
+      var folder = samplernn.folder;
+      if (!folder.name) return;
+      console.log(folder);
+      var datasets = folder.datasets.map(function (dataset) {
+        console.log(dataset);
+        return (0, _preact.h)(
+          'div',
+          { className: 'row dataset' },
+          (0, _preact.h)(
+            'div',
+            { className: 'col' },
+            !!dataset.input.length && (0, _preact.h)(_fileList.FileList, { files: dataset.input })
+          ),
+          (0, _preact.h)(
+            'div',
+            { className: 'col quiet' },
+            (0, _preact.h)(
+              'div',
+              null,
+              dataset.isBuilt ? 'has dataset' : 'not built'
+            )
+          ),
+          (0, _preact.h)(
+            'div',
+            { className: 'col checkpoint' },
+            !!dataset.checkpoints.length && (0, _preact.h)(_fileList.FileRow, { file: dataset.checkpoints[0] })
+          ),
+          (0, _preact.h)(
+            'div',
+            { className: 'col' },
+            !!dataset.output.length && (0, _preact.h)(_fileList.FileList, { files: dataset.output })
+          )
+        );
+      });
       return (0, _preact.h)(
         'div',
         { className: 'app' },
@@ -4739,17 +4783,35 @@ var SampleRNNDatasets = function (_Component) {
             'SampleRNN'
           )
         ),
-        (0, _preact.h)(_dataset2.default, {
-          canRename: true,
-          canUpload: true,
-          canAddURL: true,
-          canDeleteFile: true,
-          linkFiles: true,
-          fileOptions: this.fileOptions,
-          onPick: this.handlePick,
-          folder: samplernn.folder,
-          files: samplernn.folder.files
-        })
+        (0, _preact.h)(
+          'div',
+          { 'class': 'rows params datasets' },
+          (0, _preact.h)(
+            'div',
+            { 'class': 'row dataset' },
+            (0, _preact.h)(
+              'div',
+              { 'class': 'col' },
+              'input'
+            ),
+            (0, _preact.h)(
+              'div',
+              { 'class': 'col' },
+              'dataset'
+            ),
+            (0, _preact.h)(
+              'div',
+              { 'class': 'col' },
+              'checkpoint'
+            ),
+            (0, _preact.h)(
+              'div',
+              { 'class': 'col' },
+              'output'
+            )
+          ),
+          datasets
+        )
       );
     }
   }]);
@@ -4757,6 +4819,18 @@ var SampleRNNDatasets = function (_Component) {
   return SampleRNNDatasets;
 }(_preact.Component);
 
+// <Dataset
+//   canRename
+//   canUpload
+//   canAddURL
+//   canDeleteFile
+//   linkFiles
+//   fileOptions={this.fileOptions}
+//   onPick={this.handlePick}
+//   folder={samplernn.folder}
+//   files={samplernn.folder.files}
+// />
+
 var mapStateToProps = function mapStateToProps(state) {
   return {
     samplernn: state.module.samplernn,