From e113c29866e39c4a469a16fe7d8c03e476ddd480 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 5 Jun 2018 19:51:30 +0200
Subject: pass thru folder id

---
 app/client/modules/samplernn/samplernn.show.js  | 11 +++++------
 app/client/modules/samplernn/samplernn.tasks.js |  3 ++-
 app/relay/modules/samplernn.js                  |  2 +-
 app/relay/runner.js                             |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'app')

diff --git a/app/client/modules/samplernn/samplernn.show.js b/app/client/modules/samplernn/samplernn.show.js
index 145b784..acc7692 100644
--- a/app/client/modules/samplernn/samplernn.show.js
+++ b/app/client/modules/samplernn/samplernn.show.js
@@ -59,18 +59,17 @@ class SampleRNNShow extends Component {
   }
   datasetActions(dataset, isFetching=false, isProcessing=false){
     const { samplernn, remote } = this.props
-    const { fileLookup } = samplernn.data
     const input = fileLookup[dataset.input[0]]
     if (! input) return null
     if (input.name && input.name.match(/(gif|jpe?g|png)$/i)) return null
     return (
       <div>
         <div class={'actions'}>
-          <span class='link' onClick={() => remote.train_task(dataset, 1)}>train</span>
-          <span class='link' onClick={() => remote.train_task(dataset, 2)}>2x</span>
-          <span class='link' onClick={() => remote.train_task(dataset, 4)}>4x</span>
-          <span class='link' onClick={() => remote.train_task(dataset, 6)}>6x</span>
-          <span class='link' onClick={() => remote.train_task(dataset, 18)}>18x</span>
+          <span class='link' onClick={() => remote.train_task(dataset, samplernn.folder_id, 1)}>train</span>
+          <span class='link' onClick={() => remote.train_task(dataset, samplernn.folder_id, 2)}>2x</span>
+          <span class='link' onClick={() => remote.train_task(dataset, samplernn.folder_id, 4)}>4x</span>
+          <span class='link' onClick={() => remote.train_task(dataset, samplernn.folder_id, 6)}>6x</span>
+          <span class='link' onClick={() => remote.train_task(dataset, samplernn.folder_id, 18)}>18x</span>
         </div>
         {dataset.isBuilt
         ? <div class='subtext'>
diff --git a/app/client/modules/samplernn/samplernn.tasks.js b/app/client/modules/samplernn/samplernn.tasks.js
index 80585bd..d527254 100644
--- a/app/client/modules/samplernn/samplernn.tasks.js
+++ b/app/client/modules/samplernn/samplernn.tasks.js
@@ -5,13 +5,14 @@ import types from '../../types'
 
 import actions from '../../actions'
 
-export const train_task = (dataset, epochs=1) => dispatch => {
+export const train_task = (dataset, folder_id, epochs=1) => dispatch => {
   const task = {
     module: 'samplernn',
     activity: 'train',
     dataset: dataset.name,
     epochs: epochs,
     opt: {
+      folder_id: folder_id,
       sample_length: 44100 * 5,
       n_samples: 6,
       keep_old_checkpoints: false,
diff --git a/app/relay/modules/samplernn.js b/app/relay/modules/samplernn.js
index 73d0a5f..c4e2d7f 100644
--- a/app/relay/modules/samplernn.js
+++ b/app/relay/modules/samplernn.js
@@ -59,7 +59,7 @@ const publish = {
   type: 'perl',
   script: 'latest.pl',
   params: (task) => {
-    return ['-l', task.dataset]
+    return ['-l', task.dataset, '-e', process.env.API_REMOTE + '/api/folder/' + task.opt.folder_id + '/upload/']
   }
 }
 const clear_cache = {
diff --git a/app/relay/runner.js b/app/relay/runner.js
index 99f4a16..1fec44e 100644
--- a/app/relay/runner.js
+++ b/app/relay/runner.js
@@ -312,7 +312,7 @@ export function run_task_with_activity(task, module, activity, preempt=false, wa
 
   function finish(task_res){
     remote.emit('task_res', task_res)
-    clear_task(interpreter.gpu, task)
+    clear_task(interpreter.gpu, task_res.task)
     set_connected(false)
     // remove task from queue
     // queue.remove_task(task)
-- 
cgit v1.2.3-70-g09d2