diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-06-01 04:48:34 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-06-01 04:48:34 +0200 |
| commit | eba0237384836a66a2895e44636739bc47a5943a (patch) | |
| tree | 412549f8a31d9ad4ceb5498a125e6da52e1f3f4c /app/client | |
| parent | 3824c7b35dfa6ef74d396c54306afbbb6d557fe0 (diff) | |
script output coming back clceanly
Diffstat (limited to 'app/client')
| -rw-r--r-- | app/client/modules/samplernn/samplernn.actions.js | 8 | ||||
| -rw-r--r-- | app/client/socket/socket.actions.js | 6 | ||||
| -rw-r--r-- | app/client/socket/socket.system.js | 8 |
3 files changed, 14 insertions, 8 deletions
diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js index 5bf8a37..8338c82 100644 --- a/app/client/modules/samplernn/samplernn.actions.js +++ b/app/client/modules/samplernn/samplernn.actions.js @@ -13,13 +13,15 @@ export const load_directories = () => (dispatch) => { actions.task.index({ module: 'samplernn' }), actions.socket.list_directory({ module: 'samplernn', dir: 'results' }), actions.socket.list_directory({ module: 'samplernn', dir: 'datasets' }), + actions.socket.run_script({ module: 'samplernn', activity: 'report' }) ]).then(res => { console.log(res) - const [folders, files, results, datasets] = res - console.log(folders.length, files.length, results.length, datasets.length) + const [folders, files, tasks, results, datasets, report] = res + console.log(folders.length, files.length, tasks.length, results.length, datasets.length) + console.log(report) dispatch({ type: types.samplernn.init, - data: { folders, files, results, datasets }, + data: { folders, files, results, datasets, report }, }) }) } diff --git a/app/client/socket/socket.actions.js b/app/client/socket/socket.actions.js index a2162ac..b1f13ef 100644 --- a/app/client/socket/socket.actions.js +++ b/app/client/socket/socket.actions.js @@ -1,7 +1,9 @@ import { list_directory_async, - run_system_command_async + run_system_command_async, + run_script_async, } from './socket.system' export const list_directory = list_directory_async -export const run_system_command = run_system_command_async
\ No newline at end of file +export const run_system_command = run_system_command_async +export const run_script = run_script_async
\ No newline at end of file diff --git a/app/client/socket/socket.system.js b/app/client/socket/socket.system.js index ad9e8ac..5c1e294 100644 --- a/app/client/socket/socket.system.js +++ b/app/client/socket/socket.system.js @@ -58,13 +58,15 @@ export function list_directory(opt) { }) } +export function run_system_command_async(opt) { + return syscall_async('run_system_command', opt) +} export function list_directory_async(opt) { return syscall_async('list_directory', opt).then(res => res.files) } -export function run_system_command_async(opt) { - return syscall_async('run_system_command', opt) +export function run_script_async(opt) { + return syscall_async('run_script', opt) } - export const syscall_async = (tag, payload, ttl=10000) => { return new Promise( (resolve, reject) => { const uuid = uuidv1() |
