action divs

1 files changed, 152 insertions, 75 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 08b82ff..3acc96c 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -958,7 +958,7 @@ var AudioPlayer = function (_Component) {
           {
             onClick: this.handleClick
           },
-          audioPlayer.playing ? '>' : 'pause'
+          audioPlayer.playing ? '▶' : '~'
         )
       );
     }
@@ -1681,7 +1681,7 @@ function Loading(_ref) {
     { className: 'loading' },
     'Loading',
     (0, _preact.h)('br', null),
-    (0, _preact.h)(_progress2.default, { progress: progress })
+    progress && (0, _preact.h)(_progress2.default, { progress: progress })
   );
 }
 
@@ -2866,6 +2866,14 @@ var fetchURL = exports.fetchURL = function fetchURL(module, folder, url) {
     // size activity
     // opt created_at updated_at
     console.log(module, folder, url);
+    var seenURL = folder.files.some(function (file) {
+      return file.url === url;
+    });
+    console.log(seenURL);
+    if (seenURL) {
+      console.log('already seen this url');
+      return;
+    }
     _api.parser.parse(url, function (media) {
       if (!media) return;
       console.log('media', media);
@@ -3087,6 +3095,10 @@ var _dataset = __webpack_require__(/*! ./dataset.actions */ "./app/client/datase
 
 var datasetActions = _interopRequireWildcard(_dataset);
 
+var _loading = __webpack_require__(/*! ../common/loading.component */ "./app/client/common/loading.component.js");
+
+var _loading2 = _interopRequireDefault(_loading);
+
 var _textInput = __webpack_require__(/*! ../common/textInput.component */ "./app/client/common/textInput.component.js");
 
 var _textInput2 = _interopRequireDefault(_textInput);
@@ -3103,11 +3115,7 @@ function NewDatasetForm(props) {
       actions = props.actions,
       module = props.module;
 
-  if (loading) return (0, _preact.h)(
-    'span',
-    null,
-    'Loading...'
-  );
+  if (loading) return (0, _preact.h)(_loading2.default, null);
   console.log(props);
   return (0, _preact.h)(
     'div',
@@ -4841,6 +4849,7 @@ var load_directories = exports.load_directories = function load_directories(id)
       var unsortedFolder = {
         id: 0,
         name: 'unsorted',
+        files: [],
         datasets: []
       };
 
@@ -4873,8 +4882,13 @@ var load_directories = exports.load_directories = function load_directories(id)
 
       // take all of the folders and put them in a lookup
       var folderLookup = folders.reduce(function (folderLookup, folder) {
-        folderLookup[folder.id] = { id: folder.id, name: folder.name, folder: folder, datasets: [] };
-        folder.datasets = [];
+        folderLookup[folder.id] = {
+          id: folder.id,
+          name: folder.name,
+          folder: folder,
+          files: [],
+          datasets: []
+        };
         return folderLookup;
       }, {
         unsorted: unsortedFolder
@@ -4894,17 +4908,21 @@ var load_directories = exports.load_directories = function load_directories(id)
           file.name = (file.opt || {}).token || file.url;
         }
         var name = (file.name || 'unsorted').split('.')[0];
-        var dataset = get_dataset(name, folderLookup[file.folder_id] || unsortedFolder, file.date || file.created_at);
+        var folder = folderLookup[file.folder_id] || unsortedFolder;
+        var dataset = get_dataset(name, folder, file.date || file.created_at);
         if (file.url.match(file.name)) file.persisted = true;
         dataset.input.push(file);
+        folder.files.push(file);
         return datasetLookup;
       }, datasetLookup);
 
       // 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 = get_dataset(pair[0], folderLookup[file.folder_id] || unsortedFolder, file.date || file.created_at);
+        var folder = folderLookup[file.folder_id] || unsortedFolder;
+        var dataset = get_dataset(pair[0], folder, file.date || file.created_at);
         dataset.output.push(file);
+        folder.files.push(file);
         file.epoch = file.epoch || pair[1];
       });
 
@@ -4979,7 +4997,6 @@ var load_directories = exports.load_directories = function load_directories(id)
           datasetLookup: datasetLookup,
           folders: folders, files: files,
           checkpoints: checkpoints,
-          builtDatasets: builtDatasets,
           output: output
         }
       });
