fix p2x fetch script

1 files changed, 141 insertions, 135 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 1941d68..616dfff 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -4452,6 +4452,7 @@ var fetchURL = exports.fetchURL = function fetchURL(module, folder, url) {
       console.log('media', media);
       _actions2.default.file.create({
         folder_id: folder.id,
+        name: (media.title || "").replace(/\.[^.]+$/g, '').replace(/[^a-zA-Z0-9_]/g, '_').replace(/\s+/g, '_').replace(/_+/g, '_'),
         module: module.name,
         dataset: media.token,
         activity: 'url',
@@ -5175,154 +5176,156 @@ var datasetReducer = function datasetReducer() {
       });
 
     case _types2.default.folder.create:
-      if (action.data.module === 'samplernn') {
-        return _extends({}, state, {
-          loading: false,
-          data: {
-            folders: state.data.folders.concat([action.data.id]),
-            folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.id, action.data))
-          }
-        });
-      }
+      return _extends({}, state, {
+        loading: false,
+        data: {
+          folders: state.data.folders.concat([action.data.id]),
+          folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.id, action.data))
+        }
+      });
       return state;
 
     case _types2.default.file.create:
-      if (action.data.module === 'samplernn') {
-        console.log(action.data);
-        var dataset = void 0,
-            old_dataset = void 0,
-            folder = void 0,
-            old_folder = void 0;
-        var dataset_name = void 0;
-        if (action.data.dataset) {
-          dataset_name = action.data.dataset;
-        } else if (action.data.name) {
-          dataset_name = action.data.name.split('.')[0];
-        } else if (action.data.url) {
-          dataset_name = action.data.url;
-        } else {
-          dataset_name = null;
-        }
-        if (dataset_name in state.data.datasetLookup) {
-          old_dataset = state.data.datasetLookup[dataset_name];
-          dataset = _extends({}, old_dataset, {
-            input: action.data.generated ? old_dataset.input : [action.data.id].concat(old_dataset.input),
-            output: !action.data.generated ? old_dataset.output : [action.data.id].concat(old_dataset.output)
-          });
-        } else {
-          console.log(action.data.created_at, action.data.date);
-          dataset = {
-            name: dataset_name,
-            date: action.data.created_at || action.data.date,
-            input: action.data.generated ? [] : [action.data.id],
-            checkpoints: [],
-            output: !action.data.generated ? [] : [action.data.id]
-          };
-        }
-        old_folder = state.data.folderLookup[action.data.folder_id];
-        folder = _extends({}, old_folder, {
-          datasets: old_folder.datasets.concat([dataset_name]),
-          files: old_folder.files.concat([action.data.id])
-        });
-        return _extends({}, state, {
-          loading: false,
-          data: _extends({}, state.data, {
-            files: state.data.files.concat([action.data.id]),
-            folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.folder_id, folder)),
-            fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)),
-            datasetLookup: _extends({}, state.data.datasetLookup, _defineProperty({}, dataset_name, dataset))
-          })
-        });
-      }
-      return state;
+      return handleFileCreate(state, action);
 
     case _types2.default.file.update:
-      if (action.data.module === 'samplernn') {
-        var _extends6;
-
-        var _old_dataset = void 0;
-        var new_dataset = state.data.datasetLookup[action.data.dataset];
-        var old_file = state.data.fileLookup[action.data.id];
-        var new_dataset_update = void 0;
-        if (old_file && action.data.dataset !== old_file.dataset) {
-          if (state.data.datasetLookup[old_file.dataset]) {
-            _old_dataset = state.data.datasetLookup[old_file.dataset];
-            old_dataset_update = _extends({}, _old_dataset, {
-              input: _old_dataset.input.filter(function (id) {
-                return id !== action.data.id;
-              }),
-              output: _old_dataset.output.filter(function (id) {
-                return id !== action.data.id;
-              })
-            });
-          }
-          new_dataset_update = _extends({}, new_dataset, {
-            input: action.data.generated ? [] : [action.data.id],
-            output: !action.data.generated ? [] : [action.data.id]
-          });
-        }
-        console.log('old_dataset', old_dataset_update.name);
-        console.log('new_dataset', new_dataset_update.name);
-        return _extends({}, state, {
-          loading: false,
-          data: _extends({}, state.data, {
-            datasetLookup: _old_dataset ? _extends({}, state.data.datasetLookup, (_extends6 = {}, _defineProperty(_extends6, _old_dataset.name, old_dataset_update), _defineProperty(_extends6, new_dataset.name, new_dataset_update), _extends6)) : new_dataset_update ? _extends({}, state.data.datasetLookup, _defineProperty({}, new_dataset.name, new_dataset_update)) : state.data.datasetLookup,
-            fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data))
-          })
-        });
-      }
-      return state;
+      return handleFileUpdate(state, action);
 
     case _types2.default.file.destroy:
