From 2753aec805f2d9e60da1c4d463d2b2f7e15167fb Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Fri, 8 Jun 2018 02:10:27 +0200
Subject: fix p2x fetch script

---
 app/client/common/currentTask.component.js      | 2 +-
 app/client/modules/pix2pix/views/pix2pix.new.js | 2 +-
 app/relay/modules/pix2pix.js                    | 2 +-
 app/relay/runner.js                             | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/client/common/currentTask.component.js b/app/client/common/currentTask.component.js
index b5fa9f5..7dcaf83 100644
--- a/app/client/common/currentTask.component.js
+++ b/app/client/common/currentTask.component.js
@@ -8,7 +8,7 @@ import util from '../util'
 function CurrentTask ({ cpu, gpu, processor }) {
   const processor_name = processor === 'cpu' ? 'cpu' : 'gpu'
   const p = processor === 'cpu' ? cpu : gpu
-  if (!p) return null
+  if (!p) return <div></div>
   if (p.status === 'IDLE') {
     return <div>{processor_name} idle</div>
   }
diff --git a/app/client/modules/pix2pix/views/pix2pix.new.js b/app/client/modules/pix2pix/views/pix2pix.new.js
index 6699cf4..396c3a7 100644
--- a/app/client/modules/pix2pix/views/pix2pix.new.js
+++ b/app/client/modules/pix2pix/views/pix2pix.new.js
@@ -13,7 +13,7 @@ function Pix2PixNew(props){
   return (
     <Views.New
       db={props.pix2pix}
-      path='/pix2pix/datasets/'
+      path='/pix2pix/sequences/'
       actions={props.actions}
       module={pix2pixModule}
       history={props.history}
diff --git a/app/relay/modules/pix2pix.js b/app/relay/modules/pix2pix.js
index 2fa5861..520c4e8 100644
--- a/app/relay/modules/pix2pix.js
+++ b/app/relay/modules/pix2pix.js
@@ -121,6 +121,6 @@ const live = {
 export default {
   name, cwd,
   activities: {
-    combine_folds, train, generate, live,
+    fetch, combine_folds, train, generate, live,
   }
 }
diff --git a/app/relay/runner.js b/app/relay/runner.js
index 2459996..85f08ca 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -332,7 +332,9 @@ export function run_task_with_activity(task, module, activity, preempt=false, wa
 }
 
 export function start_queue(){
-  run_next_task()
+  console.log('starting queue!')
+  const res = run_next_task()
+  console.log(res)
 }
 
 export function run_next_task(){
@@ -341,6 +343,7 @@ export function run_next_task(){
     const task = queue.get_next_task()
     return run_task(task, false, true)
   }
+  return { status: 'not active' }
 }
 
 export function stop_task(task, sigkill){
-- 
cgit v1.2.3-70-g09d2