From 0db903f139aa2eb91308f99bb3be3619c2d9b217 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 5 Jun 2018 04:45:14 +0200
Subject: woooo smoother

---
 app/client/modules/samplernn/samplernn.datasets.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'app/client/modules/samplernn/samplernn.datasets.js')

diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 50e7d59..3d4219e 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -92,11 +92,19 @@ 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 moduleOnCPU = runner && runner.cpu.task && runner.cpu.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
-      const status = isProcessing ? util.gerund(runner.gpu.task.activity) : ''
+      let status = ''
+      let isProcessing = false, isFetching = false
+      if (moduleOnGPU && runner.gpu.task.dataset === dataset) {
+        status = util.gerund(runner.gpu.task.activity)
+        isProcessing = true
+      } else if (moduleOnCPU && runner.cpu.task.activity === 'fetch' && runner.cpu.task.opt.file_id === dataset.input[0]) {
+        isProcessing = true
+        isFetching = true
+      }
       return (
         <div key={dataset.name} className='row dataset' onClick={() => onPickDataset && onPickDataset(dataset)}>
           {this.props.beforeRow && this.props.beforeRow(dataset)}
@@ -114,9 +122,13 @@ class SampleRNNDatasets extends Component {
               />
             }
           </div>
-          <div className={'col quiet ' + (dataset.isBuilt ? 'built' : 'not_built')}>
+          <div className={[
+              'col', 'quiet',
+              (dataset.isBuilt ? 'built' : 'not_built'),
+              (isProcessing ? 'processing': 'not_processing')
+            ].join(' ')}>
+            {this.props.datasetActions && this.props.datasetActions(dataset, isFetching, isProcessing)}
             {status}
-            {this.props.datasetActions && this.props.datasetActions(dataset)}
           </div>
           <div className='col checkpoint'>
             {!!dataset.checkpoints.length &&
-- 
cgit v1.2.3-70-g09d2