1 files changed, 35 insertions, 4 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 01698f7..1ef6fd4 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -361,7 +361,7 @@ function crud_upload(type, fd, data, dispatch) {
     xhr.addEventListener("load", uploadComplete, false);
     xhr.addEventListener("error", uploadFailed, false);
     xhr.addEventListener("abort", uploadCancelled, false);
-    xhr.open("POST", '/' + type + '/' + id + '/upload/');
+    xhr.open("POST", '/api/' + type + '/' + id + '/upload/');
     xhr.send(fd);
 
     dispatch && dispatch({ type: (0, _crud.as_type)(type, 'upload_loading') });
@@ -4660,7 +4660,7 @@ var load_directories = exports.load_directories = function load_directories(id)
 
         var dataset = datasetLookup[name] || empty_dataset(name, folder);
         if (date) {
-          dataset.date = dataset.date ? Math.max(+new Date(date), dataset.date) : +new Date(date);
+          dataset.date = dataset.date && !isNaN(dataset.date) ? Math.max(+new Date(date), dataset.date) : +new Date(date);
         }
         return dataset;
       };
@@ -4678,6 +4678,7 @@ var load_directories = exports.load_directories = function load_directories(id)
         folder.datasets.push(dataset);
         return dataset;
       };
+
       // 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: [] };
@@ -4701,7 +4702,8 @@ 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);
+        var dataset = get_dataset(name, folderLookup[file.folder_id] || unsortedFolder, file.date || file.created_at);
+        if (file.url.match(file.name)) file.persisted = true;
         dataset.input.push(file);
         return datasetLookup;
       }, datasetLookup);
@@ -4709,7 +4711,7 @@ var load_directories = exports.load_directories = function load_directories(id)
       // 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);
+        var dataset = get_dataset(pair[0], folderLookup[file.folder_id] || unsortedFolder, file.date || file.created_at);
         dataset.output.push(file);
         file.epoch = file.epoch || pair[1];
       });
@@ -4870,10 +4872,34 @@ var import_files = exports.import_files = function import_files(state, datasetLo
         }, []);
         break;
       case 'Upload':
+        promises = names.reduce(function (a, name) {
+          console.log(datasetLookup[name]);
+          return datasetLookup[name].input.map(function (file) {
+            if (file.persisted) return null;
+            var partz = file.name.split('.');
+            var ext = partz.pop();
+            if (ext === 'wav' || ext === 'flac') return;
+            console.log(file);
+            return _actions2.default.socket.upload_file({
+              folder_id: folder,
+              module: 'samplernn',
+              activity: 'train',
+              path: 'datasets',
+              filename: file.name,
+              generated: false,
+              processed: false,
+              datatype: 'audio',
+              ttl: 60000
+            });
+          }).concat(a);
+        }, []).filter(function (a) {
+          return !!a;
+        });
         break;
       default:
         break;
     }
+    console.log(promises);
     return Promise.all(promises).then(function (data) {
       console.log(data);
     }).catch(function (e) {
@@ -6602,6 +6628,7 @@ exports.syscall_async = undefined;
 exports.run_system_command = run_system_command;
 exports.list_directory = list_directory;
 exports.run_script = run_script;
+exports.upload_file = upload_file;
 
 var _v = __webpack_require__(/*! uuid/v1 */ "./node_modules/uuid/v1.js");
 
@@ -6622,9 +6649,13 @@ function list_directory(opt) {
 function run_script(opt) {
   return syscall_async('run_script', opt);
 }
+function upload_file(opt) {
+  return syscall_async('upload_file', opt);
+}
 var syscall_async = exports.syscall_async = function syscall_async(tag, payload) {
   var ttl = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 10000;
 
+  ttl = payload.ttl || ttl;
   return new Promise(function (resolve, reject) {
     var uuid = (0, _v2.default)();
     var timeout = setTimeout(function () {