From 2a5fcdecf400b08f782db1fbe3ef4a759d0f08f0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 24 Sep 2018 01:52:58 +0200
Subject: taskz

---
 app/client/modules/pix2pixhd/pix2pixhd.tasks.js       |  6 +++---
 app/client/modules/pix2pixhd/views/pix2pixhd.train.js | 14 +++++++-------
 app/client/modules/pix2pixhd/views/sequence.editor.js |  8 ++++----
 app/relay/modules/pix2pixhd.js                        | 17 +++++++++++++++++
 4 files changed, 31 insertions(+), 14 deletions(-)

(limited to 'app')

diff --git a/app/client/modules/pix2pixhd/pix2pixhd.tasks.js b/app/client/modules/pix2pixhd/pix2pixhd.tasks.js
index 89184d2..5d8e084 100644
--- a/app/client/modules/pix2pixhd/pix2pixhd.tasks.js
+++ b/app/client/modules/pix2pixhd/pix2pixhd.tasks.js
@@ -75,10 +75,10 @@ export const augment_task = (dataset, opt) => dispatch => {
   return actions.queue.add_task(task)
 }
 
-export const create_dataset_task = (opt) => dispatch => {
+export const splice_task = (opt) => dispatch => {
   const task = {
     module: module.name,
-    activity: 'create_dataset',
+    activity: 'splice',
     dataset: opt.title,
     folder_id: opt.folder_id,
     opt: {
@@ -86,6 +86,6 @@ export const create_dataset_task = (opt) => dispatch => {
     }
   }
   console.log(task)
-  console.log('add create_dataset task')
+  console.log('add splice task')
   return actions.queue.add_task(task)
 }
\ No newline at end of file
diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
index de32fcd..65678ae 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
@@ -30,7 +30,7 @@ class Pix2PixHDTrain extends Component {
     augment_name: '',
     augment_take: 100,
     augment_make: 20,
-    generated: false,
+    processed: false,
   }
   constructor(props){
     super(props)
@@ -59,13 +59,13 @@ class Pix2PixHDTrain extends Component {
       || (prevProps.pix2pixhd.data && prevState.dataset !== this.state.dataset)) {
       const dataset = this.props.pix2pixhd.data.datasetLookup[this.state.dataset]
       if (dataset) {
-        const generated = dataset.input
+        const processed = dataset.input
           .map(f => this.props.pix2pixhd.data.fileLookup[f])
           .reduce((a,b) => {
-            return b.generated || a
+            return b.processed || a
           }, false)
-        dataset.generated = generated
-        this.setState({ generated })
+        dataset.processed = processed
+        this.setState({ processed })
       }
     }
     if (prevState.dataset !== this.state.dataset) {
@@ -149,7 +149,7 @@ class Pix2PixHDTrain extends Component {
   renderEditor(){
     const { pix2pixhd, queue, remote } = this.props
     const { checkpoint, folder_id } = pix2pixhd
-    const { dataset, generated } = this.state
+    const { dataset, processed } = this.state
     return (
       <div>
         <Group title='Sequence Editor'>
@@ -157,7 +157,7 @@ class Pix2PixHDTrain extends Component {
             folder_id={folder_id}
             module={pix2pixhdModule}
             checkpoint={checkpoint}
-            generated={generated}
+            processed={processed}
           />
         </Group>
         <div className='columns'>
diff --git a/app/client/modules/pix2pixhd/views/sequence.editor.js b/app/client/modules/pix2pixhd/views/sequence.editor.js
index 135dfb3..7c3dc3b 100644
--- a/app/client/modules/pix2pixhd/views/sequence.editor.js
+++ b/app/client/modules/pix2pixhd/views/sequence.editor.js
@@ -60,7 +60,7 @@ class SequenceEditor extends Component {
   }
 
   render() {
-    const { app, pix2pixhd, remote, checkpoint, folder_id, generated } = this.props
+    const { app, pix2pixhd, remote, checkpoint, folder_id, processed } = this.props
     const { cursor, selection, title } = this.state
     const path = "sequences/" + checkpoint.name
     console.log(checkpoint, pix2pixhd)
@@ -82,14 +82,14 @@ class SequenceEditor extends Component {
               />
               <Button
                 title='Create a new dataset?'
-                onClick={() => remote.create_dataset_task({ title, sequence: checkpoint.name, selection, folder_id })}
+                onClick={() => remote.splice_task({ title, sequence: checkpoint.name, selection, folder_id })}
               >
                 Create
               </Button>
             </Group>
             <Group title='Salt dataset'>
-              {generated
-                ? 'Salting is only available on generated datasets.'
+              {processed
+                ? 'Salting is only available on processed datasets.'
                 : 'Salting coming soon!'}
             </Group>
           </div>
diff --git a/app/relay/modules/pix2pixhd.js b/app/relay/modules/pix2pixhd.js
index 7d3c939..a894d3e 100644
--- a/app/relay/modules/pix2pixhd.js
+++ b/app/relay/modules/pix2pixhd.js
@@ -229,6 +229,22 @@ const render_recursive = {
     ]
   }
 }
+const splice = {
+  type: 'perl',
+  script: 'splice.pl',
+  params: (task) => {
+    console.log(selection)
+    return [
+      '--dataset', task.dataset,
+      '--sequence', task.opt.sequence,
+      '--start_frame', selection.start.i,
+      '--end_frame', selection.end.i,
+      '--module', task.module,
+      '--folder_id', task.opt.folder_id,
+      '--endpoint', process.env.API_REMOTE + '/api/file/',
+    ]
+  }
+}
 
 function pad(num, size) {
   if (isNaN(parseInt(num))) return num;
@@ -249,5 +265,6 @@ export default {
     live,
     render,
     render_recursive,
+    splice,
   }
 }
-- 
cgit v1.2.3-70-g09d2