summaryrefslogtreecommitdiff
path: root/app/client/modules/samplernn
diff options
context:
space:
mode:
Diffstat (limited to 'app/client/modules/samplernn')
-rw-r--r--app/client/modules/samplernn/samplernn.actions.js17
-rw-r--r--app/client/modules/samplernn/samplernn.reducer.js13
-rw-r--r--app/client/modules/samplernn/views/samplernn.show.js1
3 files changed, 10 insertions, 21 deletions
diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index e9248c0..d0fda31 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -9,11 +9,12 @@ import actions from '../../actions'
import { allProgress } from '../../util'
+import samplernnModule from './samplernn.module'
+
export const load_directories = (id) => (dispatch) => {
- const module = 'samplernn'
+ const module = samplernnModule.name
allProgress([
datasetLoader.load(module),
- actions.task.index({ module }),
actions.socket.list_directory({ module, dir: 'datasets' }),
actions.socket.list_directory({ module, dir: 'results' }),
actions.socket.list_directory({ module, dir: 'output' }),
@@ -23,7 +24,7 @@ export const load_directories = (id) => (dispatch) => {
dispatch({ type: types.app.load_progress, progress: { i, n }})
}).then(res => {
// console.log(res)
- const [datasetApiReport, tasks, datasets, results, output, datasetUsage, lossReport] = res
+ const [datasetApiReport, datasets, results, output, datasetUsage, lossReport] = res
const {
folderLookup,
@@ -108,10 +109,12 @@ export const load_directories = (id) => (dispatch) => {
},
})
if (id) {
- console.log('folder id', id)
dispatch({
- type: types.samplernn.set_folder,
- folder_id: id,
+ type: types.dataset.set_folder,
+ data: {
+ folder_id: id,
+ module
+ },
})
}
}).catch(e => {
@@ -205,5 +208,3 @@ export const import_files = (state, datasetLookup, fileLookup) => (dispatch) =>
console.error(e)
})
}
-
-export const set_folder = (folder) => { types.samplernn.set_folder, folder }
diff --git a/app/client/modules/samplernn/samplernn.reducer.js b/app/client/modules/samplernn/samplernn.reducer.js
index 1efbc90..ce3a549 100644
--- a/app/client/modules/samplernn/samplernn.reducer.js
+++ b/app/client/modules/samplernn/samplernn.reducer.js
@@ -18,25 +18,12 @@ const samplernnReducer = (state = samplernnInitialState, action) => {
}
switch(action.type) {
-
- case types.samplernn.set_folder:
- return {
- ...state,
- folder_id: action.folder_id,
- }
-
case types.samplernn.load_loss:
return {
...state,
lossReport: action.lossReport,
}
- case types.app.load_progress:
- return {
- ...state,
- progress: action.progress
- }
-
default:
return state
}
diff --git a/app/client/modules/samplernn/views/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js
index 98314f9..f44deda 100644
--- a/app/client/modules/samplernn/views/samplernn.show.js
+++ b/app/client/modules/samplernn/views/samplernn.show.js
@@ -30,6 +30,7 @@ class SampleRNNShow extends Component {
if (id) {
if (parseInt(id)) localStorage.setItem('samplernn.last_id', id)
if (! samplernn.folder || samplernn.folder.id !== id) {
+ console.log('looooooooooad', id)
actions.load_directories(id)
}
}