From ed7f7bffe3ba56f41c9473d4eaeb6826983ae5b7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 5 Jun 2018 01:58:43 +0200
Subject: upload status

---
 app/client/dataset/dataset.reducer.js              |  6 ++++++
 app/client/dataset/dataset.status.js               | 19 +++++++++++++++++++
 app/client/modules/samplernn/samplernn.datasets.js |  2 +-
 app/client/modules/samplernn/samplernn.reducer.js  |  4 ++--
 app/client/modules/samplernn/samplernn.show.js     | 21 +++++++++++++--------
 app/relay/modules/samplernn.js                     |  9 ++++++++-
 app/server/site.js                                 |  1 +
 7 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 app/client/dataset/dataset.status.js

(limited to 'app')

diff --git a/app/client/dataset/dataset.reducer.js b/app/client/dataset/dataset.reducer.js
index 801f768..40480d7 100644
--- a/app/client/dataset/dataset.reducer.js
+++ b/app/client/dataset/dataset.reducer.js
@@ -32,6 +32,12 @@ const datasetReducer = (state = datasetInitialState, action) => {
         loading: true,
         status: 'Waiting for server to finish processing...',
       }
+    case types.folder.upload_complete:
+      return {
+        error: null,
+        loading: true,
+        status: 'Upload complete',
+      }
     case types.file.create_loading:
       return {
         error: null,
diff --git a/app/client/dataset/dataset.status.js b/app/client/dataset/dataset.status.js
new file mode 100644
index 0000000..9e9e56f
--- /dev/null
+++ b/app/client/dataset/dataset.status.js
@@ -0,0 +1,19 @@
+import { h, Component } from 'preact'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
+
+import Loading from '../common/loading.component'
+
+function DatasetStatus (props) {
+  return (
+    <div class='status'>
+      {props.status}
+    </div>
+  )
+}
+
+const mapStateToProps = state => state.dataset
+
+const mapDispatchToProps = (dispatch, ownProps) => ({})
+
+export default connect(mapStateToProps, mapDispatchToProps)(DatasetStatus)
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index ef1753d..817e27a 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.module === samplernnModule.name
+    const moduleOnGPU = 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.reducer.js b/app/client/modules/samplernn/samplernn.reducer.js
index 7335b21..4b4b93e 100644
--- a/app/client/modules/samplernn/samplernn.reducer.js
+++ b/app/client/modules/samplernn/samplernn.reducer.js
@@ -62,7 +62,7 @@ const samplernnReducer = (state = samplernnInitialState, action) => {
     case types.file.create:
     case types.folder.upload_complete:
       if (action.data.module === 'samplernn') {
-        console.log(action.data, state.folder)
+        console.log(action.data)
         let dataset, old_dataset, folder, old_folder
         const dataset_name = action.data.name.split('.')[0]
         if (dataset_name in state.data.datasets) {
@@ -84,7 +84,7 @@ const samplernnReducer = (state = samplernnInitialState, action) => {
         old_folder = state.data.folderLookup[action.data.folder_id]
         folder = {
           ...old_folder,
-          files: old_folder.files.concat[action.data.id]
+          files: old_folder.files.concat([action.data.id])
         }
         return {
           ...state,
diff --git a/app/client/modules/samplernn/samplernn.show.js b/app/client/modules/samplernn/samplernn.show.js
index 64ccd34..f6ce179 100644
--- a/app/client/modules/samplernn/samplernn.show.js
+++ b/app/client/modules/samplernn/samplernn.show.js
@@ -4,11 +4,13 @@ import { connect } from 'react-redux'
 import * as util from '../../util'
 
 import * as samplernnActions from './samplernn.actions'
+import * as samplernnTasks from './samplernn.tasks'
 import * as audioPlayerActions from '../../common/audioPlayer/audioPlayer.actions'
 
 import Loading from '../../common/loading.component'
 import DatasetForm from '../../dataset/dataset.form'
 import NewDatasetForm from '../../dataset/dataset.new'
+import DatasetStatus from '../../dataset/dataset.status'
 import { FileList, FileRow } from '../../common/fileList.component'
 
 import SampleRNNDatasets from './samplernn.datasets'
@@ -26,7 +28,10 @@ class SampleRNNShow extends Component {
     return (
       <div className='app'>
         <div class='heading'>
-          <h1>{folder ? folder.name : <Loading />}</h1>
+          <div class='spaced'>
+            <h1>{folder ? folder.name : <Loading />}</h1>
+            <DatasetStatus />
+          </div>
         </div>
         {folder && folder.name && folder.name !== 'unsorted' &&
           <DatasetForm
@@ -56,19 +61,19 @@ class SampleRNNShow extends Component {
     return (
       <div>
         <div class={'actions'}>
-          <span class='link' onClick={() => actions.train_task(dataset, 1)}>train</span>
-          <span class='link' onClick={() => actions.train_task(dataset, 2)}>2x</span>
-          <span class='link' onClick={() => actions.train_task(dataset, 4)}>4x</span>
-          <span class='link' onClick={() => actions.train_task(dataset, 6)}>6x</span>
-          <span class='link' onClick={() => actions.train_task(dataset, 18)}>18x</span>
+          <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>
         </div>
         {dataset.isBuilt
         ? <div class='subtext'>
             {'fetched '}
-            <span class='link' onClick={() => actions.clear_cache_task(dataset)}>rm</span>
+            <span class='link' onClick={() => samplernnTasks.clear_cache_task(dataset)}>rm</span>
           </div>
         : <div class='subtext'>
-            <span class='link' onClick={() => actions.fetch_task(dataset)}>fetch</span>
+            <span class='link' onClick={() => samplernnTasks.fetch_task(dataset)}>fetch</span>
           </div>
         }
       </div>
diff --git a/app/relay/modules/samplernn.js b/app/relay/modules/samplernn.js
index 64a6b88..bdbe602 100644
--- a/app/relay/modules/samplernn.js
+++ b/app/relay/modules/samplernn.js
@@ -56,6 +56,13 @@ const publish = {
     return ['-l', task.dataset]
   }
 }
+const clear_cache = {
+  type: 'perl',
+  script: 'clear_cache.pl',
+  params: (task) => {
+    return ['-l', task.dataset]
+  }
+}
 const report = {
   type: 'perl',
   script: 'latest.pl',
@@ -66,6 +73,6 @@ const report = {
 export default {
   name, cwd,
   activities: {
-    fetch, train, generate, report,
+    fetch, train, generate, publish, clear_cache, report,
   },
 }
diff --git a/app/server/site.js b/app/server/site.js
index aa7087c..30c19f3 100644
--- a/app/server/site.js
+++ b/app/server/site.js
@@ -67,6 +67,7 @@ app.post('/api/folder/:id/upload/',
             }
 
             api_files.create(data).then( (db_file) => {
+              console.log(db_file)
               resolve(db_file)
             }).catch( (err) => {
               console.warn(err)
-- 
cgit v1.2.3-70-g09d2