-      if (action.data.module === 'samplernn') {
-        // delete the key from fileLookup
-        var fileLookup = _extends({}, state.data.fileLookup);
-        var datasetLookup = _extends({}, state.data.datasetLookup);
-        var folderLookup = _extends({}, state.data.folderLookup);
-        var _old_file = fileLookup[action.data.id];
-        if (!_old_file) return state;
-        var _old_dataset2 = state.data.datasetLookup[_old_file.dataset];
-        var _dataset = void 0;
-        if (_old_dataset2) {
-          _dataset = _extends({}, _old_dataset2, {
-            input: _old_dataset2.input.filter(function (id) {
-              return id !== _old_file.id;
-            }),
-            output: _old_dataset2.output.filter(function (id) {
-              return id !== _old_file.id;
-            })
-          });
-          if (!_dataset.input.length && !_dataset.checkpoints.length && !_dataset.output.length) {
-            delete datasetLookup[_old_file.dataset];
-            var _old_folder = folderLookup[_old_file.folder_id];
-            folderLookup[_old_file.folder_id] = _extends({}, _old_folder, {
-              datasets: _old_folder.datasets.filter(function (name) {
-                return name !== _old_file.dataset;
-              })
-            });
-          } else {
-            console.log('dataset just needs sweeping');
-            datasetLookup[_old_file.dataset] = _dataset;
-          }
-        }
-        delete fileLookup[_old_file.id];
-
-        return _extends({}, state, {
-          loading: false,
-          data: _extends({}, state.data, {
-            folderLookup: folderLookup,
-            fileLookup: fileLookup,
-            datasetLookup: datasetLookup
-          })
-        });
-      }
-      return state;
+      return handleFileDestroy(state, action);
 
     default:
       return state;
   }
 };
 
