mandatory results folder

1 files changed, 175 insertions, 70 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 73c8d0b..d3760b8 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -2450,6 +2450,7 @@ var FileRow = exports.FileRow = function FileRow(props) {
   var size = _util2.default.hush_size(file.size);
   var date = file.date || file.created_at;
   var epoch = file.epoch || file.epochs || 0;
+  var count = file.count || 0;
 
   var name = void 0;
   var key = void 0;
@@ -2522,6 +2523,11 @@ var FileRow = exports.FileRow = function FileRow(props) {
       { className: "size " + size[0] },
       size[1]
     ),
+    fields.has('count') && (0, _preact.h)(
+      'div',
+      { className: "count " + _util2.default.hush_null(count)[0] },
+      count > 0 ? count + ' files' : ''
+    ),
     (fields.has('activity') || fields.has('module')) && (0, _preact.h)(
       'div',
       { className: 'activity' },
@@ -2688,15 +2694,19 @@ function FolderList(_ref) {
       { 'class': 'col folderList' },
       (0, _preact.h)(_loading2.default, { progress: db.progress })
     );
-  } else if (!db.data.folders.length && emptyText) {
+  }
+  var folderList = db.data.folders.filter(function (folder) {
+    return !!folder.generated;
+  });
+  if (!folderList.length && emptyText) {
     return (0, _preact.h)(
       'div',
       { 'class': 'col folderList' },
       emptyText
     );
   }
-  console.log(db.data.folders);
-  var folders = db.data.folders.map(function (raw_folder) {
+  console.log(folders);
+  var folders = folderList.map(function (raw_folder) {
     var folder = db.data.folderLookup[raw_folder.id];
     var fileCount = folder.files ? folder.files.length : 0;
 
@@ -3934,7 +3944,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var load = exports.load = function load() {
   return function (dispatch) {
-    _util2.default.allProgress([_actions2.default.task.index({ limit: 40, orderBy: 'created_at desc' }), _actions2.default.folder.index(), _actions2.default.file.index({ module: 'samplernn', generated: 1, limit: 10, orderBy: 'created_at desc' })], function (percent, i, n) {
+    _util2.default.allProgress([_actions2.default.task.index({ limit: 40, orderBy: 'created_at desc' }), _actions2.default.folder.index({ activity: 'dataset' }), _actions2.default.file.index({ module: 'samplernn', generated: 1, limit: 10, orderBy: 'created_at desc' })], function (percent, i, n) {
       console.log('dashboard load progress', i, n);
       dispatch({ type: _types2.default.app.load_progress, progress: { i: i, n: n } });
     }).then(function (res) {
@@ -4794,6 +4804,10 @@ var DatasetComponent = function (_Component) {
       var datasetLookup = data.datasetLookup,
           fileLookup = data.fileLookup;
 
+      if (!datasetLookup) {
+        return (0, _preact.h)('div', null);
+      }
+
       var _util$sort$orderByFn = _util2.default.sort.orderByFn('date desc'),
           mapFn = _util$sort$orderByFn.mapFn,
           sortFn = _util$sort$orderByFn.sortFn;
@@ -5147,6 +5161,8 @@ var load = exports.load = function load(module) {
     var folderLookup = {};
     var fileLookup = {};
 
+    var resultsFolder = {};
+
     // take all of the folders and put them in a lookup
     folderLookup = folders.reduce(function (folderLookup, folder) {
       folderLookup[folder.id] = {
@@ -5156,11 +5172,26 @@ var load = exports.load = function load(module) {
         files: [],
         datasets: []
       };
+      resultsFolder = resultsFolder || folder.name === 'results' && folder;
       return folderLookup;
     }, {
       unsorted: unsortedFolder(module, true)
     });
 
+    if (!resultsFolder) {
+      console.log('creating results folder...');
+      _actions2.default.folder.create({
+        module: module,
+        name: 'results',
+        activity: 'results'
+      }).then(function (folder) {
+        console.log('created folder', folder);
+        folderLookup.results = folder;
+      });
+    } else {
+      console.log('got results folder', resultsFolder);
+    }
+
     // prepare the files by splitting into two groups
     var generatedFiles = files.filter(function (file) {
       return file.generated;
@@ -5205,7 +5236,8 @@ var load = exports.load = function load(module) {
       datasetLookup: datasetLookup,
       folders: folders,
       files: files,
-      unsortedFolder: folderLookup.unsorted
+      unsortedFolder: folderLookup.unsorted,
+      resultsFolder: resultsFolder
     };
   }).catch(function (e) {
     console.error(e);
@@ -8159,17 +8191,18 @@ var load_directories = exports.load_directories = function load_directories(id)
           datasetLookup = datasetApiReport.datasetLookup,
           folders = datasetApiReport.folders,
           files = datasetApiReport.files,
-          unsortedFolder = datasetApiReport.unsortedFolder;
+          unsortedFolder = datasetApiReport.unsortedFolder,
+          resultsFolder = datasetApiReport.resultsFolder;
       // console.log(datasetUsage)
 
       var sequenceDirectories = sequences.filter(function (s) {
         return s.dir;
       });
-      console.log(sequenceDirectories);
+      // console.log(sequenceDirectories)
       sequenceDirectories.forEach(function (dir) {
         var dataset = datasetLoader.getDataset(module, datasetLookup, dir.name);
         dataset.isBuilt = true;
-        console.log(dir.name, dataset);
+        // console.log(dir.name, dataset)
       });
 
       datasets.filter(function (s) {
@@ -8252,7 +8285,8 @@ var load_directories = exports.load_directories = function load_directories(id)
           folders: folders, files: files,
           sequences: sequenceDirectories,
           datasets: datasets,
-          checkpoints: checkpointDirectories
+          checkpoints: checkpointDirectories,
+          resultsFolder: resultsFolder
         }
       });
       if (id) {
@@ -8273,22 +8307,24 @@ var load_directories = exports.load_directories = function load_directories(id)
 
 var load_results = exports.load_results = function load_results(id) {
   return function (dispatch) {
-    console.log('hi');
     var module = _pix2pixhd2.default.name;
-    _util2.default.allProgress([_actions2.default.file.index({ module: module, generated: true }), _actions2.default.socket.list_sequences({ module: module, dir: 'results' }), _actions2.default.socket.list_directory({ module: module, dir: 'renders' })], function (percent, i, n) {
+    _util2.default.allProgress([_actions2.default.folder.index({ name: 'results' }), _actions2.default.file.index({ module: module, generated: 1 }), _actions2.default.socket.list_sequences({ module: module, dir: 'results' }), _actions2.default.socket.list_directory({ module: module, dir: 'renders' })], function (percent, i, n) {
       console.log('pix2pixhd load progress', i, n);
       dispatch({ type: _types2.default.app.load_progress, progress: { i: i, n: n } });
     }).then(function (res) {
-      var _res2 = _slicedToArray(res, 3),
-          files = _res2[0],
-          results = _res2[1],
-          renders = _res2[2]; //, datasets, results, output, datasetUsage, lossReport] = res
+      var _res2 = _slicedToArray(res, 4),
+          folders = _res2[0],
+          files = _res2[1],
+          results = _res2[2],
+          renders = _res2[3]; //, datasets, results, output, datasetUsage, lossReport] = res
 
 
       console.log(files, results, renders);
       dispatch({
         type: _types2.default.pix2pixhd.load_results,
         results: {
+          folder: folders[0],
+          files: files,
           results: results,
           renders: renders
         }
@@ -8336,6 +8372,8 @@ 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);
@@ -8351,7 +8389,8 @@ var pix2pixhdInitialState = {
   progress: { i: 0, n: 0 },
   error: null,
   folder_id: 0,
-  data: null
+  data: null,
+  results: null
 };
 
 var pix2pixhdReducer = function pix2pixhdReducer() {
@@ -8363,6 +8402,10 @@ var pix2pixhdReducer = function pix2pixhdReducer() {
   }
 
   switch (action.type) {
+    case _types2.default.pix2pixhd.load_results:
+      return _extends({}, state, {
+        results: action.results
+      });
     default:
       return state;
   }
@@ -8387,6 +8430,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.live_task = exports.train_task = exports.fetch_task = undefined;
 
+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 _v = __webpack_require__(/*! uuid/v1 */ "./node_modules/uuid/v1.js");
 
 var _v2 = _interopRequireDefault(_v);
@@ -8436,8 +8481,7 @@ var train_task = exports.train_task = function train_task(dataset, folder_id) {
       epoch: 0,
       epochs: epochs,
       opt: {
-        folder_id: folder_id,
-        load_size: 264 // switch to 256 for pix2wav
+        folder_id: folder_id
       }
     };
     console.log(task);
@@ -8445,16 +8489,16 @@ var train_task = exports.train_task = function train_task(dataset, folder_id) {
   };
 };
 
-var live_task = exports.live_task = function live_task(sequence, checkpoint) {
+var live_task = exports.live_task = function live_task(sequence, checkpoint, opt) {
   return function (dispatch) {
     var task = {
       module: _pix2pixhd2.default.name,
       activity: 'live',
       dataset: sequence,
       checkpoint: checkpoint,
-      opt: {
-        poll_delay: 0.09
-      }
+      opt: _extends({}, opt, {
+        poll_delay: 0.01
+      })
     };
     console.log(task);
     console.log('add live task');
@@ -8571,10 +8615,12 @@ var Pix2PixHDLive = function (_Component) {
     key: 'start',
     value: function start() {
       // console.log(this.props)
-      var sequence = this.props.pix2pixhd.data.sequences[0].name;
-      var checkpoint = this.props.pix2pixhd.data.checkpoints[0].name;
+      var sequence = this.props.live.opt.sequence_name;
+      var checkpoint = this.props.live.opt.checkpoint_name;
       console.log('starting up!', sequence, checkpoint);
-      this.props.actions.tasks.live_task(sequence, checkpoint);
+      this.props.actions.tasks.live_task(sequence, checkpoint, {
+        folder_id: resultsFolder.id
+      });
     }
   }, {
     key: 'interrupt',
@@ -8603,6 +8649,8 @@ var Pix2PixHDLive = function (_Component) {
   }, {
     key: 'render',
     value: function render() {
+      var _this2 = this;
+
       // console.log(this.props)
       if (this.props.pix2pixhd.loading) {
         return (0, _preact.h)(_common.Loading, null);
@@ -8659,32 +8707,36 @@ var Pix2PixHDLive = function (_Component) {
               }),
               (0, _preact.h)(_common.Slider, { live: true,
                 name: 'frame_delay',
-                min: 0.05, max: 2.0, type: 'float'
+                min: 0.0, max: 2.0, type: 'float'
               }),
               this.renderRestartButton(),
+              this.renderRecordButton(),
               (0, _preact.h)(
                 _common.Button,
                 {
-                  title: this.props.opt.savingVideo ? 'Saving video...' : this.props.opt.recording ? 'Recording (' + timeInSeconds(this.props.opt.recordFrames / 25) + ')' : 'Record video',
-                  onClick: this.toggleRecording
+                  title: 'Save frame',
+                  onClick: _player.saveFrame
                 },
-                this.props.opt.savingVideo ? 'Saving' : this.props.opt.recording ? 'Recording' : 'Record'
+                'Save'
               ),
               (0, _preact.h)(
-                _common.Button,
+                _common.ParamGroup,
                 {
-                  title: 'Save frame',
-                  onClick: _player.saveFrame
+                  title: 'Record video',
+                  name: 'store_b',
+                  onToggle: function onToggle(value) {
+                    // now storing frames on server...
+                  }
                 },
-                'Save'
+                (0, _preact.h)(_common.TextInput, {
+                  title: 'Video name',
+                  name: 'final_tag',
+                  value: this.props.opt.final_tag,
+                  onSave: function onSave(value) {
+                    _this2.props.actions.live.set_param('final_tag', value);
+                  }
+                })
               ),
-              (0, _preact.h)(_common.ParamGroup, {
-                title: 'Render on server',
-                name: 'store_b',
-                onToggle: function onToggle(value) {
-                  // now storing frames on server...
-                }
-              }),
               (0, _preact.h)(
                 'p',
                 { 'class': 'last_message' },
@@ -8815,15 +8867,16 @@ var Pix2PixHDLive = function (_Component) {
   }, {
     key: 'renderRestartButton',
     value: function renderRestartButton() {
-      var _this2 = this;
+      var _this3 = this;
 
+      console.log(this.props.runner.gpu);
       if (this.props.runner.gpu.status === 'IDLE') {
         return (0, _preact.h)(
           _common.Button,
           {
             title: 'GPU Idle',
             onClick: function onClick() {
-              return _this2.start();
+              return _this3.start();
             }
           },
           'Start'
@@ -8835,7 +8888,7 @@ var Pix2PixHDLive = function (_Component) {
           {
             title: 'GPU Busy',
             onClick: function onClick() {
-              return _this2.interrupt();
+              return _this3.interrupt();
             }
           },
           'Interrupt'
@@ -8858,7 +8911,7 @@ var Pix2PixHDLive = function (_Component) {
             {
               title: 'GPU Busy',
               onClick: function onClick() {
-                return _this2.interrupt();
+                return _this3.interrupt();
               }
             },
             'Interrupt'
@@ -8881,13 +8934,32 @@ var Pix2PixHDLive = function (_Component) {
           {
             title: 'GPU Busy',
             onClick: function onClick() {
-              return _this2.interrupt();
+              return _this3.interrupt();
             }
           },
           'Interrupt'
         )
       );
     }
+  }, {
+    key: 'renderRecordButton',
+    value: function renderRecordButton() {
+      return null;
+      // return (
+      //   <Button
+      //     title={
+      //       this.props.opt.savingVideo
+      //       ? 'Saving video...'
+      //       : this.props.opt.recording
+      //       ? 'Recording (' + timeInSeconds(this.props.opt.recordFrames/25) +')'
+      //       : 'Record video'
+      //     }
+      //     onClick={this.toggleRecording}
+      //   >
+      //     {this.props.opt.savingVideo ? 'Saving' : this.props.opt.recording ? 'Recording' : 'Record'}
+      //   </Button>
+      // )
+    }
   }]);
 
   return Pix2PixHDLive;
@@ -9057,30 +9129,17 @@ var Pix2pixHDResults = function (_Component) {
   _createClass(Pix2pixHDResults, [{
     key: 'render',
     value: function render() {
-      if (this.props.pix2pixhd.loading) return (0, _preact.h)(_loading2.default, { progress: this.props.pix2pixhd.progress });
-      // const { folderLookup, fileLookup, datasetLookup } = this.props.samplernn.data
+      var _this2 = this;
 
-      // console.log(bestRenders.map(r => r.epoch))
-      // const path = folder.name === 'unsorted'
-      //   ? "/samplernn/import/"
-      //   : "/samplernn/datasets/" + folder.id + "/"
-      // return (
-      //   <div className='col bestRenders'>
-      //     <h3><Link to={path}>{folder.name}</Link></h3>
-      //     <FileList
-      //       linkFiles
-      //       files={bestRenders}
-      //       orderBy='date desc'
-      //       fields={'name date epoch size'}
-      //       onClick={(file, e) => {
-      //         e.preventDefault()
-      //         e.stopPropagation()
-      //         console.log('picked a file', file)
-      //         this.handlePick(file)
-      //       }}
-      //     />
-      //   </div>
-      // )
+      if (!this.props.pix2pixhd.results) return (0, _preact.h)(_loading2.default, { progress: this.props.pix2pixhd.progress });
+
+      var _props$pix2pixhd$resu = this.props.pix2pixhd.results,
+          resultsFolder = _props$pix2pixhd$resu.resultsFolder,
+          results = _props$pix2pixhd$resu.results,
+          renders = _props$pix2pixhd$resu.renders,
+          files = _props$pix2pixhd$resu.files;
+
+      console.log(results);
 
       return (0, _preact.h)(
         'div',
@@ -9094,7 +9153,54 @@ var Pix2pixHDResults = function (_Component) {
             'Pix2PixHD Results'
           )
         ),
-        (0, _preact.h)('div', { 'class': 'rows params renders' })
+        (0, _preact.h)(
+          'div',
+          { 'class': 'rows params renders' },
+          (0, _preact.h)(_fileList.FileList, {
+            linkFiles: true,
+            files: files,
+            orderBy: 'date desc',
+            fields: 'name date size',
+            onClick: function onClick(file, e) {
+              e.preventDefault();
+              e.stopPropagation();
+              console.log('picked a result', file);
+              _this2.handlePick(file);
+            }
+          }),
+          (0, _preact.h)(
+            'h3',
+            null,
+            'renders'
+          ),
+          (0, _preact.h)(_fileList.FileList, {
+            files: renders,
+            orderBy: 'date desc',
+            fields: 'name date size',
+            onClick: function onClick(file, e) {
+              e.preventDefault();
+              e.stopPropagation();
+              console.log('picked a result', file);
+              _this2.handlePick(file);
+            }
+          }),
+          (0, _preact.h)(
+            'h3',
+            null,
+            'results'
+          ),
+          (0, _preact.h)(_fileList.FileList, {
+            files: results,
+            orderBy: 'date desc',
+            fields: 'name date count',
+            onClick: function onClick(file, e) {
+              e.preventDefault();
+              e.stopPropagation();
+              console.log('picked a result', file);
+              _this2.handlePick(file);
+            }
+          })
+        )
       );
     }
   }, {
@@ -9298,7 +9404,6 @@ var Pix2PixHDShow = function (_Component) {
       var input = pix2pixhd.data.fileLookup[dataset.input[0]];
       if (!input) return null;
       if (input.name && input.name.match(/(gif|jpe?g|png)$/i)) return null;
-      console.log(dataset);
       return (0, _preact.h)(
         'div',
         null,