actually importing stuff

1 files changed, 162 insertions, 38 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 170f3eb..dbb9232 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -1797,8 +1797,6 @@ var Select = function (_Component) {
 
           name = _key[0];
           value = _key[1];
-
-          console.log(name, value);
         } else if (typeof key === 'string') {
           name = key.length < 4 ? key.toUpperCase() : key;
           value = key;
@@ -4614,7 +4612,7 @@ exports.default = {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.train_task_now = exports.fetch_url = exports.set_folder = exports.load_loss = exports.load_directories = undefined;
+exports.train_task_now = exports.fetch_url = exports.set_folder = exports.import_files = exports.load_loss = exports.load_directories = undefined;
 
 var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
@@ -4716,6 +4714,7 @@ var load_directories = exports.load_directories = function load_directories(id)
         file.epoch = file.epoch || pair[1];
       });
 
+      // also show the various flat audio files we have, in the input area..
       var flatDatasets = datasets.filter(function (s) {
         return s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir;
       });
@@ -4765,13 +4764,25 @@ var load_directories = exports.load_directories = function load_directories(id)
         file.persisted = false;
         file.epoch = parseInt(file.epoch || pair[1].replace(/^\D+/, '')) || 0;
         dataset.epoch = Math.max(file.epoch, dataset.epoch || 0);
