diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/client/dataset/dataset.reducer.js | 1 | ||||
| -rw-r--r-- | app/client/modules/morph/morph.reducer.js | 7 | ||||
| -rw-r--r-- | app/client/modules/morph/views/morph.app.js | 2 | ||||
| -rw-r--r-- | app/relay/modules/morph.js | 3 | ||||
| -rw-r--r-- | app/server/bridge.js | 20 | ||||
| -rw-r--r-- | app/server/site.js | 14 |
6 files changed, 10 insertions, 37 deletions
diff --git a/app/client/dataset/dataset.reducer.js b/app/client/dataset/dataset.reducer.js index f536960..10b4a94 100644 --- a/app/client/dataset/dataset.reducer.js +++ b/app/client/dataset/dataset.reducer.js @@ -65,6 +65,7 @@ const datasetReducer = (state = datasetInitialState(), action) => { function handleFileCreate(state, action){ console.log(action.data) + if (! state.data || !state.data.datasetLookup) return state let dataset, old_dataset, folder, old_folder let dataset_name if (action.data.dataset) { diff --git a/app/client/modules/morph/morph.reducer.js b/app/client/modules/morph/morph.reducer.js index 99e2001..5c46a4e 100644 --- a/app/client/modules/morph/morph.reducer.js +++ b/app/client/modules/morph/morph.reducer.js @@ -16,16 +16,13 @@ const morphReducer = (state = morphInitialState, action) => { } switch (action.type) { - case types.morph.load_results: - return { - ...state, - results: action.results, - } case types.morph.load: console.log('morph load', action.app) return { ...state, app: action.app, + loading: false, + data: action.data, } case types.file.create: console.log(action) diff --git a/app/client/modules/morph/views/morph.app.js b/app/client/modules/morph/views/morph.app.js index 5848616..1385e98 100644 --- a/app/client/modules/morph/views/morph.app.js +++ b/app/client/modules/morph/views/morph.app.js @@ -102,7 +102,7 @@ class MorphResults extends Component { <Select title={"Mode"} value={this.state.mode} - options={['mix', 'average']} + options={['mix', 'average', 'mix_images']} onChange={key => this.setState({ mode: key })} /> <Slider diff --git a/app/relay/modules/morph.js b/app/relay/modules/morph.js index 40223f3..04583a6 100644 --- a/app/relay/modules/morph.js +++ b/app/relay/modules/morph.js @@ -29,6 +29,9 @@ const morph = { if (task.opt.mode === 'average') { params.push('--average-videos') params.push('True') + } else if (task.opt.mode === 'mix_images') { + params.push('--mix-images') + params.push('True') } else { params.push('--mix-videos') params.push('True') diff --git a/app/server/bridge.js b/app/server/bridge.js index 9eba844..10bffb8 100644 --- a/app/server/bridge.js +++ b/app/server/bridge.js @@ -75,23 +75,9 @@ function bind_relay(socket) { }) // // data responses from the server, telling us that files, folders, etc were created - // socket.on('data_res', data => { - // if (EXPRESS_CONNECTS_TO_RELAY) return - // switch (data.type) { - // case 'file_create': - // // certain files should be persisted in the database... - // db.models.file.create(data.data).then(file => { - // client.emit('data_res', { - // type: 'file_create', - // data: file, - // }) - // }) - // break - // default: - // client.emit('data_res', data) - // break - // } - // }) + socket.on('api_res', data => { + client.emit('api_res', data) + }) // image frames generated by pix2pix socket.on('frame', (data) => { diff --git a/app/server/site.js b/app/server/site.js index 39919de..85c932f 100644 --- a/app/server/site.js +++ b/app/server/site.js @@ -76,20 +76,6 @@ app.post('/api/folder/:id/upload/', if (req.body.should_relay === "true" || req.body.generated === "true") { console.log('relaying...') const client = require('./bridge').client - console.log("__________\n_____________--\n") - console.log("__________\n_______asdfdsaf______--\n") - console.log("__________\n_____________--\n") - console.log(require('./bridge')) - console.log("__________\n_____________--\n") - console.log("__________\n________clieieieie_____--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log(require('./bridge').client) - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") - console.log("__________\n_____________--\n") client.emit('api_res', JSON.stringify({ type: 'create', datatype: 'file', data: db_file })) } resolve(db_file) |