overspecifying everything lol

1 files changed, 32 insertions, 9 deletions

diff --git a/public/bundle.js b/public/bundle.js
index f199c0d..2e57afb 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -3274,6 +3274,7 @@ var Select = function (_Component) {
     key: 'render',
     value: function render() {
       var value = this.props.opt[this.props.name];
+      var lastValue = void 0;
       var options = (this.props.options || []).map(function (key, i) {
         var name = void 0,
             value = void 0;
@@ -3290,6 +3291,7 @@ var Select = function (_Component) {
           name = key.name.replace(/_/g, ' ') + ' (' + frames + ')';
           value = key.name;
         }
+        lastValue = value;
         return (0, _preact.h)(
           'option',
           { value: value, key: i },
@@ -3311,7 +3313,7 @@ var Select = function (_Component) {
             'select',
             {
               onChange: this.handleChange,
-              value: value
+              value: value || lastValue
             },
             options
           )
@@ -3940,7 +3942,7 @@ var dashboardInitialState = {
   }, {
     url: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4282/woodscaled_4_true_20180521_2146%20(1).png'
   }],
-  files: [{ id: 2, module: 'samplernn', checkpoint: 'jwcglassbeat', dataset: 'jwcglassbeat', epoch: 18, duration: 30, batch_size: 5, filename: 'jwcglassbeat-ep18.mp3', size: 3 * 1024 * 1024, date: Date.now(), opt: "{}" }]
+  files: []
 };
 
 var dashboardReducer = function dashboardReducer() {
@@ -5558,6 +5560,7 @@ var liveReducer = function liveReducer() {
       });
 
     case _types2.default.socket.list_epochs:
+      if (action.epochs === "not found") return _extends({}, state, { epochs: [] });
       return _extends({}, state, {
         epochs: (action.epochs || []).map(function (a) {
           return [a == 'latest' ? Infinity : a, a];
@@ -7757,14 +7760,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var load_directories = exports.load_directories = function load_directories(id) {
   return function (dispatch) {
     var module = _pix2wav2.default.name;
-    _util2.default.allProgress([datasetLoader.load(module), _actions2.default.socket.list_directory({ module: module, dir: 'sequences/pix2wav/' }), _actions2.default.socket.list_directory({ module: module, dir: 'datasets/pix2wav/' }), _actions2.default.socket.list_directory({ module: module, dir: 'checkpoints/pix2wav/' })], function (percent, i, n) {
+    _util2.default.allProgress([datasetLoader.load(module), _actions2.default.socket.list_directory({ module: 'pix2pix', dir: 'sequences/pix2wav/' }), _actions2.default.socket.list_directory({ module: 'pix2pix', dir: 'datasets/pix2wav/' }), _actions2.default.socket.list_directory({ module: 'pix2pix', dir: 'checkpoints/pix2wav/' }), _actions2.default.socket.list_directory({ module: 'pix2pix', dir: 'checkpoints/pix2pix/' })], function (percent, i, n) {
+      console.log('progress', i, n);
       dispatch({ type: _types2.default.app.load_progress, progress: { i: i, n: n } });
     }).then(function (res) {
-      var _res = _slicedToArray(res, 4),
+      var _res = _slicedToArray(res, 5),
           datasetApiReport = _res[0],
           sequences = _res[1],
           datasets = _res[2],
-          checkpoints = _res[3];
+          checkpoints = _res[3],
+          pix2pixCheckpoints = _res[4];
 
       var folderLookup = datasetApiReport.folderLookup,
           fileLookup = datasetApiReport.fileLookup,
@@ -7795,8 +7800,22 @@ var load_directories = exports.load_directories = function load_directories(id)
       checkpointDirectories.forEach(function (dir) {
         var dataset = datasetLoader.getDataset(module, datasetLookup, dir.name);
         dataset.hasCheckpoints = true;
+        dir.module = 'pix2wav';
       });
 
+      var pix2pixCheckpointDirectories = pix2pixCheckpoints.filter(function (s) {
+        return s.dir;
+      });
+      pix2pixCheckpointDirectories.forEach(function (dir) {
+        var dataset = datasetLoader.getDataset(module, datasetLookup, dir.name);
+        dataset.hasCheckpoints = true;
+        dir.module = 'pix2pix';
+      });
+
+      console.log(res);
+      console.log(checkpointDirectories);
+      console.log(pix2pixCheckpointDirectories);
+
       dispatch({
         type: _types2.default.dataset.load,
         data: {
@@ -7807,7 +7826,7 @@ var load_directories = exports.load_directories = function load_directories(id)
           folders: folders, files: files,
           sequences: sequenceDirectories,
           datasets: datasets,
-          checkpoints: checkpointDirectories
+          checkpoints: checkpointDirectories.concat(pix2pixCheckpointDirectories)
         }
       });
 
@@ -8051,6 +8070,7 @@ var Pix2WavLive = function (_Component) {
     key: 'componentWillUpdate',
     value: function componentWillUpdate(nextProps) {
       if (nextProps.opt.checkpoint_name && nextProps.opt.checkpoint_name !== this.props.opt.checkpoint_name) {
+        console.log('fetch checkpoint', nextProps.opt.checkpoint_name);
         this.props.actions.live.list_epochs('pix2wav', nextProps.opt.checkpoint_name);
       }
     }
@@ -8080,8 +8100,9 @@ var Pix2WavLive = function (_Component) {
     key: 'start',
     value: function start() {
       // console.log(this.props)
-      var sequence = this.props.pix2wav.data.sequences[0].name;
-      var checkpoint = this.props.pix2wav.data.checkpoints[0].name;
+      console.log(this.props.pix2wav.data);
+      var sequence = this.props.pix2wav.data.sequences[0].name || '';
+      var checkpoint = this.props.pix2wav.data.checkpoints[0].name || '';
       console.log('starting up!', sequence, checkpoint);
       this.props.actions.tasks.live_task(sequence, checkpoint);
     }
@@ -8116,6 +8137,8 @@ var Pix2WavLive = function (_Component) {
       if (this.props.pix2wav.loading) {
         return (0, _preact.h)(_common.Loading, null);
       }
+      // console.log('sequence', this.props.opt)
+      console.log(this.props.pix2wav.data.checkpoints);
       return (0, _preact.h)(
         'div',
         { className: 'app centered' },
@@ -8327,7 +8350,7 @@ var Pix2WavLive = function (_Component) {
           'Start'
         );
       }
-      if (this.props.runner.gpu.task.module !== 'pix2wav') {
+      if (this.props.runner.gpu.task.module !== 'pix2pix' && this.props.runner.gpu.task.module !== 'pix2wav') {
         return (0, _preact.h)(
           _common.Button,
           {