@@ -5294,13 +5311,17 @@ var SampleRNNDatasets = function (_Component) {
         { 'class': 'rows params datasets' },
         (0, _preact.h)(
           'div',
-          { 'class': 'row dataset' },
+          { 'class': 'row row-heading dataset' },
           (0, _preact.h)(
             'div',
             { 'class': 'col' },
             'input'
           ),
-          (0, _preact.h)('div', { 'class': 'col' }),
+          (0, _preact.h)(
+            'div',
+            { 'class': 'col' },
+            'status'
+          ),
           (0, _preact.h)(
             'div',
             { 'class': 'col' },
@@ -5322,9 +5343,10 @@ var SampleRNNDatasets = function (_Component) {
 
       var _props3 = this.props,
           samplernn = _props3.samplernn,
+          runner = _props3.runner,
           onPickDataset = _props3.onPickDataset,
           onPickFile = _props3.onPickFile,
-          actions = _props3.actions;
+          datasetActions = _props3.datasetActions;
 
       var folder = samplernn.folder;
 
@@ -5332,8 +5354,11 @@ var SampleRNNDatasets = function (_Component) {
           mapFn = _util$sort$orderByFn.mapFn,
           sortFn = _util$sort$orderByFn.sortFn;
 
+      var moduleOnGPU = runner.gpu.task.module === samplernnModule.name;
       var datasets = folder.datasets.map(mapFn).sort(sortFn).map(function (pair) {
         var dataset = pair[1];
+        var isProcessing = moduleOnGPU && runner.gpu.task.dataset === dataset;
+        var status = isProcessing ? util.gerund(runner.gpu.task.activity) : '';
         return (0, _preact.h)(
           'div',
           { className: 'row dataset', onClick: function onClick() {
@@ -5354,51 +5379,9 @@ var SampleRNNDatasets = function (_Component) {
           ),
           (0, _preact.h)(
             'div',
-            { className: 'col quiet hiddenActions' },
-            (0, _preact.h)(
-              'div',
-              { 'class': 'subtext' },
-              dataset.isBuilt ? 'cached' : ''
-            ),
-            (0, _preact.h)(
-              'div',
-              { 'class': 'actions' },
-              (0, _preact.h)(
-                'span',
-                { 'class': 'link', onClick: function onClick() {
-                    return actions.train_task_now(dataset, 1);
-                  } },
-                'train'
-              ),
-              (0, _preact.h)(
-                'span',
-                { 'class': 'link', onClick: function onClick() {
-                    return actions.train_task_now(dataset, 2);
-                  } },
-                '2x'
-              ),
-              (0, _preact.h)(
-                'span',
-                { 'class': 'link', onClick: function onClick() {
-                    return actions.train_task_now(dataset, 4);
-                  } },
-                '4x'
-              ),
-              (0, _preact.h)(
-                'span',
-                { 'class': 'link', onClick: function onClick() {
-                    return actions.train_task_now(dataset, 6);
-                  } },
-                '6x'
-              ),
-              (0, _preact.h)(
-                'span',
-                { 'class': 'link', onClick: function onClick() {
-                    return actions.train_task_now(dataset, 18);
-                  } },
-                '18x'
-              )
-            )
+            { className: 'col quiet ' + (dataset.isBuilt ? 'built' : 'not_built') },
+            status,
+            _this3.props.datasetActions && _this3.props.datasetActions(dataset)
           ),
           (0, _preact.h)(
             'div',
@@ -5831,10 +5814,6 @@ var SampleRNNInspect = function (_Component) {
           files: samplernn.data.files
         }),
         (0, _preact.h)(_fileList.FileList, {
-          title: 'Datasets',
-          files: samplernn.data.builtDatasets
-        }),
-        (0, _preact.h)(_fileList.FileList, {
           title: 'Checkpoints',
           files: samplernn.data.checkpoints
         })
@@ -6264,6 +6243,7 @@ var samplernnReducer = function samplernnReducer() {
         return _extends({}, state, {
           loading: false,
           folder: _extends({}, state.folder, {
+            files: [].concat(_toConsumableArray(state.folder.files), [action.data]),
             datasets: [].concat(_toConsumableArray(state.folder.datasets), [{
               name: action.data.name,
               date: action.data.date,
@@ -6356,8 +6336,18 @@ var _samplernn = __webpack_require__(/*! ./samplernn.actions */ "./app/client/mo
 
 var samplernnActions = _interopRequireWildcard(_samplernn);
 
+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 _loading2 = _interopRequireDefault(_loading);
+
 var _fileList = __webpack_require__(/*! ../../common/fileList.component */ "./app/client/common/fileList.component.js");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -6429,11 +6419,9 @@ var SampleRNNResults = function (_Component) {
   }, {
     key: 'render',
     value: function render() {
-      if (this.props.samplernn.loading) return (0, _preact.h)(
-        'span',
-        null,
-        'Loading'
-      );
+      var _this3 = this;
+
+      if (this.props.samplernn.loading) return (0, _preact.h)(_loading2.default, { progress: this.props.samplernn.progress });
       var folderLookup = this.props.samplernn.data.folderLookup;
       // const { folderLookup } = samplernn
 
@@ -6471,21 +6459,27 @@ var SampleRNNResults = function (_Component) {
           (0, _preact.h)(_fileList.FileList, {
             files: bestRenders,
             orderBy: 'date desc',
-            fields: 'name date epoch size'
+            fields: 'name date epoch size',
+            onClick: function onClick(file, e) {
+              e.preventDefault();
+              e.stopPropagation();
+              console.log('picked a file', file);
+              _this3.handlePick(file);
+            }
           })
         );
       });
 
       return (0, _preact.h)(
         'div',
-        { className: 'app' },
+        { className: 'app top left' },
         (0, _preact.h)(
           'div',
           { className: 'heading' },
           (0, _preact.h)(
-            'h2',
+            'h1',
             null,
-            'SampleRNN'
+            'SampleRNN Results'
           )
         ),
         (0, _preact.h)(
@@ -6502,6 +6496,11 @@ var SampleRNNResults = function (_Component) {
         )
       );
     }
+  }, {
+    key: 'handlePick',
+    value: function handlePick(file) {
+      this.props.audioPlayer.play(file);
+    }
   }]);
 
   return SampleRNNResults;
@@ -6517,7 +6516,8 @@ var mapStateToProps = function mapStateToProps(state) {
 
 var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
   return {
-    actions: (0, _redux.bindActionCreators)(samplernnActions, dispatch)
+    actions: (0, _redux.bindActionCreators)(samplernnActions, dispatch),
+    audioPlayer: (0, _redux.bindActionCreators)(audioPlayerActions, dispatch)
   };
 };
 
@@ -6559,6 +6559,10 @@ var _audioPlayer = __webpack_require__(/*! ../../common/audioPlayer/audioPlayer.
 
 var audioPlayerActions = _interopRequireWildcard(_audioPlayer);
 
+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 _dataset2 = _interopRequireDefault(_dataset);
@@ -6619,7 +6623,7 @@ var SampleRNNShow = function (_Component) {
           (0, _preact.h)(
             'h1',
             null,
-            folder ? folder.name : 'Loading...'
+            folder ? folder.name : (0, _preact.h)(_loading2.default, null)
           )
         ),
         folder && folder.name && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
@@ -6635,11 +6639,84 @@ var SampleRNNShow = function (_Component) {
             e.stopPropagation();
             console.log('picked a file', file);
             _this2.handlePick(file);
+          },
+          datasetActions: function datasetActions(dataset) {
+            return _this2.datasetActions(dataset);
           }
         })
       );
     }
   }, {
+    key: 'datasetActions',
+    value: function datasetActions(dataset) {
+      var actions = props.actions.samplernn;
+      return (0, _preact.h)(
+        'div',
+        null,
+        (0, _preact.h)(
+          'div',
+          { 'class': 'actions' },
+          (0, _preact.h)(
+            'span',
+            { 'class': 'link', onClick: function onClick() {
+                return actions.train_task(dataset, 1);
+              } },
+            'train'
+          ),
+          (0, _preact.h)(
+            'span',
+            { 'class': 'link', onClick: function onClick() {
+                return actions.train_task(dataset, 2);
+              } },
+            '2x'
+          ),
+          (0, _preact.h)(
+            'span',
+            { 'class': 'link', onClick: function onClick() {
+                return actions.train_task(dataset, 4);
+              } },
+            '4x'
+          ),
+          (0, _preact.h)(
+            'span',
+            { 'class': 'link', onClick: function onClick() {
+                return actions.train_task(dataset, 6);
+              } },
+            '6x'
+          ),
+          (0, _preact.h)(
+            'span',
+            { 'class': 'link', onClick: function onClick() {
+                return actions.train_task(dataset, 18);
+              } },
+            '18x'
+          )
+        ),
+        dataset.isBuilt ? (0, _preact.h)(
+          'div',
+          { 'class': 'subtext' },
+          'fetched ',
+          (0, _preact.h)(
+            'span',
+            { 'class': 'link', onClick: function onClick() {
+                return actions.clear_cache_task(dataset);
+              } },
+            'rm'
+          )
+        ) : (0, _preact.h)(
+          'div',
+          { 'class': 'subtext' },
+          (0, _preact.h)(
+            'span',
+            { 'class': 'link', onClick: function onClick() {
+                return actions.fetch_task(dataset);
+              } },
+            'fetch'
+          )
+        )
+      );
+    }
+  }, {
     key: 'handlePick',
     value: function handlePick(file) {
       this.props.audioPlayer.play(file);