denormalize state tree

1 files changed, 6 insertions, 7 deletions

diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index 828850e..68b13a2 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -146,10 +146,10 @@ export const load_directories = (id) => (dispatch) => {
       file.epoch = parseInt(file.epoch || pair[1].replace(/^\D+/, '')) || 0
       dataset.epoch = Math.max(file.epoch, dataset.epoch || 0)
       // here check if the file exists in dataset, if so just check that it's persisted
-      const found = dataset.output.some(f => {
+      const found = dataset.output.some(file_id => {
         // if (f.name === 
-        if (f.name === file.name) {
-          f.persisted = true
+        if (fileLookup[file_id].name === file.name) {
+          fileLookup[file_id].persisted = true
           return true
         }
         return false
@@ -208,7 +208,7 @@ export const load_loss = () => dispatch => {
   })
 }
 
-export const import_files = (state, datasetLookup) => (dispatch) => {
+export const import_files = (state, datasetLookup, fileLookup) => (dispatch) => {
   const { selected, folder, url_base, import_action } = state
   const names = Object.keys(selected).filter(k => selected[k])
   let promises
@@ -216,7 +216,7 @@ export const import_files = (state, datasetLookup) => (dispatch) => {
     case 'Hotlink':
       // in this case, create a new file for each file we see.
       promises = names.reduce((a,name) => {
-        return datasetLookup[name].output.map(file => {
+        return datasetLookup[name].output.map(id => fileLookup[id]).map(file => {
           const partz = file.name.split('.')
           const ext = partz.pop()
           return actions.file.create({
@@ -239,8 +239,7 @@ export const import_files = (state, datasetLookup) => (dispatch) => {
       break
     case 'Upload':
       promises = names.reduce((a,name) => {
-        console.log(datasetLookup[name])
-        return datasetLookup[name].input.map(file => {
+        return datasetLookup[name].input.map(id => fileLookup[id]).map(file => {
           if (file.persisted) return null
           const partz = file.name.split('.')
           const ext = partz.pop()