morph task structure

3 files changed, 10 insertions, 15 deletions

diff --git a/app/client/modules/morph/morph.tasks.js b/app/client/modules/morph/morph.tasks.js
index ad88fc0..ba0f6b9 100644
--- a/app/client/modules/morph/morph.tasks.js
+++ b/app/client/modules/morph/morph.tasks.js
@@ -13,10 +13,7 @@ export const morph_task = (state, folder) => dispatch => {
     activity: 'morph',
     dataset: state.a,
     folder_id: folder.id,
-    opt: {
-      ...state,
-      dataset_module: 'pix2pihd',
-    },
+    opt: state,
   }
   return actions.queue.add_task(task)
 }
diff --git a/app/client/modules/morph/views/morph.app.js b/app/client/modules/morph/views/morph.app.js
index e1480ba..c135973 100644
--- a/app/client/modules/morph/views/morph.app.js
+++ b/app/client/modules/morph/views/morph.app.js
@@ -21,6 +21,7 @@ class MorphResults extends Component {
   constructor(props){
     super()
     this.state = {
+      dataset_module: 'pix2pihd',
       a: "",
       b: "",
       a_offset: 0,
diff --git a/app/relay/modules/morph.js b/app/relay/modules/morph.js
index e09f5ca..793a270 100644
--- a/app/relay/modules/morph.js
+++ b/app/relay/modules/morph.js
@@ -9,13 +9,14 @@ const morph = {
   script: 'test.pl',
   params: (task) => {
     let params = [
-      '--first', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.a)
-      '--second', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.b)
+      '--first', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.a),
+      '--second', path.join(cwd, '..', task.opt.dataset_module, 'sequences', task.opt.b),
       '--a-offset', task.opt.a_offset,
       '--b-offset', task.opt.b_offset,
       '--steps', task.opt.steps,
       '--dilate', task.opt.dilate,
-      '--video-out', ['morph', task.opt.mode, task.opt.dataset, moment().format('%YYYY%MM%DD_%hh%mm')].join('_') + '.mp4'
+      '--video-out', ['morph', task.opt.mode, task.opt.dataset, moment().format('%YYYY%MM%DD_%hh%mm')].join('_') + '.mp4',
+      '--endpoint', process.env.API_REMOTE + '/api/folder/' + task.folder_id + '/upload/',
     ]
     if (task.opt.mode === 'average') {
       params.push('--average-videos')
@@ -24,15 +25,11 @@ const morph = {
       params.push('--mix-videos')
       params.push('True')
     }
-    return params
-  }
-
-  },
-  listen: (task, line, i) => {
-    if ( (parseInt(line) % 10) === 0) {
-      return { type: 'epoch', task, epoch: (i/10)|0 }
+    if (task.opt.smooth) {
+      params.push('--smooth')
+      params.push('True')
     }
-    return null
+    return params
   }
 }