separate dataset stuff from samplernn stuff

5 files changed, 22 insertions, 320 deletions

diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index 2be59ed..642319d 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -96,8 +96,9 @@ export const load_directories = (id) => (dispatch) => {
     })
 
     dispatch({
-      type: types.samplernn.init,
+      type: types.dataset.load,
       data: {
+        module,
         folderLookup,
         fileLookup,
         datasetLookup,
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
deleted file mode 100644
index 921d1a2..0000000
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import { h, Component } from 'preact'
-import { bindActionCreators } from 'redux'
-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'
-import { FileList, FileRow } from '../../common/fileList.component'
-import Loading from '../../common/loading.component'
-
-import samplernnModule from './samplernn.module'
-
-class SampleRNNDatasets extends Component {
-  render(){
-    const { samplernn, folder, match, history } = this.props
-    if (samplernn.loading) {
-      return <Loading progress={samplernn.progress} />
-    }
-    if (!samplernn.data.folders.length) {
-      console.log('no folders, redirect to /new')
-      return history.push('/samplernn/new/')
-    }
-    if (!folder || !folder.name) return
-    return (
-      <div class='rows params datasets'>
-        <div class='row row-heading dataset'>
-          <div class='col'>input</div>
-          <div class='col'>status</div>
-          <div class='col'>checkpoint</div>
-          <div class='col'>output</div>
-        </div>
-        {this.renderGroups()}
-      </div>
-    )
-  }
-  renderGroups(){
-    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]
-      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)}
-          <div className='col'>
-            {!!dataset.input.length &&
-              <FileList
-                files={dataset.input.map(id => fileLookup[id])}
-                className='input_files'
-                fileListClassName=''
-                rowClassName='input_file'
-                fields={'name date size delete'}
-                onClick={onPickFile}
-                onDelete={(file) => this.onDeleteFile(file)}
-              />
-            }
-          </div>
-          <div className={[
-              'col', 'quiet',
-              (dataset.isBuilt ? 'built' : 'not_built'),
-              (isProcessing ? 'processing': 'not_processing')
-            ].join(' ')}>
-            {this.props.datasetActions && this.props.datasetActions(dataset, isFetching, isProcessing)}
-            {status}
-          </div>
-          <div className='col checkpoint'>
-            {!!dataset.checkpoints.length &&
-              <FileRow
-                file={dataset.checkpoints[0]}
-                fields={'name date epoch'}
-                className='row checkpoint'
-              />
-            }
-          </div>
-          <div className='col'>
-            {!!dataset.output.length &&
-              <FileList
-                files={dataset.output.map(id => fileLookup[id])}
-                orderBy='epoch desc'
-                fields={'name date epoch size'}
-                onPickFile={onPickFile}
-                onDelete={(file) => this.onDeleteFile(file)}
-              />
-            }
-          </div>
-          {this.props.afterRow && this.props.afterRow(dataset)}
-        </div>
-      )
-    })
-    return datasets
-  }
-  onDeleteFile(file){
-    const yes = confirm('Are you sure you want to delete this file?')
-    if (yes) {
-      console.log('delete: confirmed')
-      if (this.props.onDeleteFile) {
-        console.log('calling custom deletefile function')
-        this.props.onDeleteFile(file)
-      } else {
-        actions.file.destroy(file)
-      }
-    }
-  }
-}
-
-const mapStateToProps = state => ({
-  samplernn: state.module.samplernn,
-  runner: state.system.runner,
-})
-
-const mapDispatchToProps = (dispatch, ownProps) => ({
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(SampleRNNDatasets)
diff --git a/app/client/modules/samplernn/samplernn.reducer.js b/app/client/modules/samplernn/samplernn.reducer.js
index c1dee82..1efbc90 100644
--- a/app/client/modules/samplernn/samplernn.reducer.js
+++ b/app/client/modules/samplernn/samplernn.reducer.js
@@ -1,5 +1,7 @@
 import types from '../../types'
 
+import datasetReducer from '../../dataset/dataset.reducer'
+
 const samplernnInitialState = {
   loading: true,
   progress: { i: 0, n: 0 },
@@ -11,192 +13,11 @@ const samplernnInitialState = {
 }
 
 const samplernnReducer = (state = samplernnInitialState, action) => {
-  // console.log(action.type)
-  switch(action.type) {
-    case types.samplernn.init:
-      return {
-        ...state,
-        loading: false,
-        data: action.data,
-      }
-    
-    case types.folder.create:
-      if (action.data.module === 'samplernn') {
-        return {
-          ...state,
-          loading: false,
-          data: {
-            folders: state.data.folders.concat([action.data.id]),
-            folderLookup: {
-              ...state.data.folderLookup,
-              [action.data.id]: action.data,
-            }
-          },
-          folder: {
-            ...action.data,
-            datasets: [],
-            files: [],
-          },
-        }
-      }
-      return state
-
-    case types.file.create:
-      if (action.data.module === 'samplernn') {
-        console.log(action.data)
-        let dataset, old_dataset, folder, old_folder
-        let dataset_name
-        if (action.data.dataset) {
-          dataset_name = action.data.dataset
-        }
-        else if (action.data.name) {
-          dataset_name = action.data.name.split('.')[0]
-        }
-        else if (action.data.url) {
-          dataset_name = action.data.url
-        }
-        else {
-          dataset_name = null
-        }
-        if (dataset_name in state.data.datasetLookup) {
-          old_dataset = state.data.datasetLookup[dataset_name]
-          dataset = {
-            ...old_dataset,
-            input: action.data.generated ? old_dataset.input : [action.data.id].concat(old_dataset.input),
-            output: !action.data.generated ? old_dataset.output : [action.data.id].concat(old_dataset.output),
-          }
-        } else {
-          console.log(action.data.created_at, action.data.date)
-          dataset = {
-            name: dataset_name,
-            date: action.data.created_at || action.data.date,
-            input: action.data.generated ? [] : [action.data.id],
-            checkpoints: [],
-            output: !action.data.generated ? [] : [action.data.id],
-          }
-        }
-        old_folder = state.data.folderLookup[action.data.folder_id]
-        folder = {
-          ...old_folder,
-          datasets: old_folder.datasets.concat([dataset_name]),
-          files: old_folder.files.concat([action.data.id]),
-        }
-        return {
-          ...state,
-          loading: false,
-          data: {
-            ...state.data,
-            files: state.data.files.concat([action.data.id]),
-            folderLookup: {
-              ...state.data.folderLookup,
-              [action.data.folder_id]: folder,
-            },
-            fileLookup: {
-              ...state.data.fileLookup,
-              [action.data.id]: action.data,
-            },
-            datasetLookup: {
-              ...state.data.datasetLookup,
-              [dataset_name]: dataset,
-            },
-          }
-        }
-      }
-      return state
-
-    case types.file.update:
-      if (action.data.module === 'samplernn') {
-        let old_dataset;
-        let new_dataset = state.data.datasetLookup[action.data.dataset]
-        let old_file = state.data.fileLookup[action.data.id]
-        let new_dataset_update;
-        if (old_file && action.data.dataset !== old_file.dataset) {
-          if (state.data.datasetLookup[old_file.dataset]) {
-            old_dataset = state.data.datasetLookup[old_file.dataset]
-            old_dataset_update = {
-              ...old_dataset,
-              input: old_dataset.input.filter(id => id !== action.data.id),
-              output: old_dataset.output.filter(id => id !== action.data.id),
-            }
-          }
-          new_dataset_update = {
-            ...new_dataset,
-            input: action.data.generated ? [] : [action.data.id],
-            output: !action.data.generated ? [] : [action.data.id],
-          }
-        }
-        console.log('old_dataset', old_dataset_update.name)
-        console.log('new_dataset', new_dataset_update.name)
-        return {
-          ...state,
-          loading: false,
-          data: {
-            ...state.data,
-            datasetLookup: old_dataset ? {
-              ...state.data.datasetLookup,
-              [old_dataset.name]: old_dataset_update,
-              [new_dataset.name]: new_dataset_update,
-            } : new_dataset_update ? {
-              ...state.data.datasetLookup,
-              [new_dataset.name]: new_dataset_update,
-            } : state.data.datasetLookup,
-            fileLookup: {
-              ...state.data.fileLookup,
-              [action.data.id]: action.data,
-            },  
-          }
-        }
-      }
-      return state
-
-    case types.file.destroy:
-      if (action.data.module === 'samplernn') {
-        // delete the key from fileLookup
-        let fileLookup = {
-          ...state.data.fileLookup
-        }
-        let datasetLookup = {
-          ...state.data.datasetLookup
-        }
-        let folderLookup = {
-          ...state.data.folderLookup
-        }
-        let old_file = fileLookup[action.data.id]
-        if (!old_file) return state
-        let old_dataset = state.data.datasetLookup[old_file.dataset]
-        let dataset
-        if (old_dataset) {
-          dataset = {
-            ...old_dataset,
-            input: old_dataset.input.filter(id => id !== old_file.id),
-            output: old_dataset.output.filter(id => id !== old_file.id),
-          }
-          if (! dataset.input.length && ! dataset.checkpoints.length && ! dataset.output.length) {
-            delete datasetLookup[old_file.dataset]
-            let old_folder = folderLookup[old_file.folder_id]
-            folderLookup[old_file.folder_id] = {
-              ...old_folder,
-              datasets: old_folder.datasets.filter(name => name !== old_file.dataset)
-            }
-          } else {
-            console.log('dataset just needs sweeping')
-            datasetLookup[old_file.dataset ] = dataset
-          }
-        }
-        delete fileLookup[old_file.id]
+  if (action.data && action.data.module === 'samplernn') {
+    return datasetReducer(state, action)
+  }
 
-        return {
-          ...state,
-          loading: false,
-          data: {
-            ...state.data,
-            folderLookup,
-            fileLookup,
-            datasetLookup,
-          }
-        }
-      }
-      return state
+  switch(action.type) {
 
     case types.samplernn.set_folder:
       return {
diff --git a/app/client/modules/samplernn/views/samplernn.import.js b/app/client/modules/samplernn/views/samplernn.import.js
index 6f5f78a..cce4aea 100644
--- a/app/client/modules/samplernn/views/samplernn.import.js
+++ b/app/client/modules/samplernn/views/samplernn.import.js
@@ -9,7 +9,7 @@ import Select from '../../../common/select.component'
 import TextInput from '../../../common/textInput.component'
 import Button from '../../../common/button.component'
 
-import SampleRNNDatasets from '../samplernn.datasets'
+import DatasetComponent from '../../../dataset/dataset.component'
 
 const samplernnModule = {
   name: 'samplernn',
@@ -90,7 +90,11 @@ class SampleRNNImport extends Component {
             </div>
           </div>
         </div>
-        <SampleRNNDatasets
+        <DatasetComponent
+          loading={samplernn.loading}
+          progress={samplernn.progress}
+          module={samplernnModule}
+          data={samplernn.data}
           id="unsorted"
           folder={folder}
           history={this.props.history}
diff --git a/app/client/modules/samplernn/views/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js
index 8b42d44..8a9d589 100644
--- a/app/client/modules/samplernn/views/samplernn.show.js
+++ b/app/client/modules/samplernn/views/samplernn.show.js
@@ -10,10 +10,10 @@ import * as audioPlayerActions from '../../../common/audioPlayer/audioPlayer.act
 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 UploadStatus from '../../../dataset/upload.status'
 import { FileList, FileRow } from '../../../common/fileList.component'
 
-import SampleRNNDatasets from '../samplernn.datasets'
+import DatasetComponent from '../../../dataset/dataset.component'
 
 import samplernnModule from '../samplernn.module'
 
@@ -43,7 +43,7 @@ class SampleRNNShow extends Component {
         <div class='heading'>
           <div class='spaced'>
             <h1>{folder ? folder.name : <Loading />}</h1>
-            <DatasetStatus />
+            <UploadStatus />
           </div>
         </div>
         {folder && folder.name && folder.name !== 'unsorted' &&
@@ -54,8 +54,12 @@ class SampleRNNShow extends Component {
             canUpload canAddURL
           />
         }
-        <SampleRNNDatasets
+        <DatasetComponent
+          loading={samplernn.loading}
+          progress={samplernn.progress}
           id={samplernn.folder_id}
+          module={samplernnModule}
+          data={samplernn.data}
           folder={folder}
           history={history}
           onPickFile={(file, e) => {