so limiting

1 files changed, 23 insertions, 11 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 495ae78..bcdb8f2 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -4562,7 +4562,7 @@ var DatasetComponent = function (_Component) {
               }),
               orderBy: 'epoch desc',
               fields: 'name date epoch size',
-              onPickFile: onPickFile,
+              onClick: onPickFile,
               onDelete: function onDelete(file) {
                 return _this2.onDeleteFile(file);
               }
@@ -4827,7 +4827,7 @@ var emptyDataset = exports.emptyDataset = function emptyDataset(module, datasetL
 
 var getDataset = exports.getDataset = function getDataset(module, datasetLookup, name, folder, date) {
   var dataset = datasetLookup[name] || emptyDataset(module, datasetLookup, name, folder);
-  folder = folder || unsortedFolder(module);
+  // folder = folder || unsortedFolder(module)
   if (date) {
     dataset.date = dataset.date && !isNaN(dataset.date) ? Math.max(+new Date(date), dataset.date) : +new Date(date);
   }
@@ -4861,6 +4861,9 @@ var load = exports.load = function load(module) {
     });
 
     // prepare the files by splitting into two groups
+    files.forEach(function (f) {
+      if (f.name.match('pc_1')) console.log(f);
+    });
     var generatedFiles = files.filter(function (file) {
       return file.generated;
     });
@@ -4875,6 +4878,7 @@ var load = exports.load = function load(module) {
         file.name = (file.opt || {}).token || file.url;
       }
       var name = (file.name || 'unsorted').split('.')[0];
+      if (name === 'pc_1') console.log('u', name);
       var folder = folderLookup[file.folder_id] || unsortedFolder(module);
       var dataset = getDataset(module, datasetLookup, name, folder, file.date || file.created_at);
       if (file.url.match(file.name)) file.persisted = true;
@@ -4887,6 +4891,7 @@ var load = exports.load = function load(module) {
     generatedFiles.map(function (file) {
       fileLookup[file.id] = file;
       var pair = file.name.split('.')[0].split('-');
+      if (pair[0] === 'pc_1') console.log('g', pair[0]);
       var folder = folderLookup[file.folder_id] || unsortedFolder(module);
       var dataset = getDataset(module, datasetLookup, pair[0], folder, file.date || file.created_at);
       dataset.output.push(file.id);
@@ -8232,6 +8237,11 @@ var Pix2WavLive = function (_Component) {
                 onChange: this.changeSequence
               }),
               (0, _preact.h)(_common.Select, {
+                name: 'output_format',
+                title: 'format',
+                options: ['JPEG', 'PNG']
+              }),
+              (0, _preact.h)(_common.Select, {
                 name: 'checkpoint_name',
                 title: 'checkpoint',
                 options: this.props.pix2wav.data.checkpoints,
@@ -9420,7 +9430,7 @@ var load_directories = exports.load_directories = function load_directories(id)
         return s.dir;
       });
       builtDatasets.forEach(function (dir) {
-        var dataset = datasetLoader.getDataset(module, datasetLookup, dir.name);
+        var dataset = datasetLoader.getDataset(module, datasetLookup, dir.name, unsortedFolder, dir.date);
         dataset.isBuilt = true;
       });
 
@@ -9459,6 +9469,7 @@ var load_directories = exports.load_directories = function load_directories(id)
       });
 
       output.map(function (file) {
+        return;
         file.uuid = (0, _v2.default)();
         fileLookup[file.uuid] = file;
         var pair = file.name.split('.')[0].split('-');
@@ -9540,7 +9551,7 @@ var load_loss = exports.load_loss = function load_loss() {
 var import_files = exports.import_files = function import_files(state, datasetLookup, fileLookup) {
   return function (dispatch) {
     var selected = state.selected,
-        folder = state.folder,
+        folder_id = state.folder_id,
         url_base = state.url_base,
         import_action = state.import_action;
 
@@ -9558,7 +9569,7 @@ var import_files = exports.import_files = function import_files(state, datasetLo
             var partz = file.name.split('.');
             var ext = partz.pop();
             return _actions2.default.file.create({
-              folder_id: folder,
+              folder_id: folder_id,
               name: file.name,
               url: url_base + file.name,
               mime: 'audio/' + ext,
@@ -9586,7 +9597,7 @@ var import_files = exports.import_files = function import_files(state, datasetLo
             if (ext === 'wav' || ext === 'flac') return;
             console.log(file);
             return _actions2.default.socket.upload_file({
-              folder_id: folder,
+              folder_id: folder_id,
               module: 'samplernn',
               activity: 'train',
               path: 'datasets',
@@ -9607,7 +9618,7 @@ var import_files = exports.import_files = function import_files(state, datasetLo
     console.log(promises);
     return Promise.all(promises).then(function (data) {
       console.log(data);
-      window.location.href = '/samplernn/datasets/' + folder.id;
+      window.location.href = '/samplernn/datasets/' + folder_id + '/';
     }).catch(function (e) {
       console.error(e);
     });
@@ -10110,7 +10121,7 @@ var SampleRNNImport = function (_Component) {
     var _this = _possibleConstructorReturn(this, (SampleRNNImport.__proto__ || Object.getPrototypeOf(SampleRNNImport)).call(this));
 
     _this.state = {
-      folder: 1,
+      folder_id: 1,
       import_action: 'Hotlink',
       url_base: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4279/',
       selected: {}
@@ -10183,10 +10194,10 @@ var SampleRNNImport = function (_Component) {
               (0, _preact.h)(_select2.default, {
                 title: 'Destination dataset',
                 options: datasets,
-                name: 'folder',
+                name: 'folder_id',
                 opt: this.state,
                 onChange: function onChange(name, value) {
-                  return _this2.setState({ folder: value });
+                  return _this2.setState({ folder_id: value });
                 }
               }),
               (0, _preact.h)(_select2.default, {
@@ -10695,7 +10706,7 @@ var SampleRNNShow = function (_Component) {
           onPickFile: function onPickFile(file, e) {
             e.preventDefault();
             e.stopPropagation();
-            console.log('picked a file', file);
+            // console.log('picked a file', file)
             _this2.handlePick(file);
           },
           datasetActions: this.datasetActions
@@ -10787,6 +10798,7 @@ var SampleRNNShow = function (_Component) {
   }, {
     key: 'handlePick',
     value: function handlePick(file) {
+      // console.log(file)
       this.props.audioPlayer.play(file);
     }
   }]);