5 files changed, 22 insertions, 9 deletions
diff --git a/app/client/common/fileList.component.js b/app/client/common/fileList.component.js
index 80de6b2..7508885 100644
--- a/app/client/common/fileList.component.js
+++ b/app/client/common/fileList.component.js
@@ -11,7 +11,7 @@ export const FileList = props => {
   const {
     files,
     fields, sort, title,
-    linkFiles, onClick,
+    linkFiles, onClick, onDelete,
     orderBy='name asc',
     className='',
     fileListClassName='filelist',
@@ -27,7 +27,8 @@ export const FileList = props => {
         file={pair[1]}
         fields={fieldSet(fields)}
         className={rowClassName}
-        linkFiles
+        linkFiles={linkFiles}
+        onDelete={onDelete}
         onClick={onClick}
       />
     })
@@ -66,7 +67,7 @@ export const fieldSet = fields => {
 }
 
 export const FileRow = props => {
-  const { file, linkFiles, onClick, className='row file', username='' } = props
+  const { file, linkFiles, onDelete, onClick, className='row file', username='' } = props
   const fields = fieldSet(props.fields)
 
   const size = util.hush_size(file.size)
@@ -109,6 +110,9 @@ export const FileRow = props => {
           {fields.has('module') && file.module}
         </div>
       }
+      {fields.has('delete') && onDelete && file.id &&
+        <div className='delete' onClick={(e) => onDelete(file)}>x</div>
+      }
       {props.options && props.options(file)}
     </div>
   )
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 96d615b..50e7d59 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -4,6 +4,7 @@ import { connect } from 'react-redux'
 import * as util from '../../util'
 
 import * as samplernnActions from './samplernn.actions'
+import actions from '../../actions'
 
 import DatasetForm from '../../dataset/dataset.form'
 import NewDatasetForm from '../../dataset/dataset.new'
@@ -59,6 +60,12 @@ class SampleRNNDatasets extends Component {
       </div>
     )
   }
+  onDeleteFile(file){
+    const yes = confirm('Are you sure you want to delete this file?')
+    if (yes) {
+      actions.file.destroy(file)
+    }
+  }
   render(){
     const { samplernn, folder, match, history } = this.props
     if (samplernn.loading) {
@@ -100,8 +107,10 @@ class SampleRNNDatasets extends Component {
                 className='input_files'
                 fileListClassName=''
                 rowClassName='input_file'
+                fields={'name date size delete'}
                 options={this.fileOptions}
                 onClick={onPickFile}
+                onDelete={(file) => this.onDeleteFile(file)}
               />
             }
           </div>
@@ -125,6 +134,7 @@ class SampleRNNDatasets extends Component {
                 orderBy='epoch desc'
                 fields={'name date epoch size'}
                 onPickFile={onPickFile}
+                onDelete={(file) => this.onDeleteFile(file)}
               />
             }
           </div>
diff --git a/app/client/system/system.reducer.js b/app/client/system/system.reducer.js
index c20bf93..132923b 100644
--- a/app/client/system/system.reducer.js
+++ b/app/client/system/system.reducer.js
@@ -175,10 +175,10 @@ const systemReducer = (state = systemInitialState, action) => {
         stderr: "",
       }
     case types.task.task_finish:
-      if (state.runner.cpu.task.uuid === action.task.uuid) {
+      if (action.task === 'cpu' || state.runner.cpu.task.uuid === action.task.uuid) {
         processor = 'cpu'
       }
-      else if (state.runner.gpu.task.uuid === action.task.uuid) {
+      else if (action.task === 'gpu' || state.runner.gpu.task.uuid === action.task.uuid) {
         processor = 'gpu'
       } else {
         processor = null
diff --git a/app/server/site.js b/app/server/site.js
index 30c19f3..dda39da 100644
--- a/app/server/site.js
+++ b/app/server/site.js
@@ -51,10 +51,10 @@ app.post('/api/folder/:id/upload/',
             reject(err)
           },
           success: function(url, filename){
-            console.log("file >", url)
+            console.log("file >", filename, url)
             var data = {
               folder_id: req.params.id,
-              name: filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_'),
+              name: filename,
               url,
               size: file.size,
               datatype: file.mimetype.split('/')[0],
diff --git a/app/server/util/upload.js b/app/server/util/upload.js
index 6871be6..205a90b 100644
--- a/app/server/util/upload.js
+++ b/app/server/util/upload.js
@@ -44,8 +44,7 @@ module.exports.put = function (opt) {
     filename = uuid() + "." + extension;
   }
 
-  filename = filename.replace(/[- ]/, '_').replace(/_+/, '_')
-  
+  filename = filename.replace(/-/g,'_').replace(/\s/g,'_').replace(/_+/g,'_')
   var remote_path = opt.dirname + filename
 
   if (types && ! extension) {