From 51d9212d97e3b326a8e9e6499bc83d27df2ef64c Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 5 Jun 2018 03:28:01 +0200
Subject: dont train images lol

---
 app/client/api/crud.upload.js                      |  2 +-
 app/client/modules/samplernn/samplernn.datasets.js |  2 +-
 app/client/modules/samplernn/samplernn.show.js     | 21 +++++++++++++--------
 app/client/modules/samplernn/samplernn.tasks.js    | 15 ++++++++++-----
 4 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'app')

diff --git a/app/client/api/crud.upload.js b/app/client/api/crud.upload.js
index bee280e..6f82d27 100644
--- a/app/client/api/crud.upload.js
+++ b/app/client/api/crud.upload.js
@@ -66,7 +66,7 @@ export function crud_upload(type, fd, data, dispatch) {
         data: parsed,
         [type]: id,
       })
-      if (parsed.files.length) {
+      if (parsed.files && parsed.files.length) {
         parsed.files.forEach(file => {
           console.log(file)
           dispatch && dispatch({
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 817e27a..96d615b 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -85,7 +85,7 @@ class SampleRNNDatasets extends Component {
     const { samplernn, folder, runner, onPickDataset, onPickFile, datasetActions } = this.props
     const { datasetLookup, fileLookup } = samplernn.data
     const { mapFn, sortFn } = util.sort.orderByFn('date desc')
-    const moduleOnGPU = runner.gpu.task && runner.gpu.task.module === samplernnModule.name
+    const moduleOnGPU = runner && runner.gpu.task && runner.gpu.task.module === samplernnModule.name
     const datasets = folder.datasets.map(name => datasetLookup[name]).map(mapFn).sort(sortFn).map(pair => {
       const dataset = pair[1]
       const isProcessing = moduleOnGPU && runner.gpu.task.dataset === dataset
diff --git a/app/client/modules/samplernn/samplernn.show.js b/app/client/modules/samplernn/samplernn.show.js
index f6ce179..8b6f357 100644
--- a/app/client/modules/samplernn/samplernn.show.js
+++ b/app/client/modules/samplernn/samplernn.show.js
@@ -57,23 +57,27 @@ class SampleRNNShow extends Component {
     )
   }
   datasetActions(dataset){
-    const actions = this.props.actions.samplernn
+    const { samplernn, remote } = this.props
+    const { fileLookup } = samplernn.data
+    const input = fileLookup[dataset.input[0]]
+    if (! input) return null
+    if (input.name.match(/(gif|jpe?g|png)$/i)) return null
     return (
       <div>
         <div class={'actions'}>
-          <span class='link' onClick={() => samplernnTasks.train_task(dataset, 1)}>train</span>
-          <span class='link' onClick={() => samplernnTasks.train_task(dataset, 2)}>2x</span>
-          <span class='link' onClick={() => samplernnTasks.train_task(dataset, 4)}>4x</span>
-          <span class='link' onClick={() => samplernnTasks.train_task(dataset, 6)}>6x</span>
-          <span class='link' onClick={() => samplernnTasks.train_task(dataset, 18)}>18x</span>
+          <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>
         </div>
         {dataset.isBuilt
         ? <div class='subtext'>
             {'fetched '}
-            <span class='link' onClick={() => samplernnTasks.clear_cache_task(dataset)}>rm</span>
+            <span class='link' onClick={() => remote.clear_cache_task(dataset)}>rm</span>
           </div>
         : <div class='subtext'>
-            <span class='link' onClick={() => samplernnTasks.fetch_task(dataset)}>fetch</span>
+            <span class='link' onClick={() => remote.fetch_task(input.url)}>fetch</span>
           </div>
         }
       </div>
@@ -91,6 +95,7 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
   actions: bindActionCreators(samplernnActions, dispatch),
+  remote: bindActionCreators(samplernnTasks, dispatch),
   audioPlayer: bindActionCreators(audioPlayerActions, dispatch),
 })
 
diff --git a/app/client/modules/samplernn/samplernn.tasks.js b/app/client/modules/samplernn/samplernn.tasks.js
index ca61ba7..28354d7 100644
--- a/app/client/modules/samplernn/samplernn.tasks.js
+++ b/app/client/modules/samplernn/samplernn.tasks.js
@@ -9,7 +9,7 @@ export const train_task = (dataset, epochs=1) => dispatch => {
   const task = {
     module: 'samplernn',
     activity: 'train',
-    dataset: dataset,
+    dataset: dataset.name,
     epochs: epochs,
     opt: {
       sample_length: 44100 * 5,
@@ -17,13 +17,18 @@ export const train_task = (dataset, epochs=1) => dispatch => {
       keep_old_checkpoints: false,
     }
   }
+  console.log(task)
   return actions.queue.add_task(task)
 }
-export const fetch_task = (dataset) => dispatch => {
+export const fetch_task = (url) => dispatch => {
+  if (! url) return console.log('input file inaccessible (no url)')
   const task = {
     module: 'samplernn',
     activity: 'fetch',
-    dataset: dataset,
+    dataset: name,
+    opt: {
+      url: url,
+    }
   }
   return actions.queue.add_task(task)
 }
@@ -31,7 +36,7 @@ export const log_task = (dataset) => dispatch => {
   const task = {
     module: 'samplernn',
     activity: 'log',
-    dataset: dataset,
+    dataset: dataset.name,
   }
   return actions.queue.add_task(task)
 }
@@ -39,7 +44,7 @@ export const clear_cache_task = (dataset) => dispatch => {
   const task = {
     module: 'samplernn',
     activity: 'clear_cache',
-    dataset: dataset,
+    dataset: dataset.name,
   }
   return actions.queue.add_task(task)
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2