+function handleFileCreate(state, action) {
+  console.log(action.data);
+  var dataset = void 0,
+      old_dataset = void 0,
+      folder = void 0,
+      old_folder = void 0;
+  var dataset_name = void 0;
+  if (action.data.dataset) {
+    dataset_name = action.data.dataset;
+  } else if (action.data.name) {
+    dataset_name = action.data.name.split('.')[0];
+  } else if (action.data.url) {
+    dataset_name = action.data.url;
+  } else {
+    dataset_name = null;
+  }
+  if (dataset_name in state.data.datasetLookup) {
+    old_dataset = state.data.datasetLookup[dataset_name];
+    dataset = _extends({}, old_dataset, {
+      input: action.data.generated ? old_dataset.input : [action.data.id].concat(old_dataset.input),
+      output: !action.data.generated ? old_dataset.output : [action.data.id].concat(old_dataset.output)
+    });
+  } else {
+    console.log(action.data.created_at, action.data.date);
+    dataset = {
+      name: dataset_name,
+      date: action.data.created_at || action.data.date,
+      input: action.data.generated ? [] : [action.data.id],
+      checkpoints: [],
+      output: !action.data.generated ? [] : [action.data.id]
+    };
+  }
+  old_folder = state.data.folderLookup[action.data.folder_id];
+  folder = _extends({}, old_folder, {
+    datasets: old_folder.datasets.concat([dataset_name]),
+    files: old_folder.files.concat([action.data.id])
+  });
+  return _extends({}, state, {
+    loading: false,
+    data: _extends({}, state.data, {
+      files: state.data.files.concat([action.data.id]),
+      folderLookup: _extends({}, state.data.folderLookup, _defineProperty({}, action.data.folder_id, folder)),
+      fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data)),
+      datasetLookup: _extends({}, state.data.datasetLookup, _defineProperty({}, dataset_name, dataset))
+    })
+  });
+}
+
+function handleFileUpdate(state, action) {
+  var _extends6;
+
+  var old_dataset = void 0;
+  var new_dataset = state.data.datasetLookup[action.data.dataset];
+  var old_file = state.data.fileLookup[action.data.id];
+  var new_dataset_update = void 0;
+  if (old_file && action.data.dataset !== old_file.dataset) {
+    if (state.data.datasetLookup[old_file.dataset]) {
+      old_dataset = state.data.datasetLookup[old_file.dataset];
+      old_dataset_update = _extends({}, old_dataset, {
+        input: old_dataset.input.filter(function (id) {
+          return id !== action.data.id;
+        }),
+        output: old_dataset.output.filter(function (id) {
+          return id !== action.data.id;
+        })
+      });
+    }
+    new_dataset_update = _extends({}, new_dataset, {
+      input: action.data.generated ? [] : [action.data.id],
+      output: !action.data.generated ? [] : [action.data.id]
+    });
+  }
+  console.log('old_dataset', old_dataset_update.name);
+  console.log('new_dataset', new_dataset_update.name);
+  return _extends({}, state, {
+    loading: false,
+    data: _extends({}, state.data, {
+      datasetLookup: old_dataset ? _extends({}, state.data.datasetLookup, (_extends6 = {}, _defineProperty(_extends6, old_dataset.name, old_dataset_update), _defineProperty(_extends6, new_dataset.name, new_dataset_update), _extends6)) : new_dataset_update ? _extends({}, state.data.datasetLookup, _defineProperty({}, new_dataset.name, new_dataset_update)) : state.data.datasetLookup,
+      fileLookup: _extends({}, state.data.fileLookup, _defineProperty({}, action.data.id, action.data))
+    })
+  });
+  return state;
+}
+
+function handleFileDestroy(state, action) {
+  // delete the key from fileLookup
+  var fileLookup = _extends({}, state.data.fileLookup);
+  var datasetLookup = _extends({}, state.data.datasetLookup);
+  var folderLookup = _extends({}, state.data.folderLookup);
+  var old_file = fileLookup[action.data.id];
+  if (!old_file) return state;
+  var old_dataset = state.data.datasetLookup[old_file.dataset];
+  var dataset = void 0;
+  if (old_dataset) {
+    dataset = _extends({}, old_dataset, {
+      input: old_dataset.input.filter(function (id) {
+        return id !== old_file.id;
+      }),
+      output: old_dataset.output.filter(function (id) {
+        return id !== old_file.id;
+      })
+    });
+    if (!dataset.input.length && !dataset.checkpoints.length && !dataset.output.length) {
+      delete datasetLookup[old_file.dataset];
+      var old_folder = folderLookup[old_file.folder_id];
+      folderLookup[old_file.folder_id] = _extends({}, old_folder, {
+        datasets: old_folder.datasets.filter(function (name) {
+          return name !== old_file.dataset;
+        })
+      });
+    } else {
+      console.log('dataset just needs sweeping');
+      datasetLookup[old_file.dataset] = dataset;
+    }
+  }
+  delete fileLookup[old_file.id];
+
+  return _extends({}, state, {
+    loading: false,
+    data: _extends({}, state.data, {
+      folderLookup: folderLookup,
+      fileLookup: fileLookup,
+      datasetLookup: datasetLookup
+    })
+  });
+}
+
 exports.default = datasetReducer;
 
 /***/ }),
@@ -6698,9 +6701,11 @@ var load_directories = exports.load_directories = function load_directories(id)
       var sequenceDirectories = sequences.filter(function (s) {
         return s.dir;
       });
+      console.log(sequenceDirectories);
       sequenceDirectories.forEach(function (dir) {
         var dataset = datasetLoader.getDataset(module, datasetLookup, dir.name);
         dataset.isBuilt = true;
+        console.log(dir.name, dataset);
       });
 
       datasets.filter(function (s) {
@@ -7660,6 +7665,7 @@ var Pix2pixShow = function (_Component) {
       var input = pix2pix.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,