-        dataset.output.push(file);
+        // here check if the file exists in dataset, if so just check that it's persisted
+        var found = dataset.output.some(function (f) {
+          // if (f.name === 
+          if (f.name === file.name) {
+            f.persisted = true;
+            return true;
+          }
+          return false;
+        });
+        if (!found) {
+          dataset.output.push(file);
+        }
       });
 
       dispatch({
         type: _types2.default.samplernn.init,
         data: {
           folderLookup: folderLookup,
+          datasetLookup: datasetLookup,
           folders: folders, files: files,
           checkpoints: checkpoints,
           builtDatasets: builtDatasets,
@@ -4822,6 +4833,55 @@ var load_loss = exports.load_loss = function load_loss() {
   };
 };
 
+var import_files = exports.import_files = function import_files(state, datasetLookup) {
+  return function (dispatch) {
+    var selected = state.selected,
+        folder = state.folder,
+        url_base = state.url_base,
+        import_action = state.import_action;
+
+    var names = Object.keys(selected).filter(function (k) {
+      return selected[k];
+    });
+    var promises = void 0;
+    switch (import_action) {
+      case 'Hotlink':
+        // in this case, create a new file for each file we see.
+        promises = names.reduce(function (a, name) {
+          return datasetLookup[name].output.map(function (file) {
+            var partz = file.name.split('.');
+            var ext = partz.pop();
+            return _actions2.default.file.create({
+              folder_id: folder,
+              name: file.name,
+              url: url_base + file.name,
+              mime: 'audio/' + ext,
+              epoch: file.epoch,
+              size: file.size,
+              module: 'samplernn',
+              dataset: name,
+              activity: 'train',
+              datatype: 'audio',
+              generated: true,
+              created_at: new Date(file.date),
+              updated_at: new Date(file.date)
+            });
+          }).concat(a);
+        }, []);
+        break;
+      case 'Upload':
+        break;
+      default:
+        break;
+    }
+    Promise.all(promises).then(function (data) {
+      console.log(data);
+    }).catch(function (e) {
+      console.error(e);
+    });
+  };
+};
+
 var set_folder = exports.set_folder = function set_folder(folder) {
   _types2.default.samplernn.set_folder, folder;
 };
@@ -4998,9 +5058,8 @@ var SampleRNNDatasets = function (_Component) {
           history = _props2.history;
 
       var id = this.props.id || localStorage.getItem('samplernn.last_id');
-      console.log(this.props.id);
       if (samplernn.loading) {
-        console.log('loading');
+        // console.log('loading')
         return (0, _preact.h)(
           'span',
           null,
@@ -5044,7 +5103,9 @@ var SampleRNNDatasets = function (_Component) {
     value: function renderGroups() {
       var _this3 = this;
 
-      var samplernn = this.props.samplernn;
+      var _props3 = this.props,
+          samplernn = _props3.samplernn,
+          onPickDataset = _props3.onPickDataset;
 
       var folder = samplernn.folder;
 
@@ -5056,7 +5117,9 @@ var SampleRNNDatasets = function (_Component) {
         var dataset = pair[1];
         return (0, _preact.h)(
           'div',
-          { className: 'row dataset' },
+          { className: 'row dataset', onClick: function onClick() {
+              return onPickDataset(dataset);
+            } },
           _this3.props.beforeRow && _this3.props.beforeRow(dataset),
           (0, _preact.h)(
             'div',
@@ -5095,7 +5158,8 @@ var SampleRNNDatasets = function (_Component) {
               orderBy: 'epoch desc',
               fields: 'name date epoch size'
             })
-          )
+          ),
+          _this3.props.afterRow && _this3.props.afterRow(dataset)
         );
       });
       return datasets;
@@ -5137,6 +5201,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 _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
@@ -5161,6 +5227,10 @@ var _textInput = __webpack_require__(/*! ../../common/textInput.component */ "./
 
 var _textInput2 = _interopRequireDefault(_textInput);
 
+var _button = __webpack_require__(/*! ../../common/button.component */ "./app/client/common/button.component.js");
+
+var _button2 = _interopRequireDefault(_button);
+
 var _samplernn2 = __webpack_require__(/*! ./samplernn.datasets */ "./app/client/modules/samplernn/samplernn.datasets.js");
 
 var _samplernn3 = _interopRequireDefault(_samplernn2);
@@ -5169,6 +5239,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -5190,7 +5262,9 @@ var SampleRNNImport = function (_Component) {
 
     _this.state = {
       folder: 1,
-      url_base: ''
+      import_action: 'Hotlink',
+      url_base: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4279/',
+      selected: {}
     };
     return _this;
   }
@@ -5203,10 +5277,8 @@ var SampleRNNImport = function (_Component) {
       var datasets = [];
       if (this.props.samplernn.data) {
         datasets = (this.props.samplernn.data.folders || []).map(function (folder) {
-          console.log(folder.id, folder.name);
           return [folder.name, folder.id];
         });
-        console.log(datasets);
       }
       return (0, _preact.h)(
         'div',
@@ -5222,37 +5294,66 @@ var SampleRNNImport = function (_Component) {
         ),
         (0, _preact.h)(
           'div',
-          { 'class': 'params form row' },
+          { 'class': 'params form row datasets' },
           (0, _preact.h)(
             'div',
-            { 'class': 'col' },
+            { 'class': 'row dataset' },
+            (0, _preact.h)('div', { 'class': 'col' }),
+            (0, _preact.h)('div', { 'class': 'col' }),
+            (0, _preact.h)('div', { 'class': 'col' }),
             (0, _preact.h)(
-              'h2',
-              null,
-              'Import to dataset'
-            ),
-            (0, _preact.h)(_select2.default, {
-              title: 'Destination dataset',
-              options: datasets,
-              name: 'folder',
-              opt: this.state,
-              onChange: function onChange(name, value) {
-                return _this2.setState({ folder: value });
-              }
-            }),
-            (0, _preact.h)(_textInput2.default, {
-              title: 'URL base',
-              value: this.state.url_base,
-              placeholder: 'http://',
-              onSave: function onSave(value) {
-                return _this2.setState({ url_base: value });
-              }
-            })
+              'div',
+              { 'class': 'col' },
+              (0, _preact.h)(
+                'h2',
+                null,
+                'Import to dataset'
+              ),
+              (0, _preact.h)(_select2.default, {
+                title: 'Destination dataset',
+                options: datasets,
+                name: 'folder',
+                opt: this.state,
+                onChange: function onChange(name, value) {
+                  return _this2.setState({ folder: value });
+                }
+              }),
+              (0, _preact.h)(_select2.default, {
+                title: 'Import action',
+                options: ['Hotlink', 'Upload'],
+                name: 'import_action',
+                opt: this.state,
+                onChange: function onChange(name, value) {
+                  return _this2.setState({ import_action: value });
+                }
+              }),
+              (0, _preact.h)(_textInput2.default, {
+                title: 'Remote URL base',
+                value: this.state.url_base,
+                placeholder: 'http://',
+                onSave: function onSave(value) {
+                  return _this2.setState({ url_base: value });
+                }
+              }),
+              (0, _preact.h)(
+                _button2.default,
+                {
+                  title: '',
+                  onClick: function onClick() {
+                    return _this2.doImport();
+                  }
+                },
+                'Import'
+              )
+            )
           )
         ),
         (0, _preact.h)(_samplernn3.default, {
           id: 'unsorted',
           history: this.props.history,
+          onPickDataset: function onPickDataset(dataset) {
+            return _this2.toggle(dataset.name, _this2.state.selected[name]);
+          },
           beforeRow: function beforeRow(dataset) {
             return _this2.beforeRow(dataset);
           },
@@ -5263,15 +5364,38 @@ var SampleRNNImport = function (_Component) {
       );
     }
   }, {
+    key: 'toggle',
+    value: function toggle(name) {
+      this.setState(_extends({}, this.state, {
+        selected: _extends({}, this.state.selected, _defineProperty({}, name, !this.state.selected[name]))
+      }));
+    }
+  }, {
     key: 'beforeRow',
     value: function beforeRow(dataset) {
       // console.log(dataset)
-      return null;
     }
   }, {
     key: 'afterRow',
     value: function afterRow(dataset) {
-      return null;
+      var name = dataset.name;
+      return (0, _preact.h)(
+        'div',
+        null,
+        (0, _preact.h)('input', {
+          type: 'checkbox',
+          value: name,
+          checked: !!this.state.selected[name]
+        })
+      );
+    }
+  }, {
+    key: 'doImport',
+    value: function doImport() {
+      var samplernn = this.props.samplernn;
+
+      console.log(this.state);
+      this.props.actions.import_files(this.state, samplernn.data.datasetLookup);
     }
   }]);
 
@@ -5839,7 +5963,7 @@ var samplernnReducer = function samplernnReducer() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : samplernnInitialState;
   var action = arguments[1];
 
-  console.log(action.type);
+  // console.log(action.type)
   switch (action.type) {
     case _types2.default.samplernn.init:
       return _extends({}, state, {