so limiting

6 files changed, 23 insertions, 13 deletions

diff --git a/app/client/dataset/dataset.component.js b/app/client/dataset/dataset.component.js
index 9de0b69..dec02b6 100644
--- a/app/client/dataset/dataset.component.js
+++ b/app/client/dataset/dataset.component.js
@@ -106,7 +106,7 @@ class DatasetComponent extends Component {
                   files={dataset.output.map(id => fileLookup[id])}
                   orderBy='epoch desc'
                   fields={'name date epoch size'}
-                  onPickFile={onPickFile}
+                  onClick={onPickFile}
                   onDelete={(file) => this.onDeleteFile(file)}
                 />
               }
diff --git a/app/client/dataset/dataset.loader.js b/app/client/dataset/dataset.loader.js
index 64185bc..6ddc83a 100644
--- a/app/client/dataset/dataset.loader.js
+++ b/app/client/dataset/dataset.loader.js
@@ -31,8 +31,8 @@ export const emptyDataset = (module, datasetLookup, name, folder) => {
 }
 
 export const getDataset = (module, datasetLookup, name, folder, date) => {
-  const dataset = datasetLookup[name] || emptyDataset(module, datasetLookup, name, folder)
-  folder = folder || unsortedFolder(module)
+  let dataset = datasetLookup[name] || emptyDataset(module, datasetLookup, name, folder)
+  // folder = folder || unsortedFolder(module)
   if (date) {
     dataset.date = (dataset.date && ! isNaN(dataset.date)) ? Math.max(+new Date(date), dataset.date) : +new Date(date)
   }
@@ -67,6 +67,7 @@ export const load = module => {
     })
 
     // prepare the files by splitting into two groups
+    files.forEach(f => { if (f.name.match('pc_1'))  console.log(f) })
     const generatedFiles = files.filter(file => file.generated)
     const ungeneratedFiles = files.filter(file => !file.generated)
 
@@ -77,6 +78,7 @@ export const load = module => {
         file.name = (file.opt || {}).token || file.url
       }
       const name = (file.name || 'unsorted').split('.')[0]
+      if (name === 'pc_1') console.log('u', name)
       const folder = folderLookup[file.folder_id] || unsortedFolder(module)
       const dataset = getDataset(module, datasetLookup, name, folder, file.date || file.created_at)
       if (file.url.match(file.name)) file.persisted = true
@@ -89,6 +91,7 @@ export const load = module => {
     generatedFiles.map(file => {
       fileLookup[file.id] = file
       const pair = file.name.split('.')[0].split('-')
+      if (pair[0] === 'pc_1') console.log('g', pair[0])
       const folder = folderLookup[file.folder_id] || unsortedFolder(module)
       const dataset = getDataset(module, datasetLookup, pair[0], folder, file.date || file.created_at)
       dataset.output.push(file.id)
diff --git a/app/client/modules/pix2wav/views/pix2wav.live.js b/app/client/modules/pix2wav/views/pix2wav.live.js
index bc34356..7b6adfc 100644
--- a/app/client/modules/pix2wav/views/pix2wav.live.js
+++ b/app/client/modules/pix2wav/views/pix2wav.live.js
@@ -119,6 +119,11 @@ class Pix2WavLive extends Component {
                 onChange={this.changeSequence}
               />
               <Select
+                name='output_format'
+                title='format'
+                options={['JPEG','PNG']}
+              />
+              <Select
                 name='checkpoint_name'
                 title='checkpoint'
                 options={this.props.pix2wav.data.checkpoints}
diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index a957e25..f5246fa 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -26,7 +26,7 @@ export const load_directories = (id) => (dispatch) => {
     // console.log(res)
     const [datasetApiReport, datasets, results, output, datasetUsage, lossReport] = res
 
-    const {
+    let {
       folderLookup,
       fileLookup,
       datasetLookup,
@@ -40,7 +40,7 @@ export const load_directories = (id) => (dispatch) => {
     const flatDatasets = datasets.filter(s => s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir)
     const builtDatasets = datasets.filter(s => s.dir)
     builtDatasets.forEach(dir => {
-      const dataset = datasetLoader.getDataset(module, datasetLookup, dir.name)
+      const dataset = datasetLoader.getDataset(module, datasetLookup, dir.name, unsortedFolder, dir.date)
       dataset.isBuilt = true
     })
 
@@ -75,6 +75,7 @@ export const load_directories = (id) => (dispatch) => {
     })
 
     output.map(file => {
+      return
       file.uuid = uuidv1()
       fileLookup[file.uuid] = file
       const pair = file.name.split('.')[0].split('-')
@@ -147,7 +148,7 @@ export const load_loss = () => dispatch => {
 }
 
 export const import_files = (state, datasetLookup, fileLookup) => (dispatch) => {
-  const { selected, folder, url_base, import_action } = state
+  const { selected, folder_id, url_base, import_action } = state
   const names = Object.keys(selected).filter(k => selected[k])
   let promises
   switch (import_action) {
@@ -158,7 +159,7 @@ export const import_files = (state, datasetLookup, fileLookup) => (dispatch) =>
           const partz = file.name.split('.')
           const ext = partz.pop()
           return actions.file.create({
-            folder_id: folder,
+            folder_id: folder_id,
             name: file.name,
             url: url_base + file.name,
             mime: 'audio/' + ext,
@@ -184,7 +185,7 @@ export const import_files = (state, datasetLookup, fileLookup) => (dispatch) =>
           if (ext === 'wav' || ext === 'flac') return
           console.log(file)
           return actions.socket.upload_file({
-            folder_id: folder,
+            folder_id: folder_id,
             module: 'samplernn',
             activity: 'train',
             path: 'datasets',
@@ -203,7 +204,7 @@ export const import_files = (state, datasetLookup, fileLookup) => (dispatch) =>
   console.log(promises)
   return Promise.all(promises).then(data => {
     console.log(data)
-    window.location.href = '/samplernn/datasets/' + folder.id
+    window.location.href = '/samplernn/datasets/' + folder_id + '/'
   }).catch(e => {
     console.error(e)
   })
diff --git a/app/client/modules/samplernn/views/samplernn.import.js b/app/client/modules/samplernn/views/samplernn.import.js
index 653d930..ca6e15d 100644
--- a/app/client/modules/samplernn/views/samplernn.import.js
+++ b/app/client/modules/samplernn/views/samplernn.import.js
@@ -20,7 +20,7 @@ class SampleRNNImport extends Component {
   constructor(){
     super()
     this.state = {
-      folder: 1,
+      folder_id: 1,
       import_action: 'Hotlink',
       url_base: 'https://s3.amazonaws.com/i.asdf.us/bucky/data/4279/',
       selected: {},
@@ -65,9 +65,9 @@ class SampleRNNImport extends Component {
               <Select
                 title='Destination dataset'
                 options={datasets}
-                name='folder'
+                name='folder_id'
                 opt={this.state}
-                onChange={(name, value) => this.setState({ folder: value })}
+                onChange={(name, value) => this.setState({ folder_id: value })}
               />
               <Select
                 title='Import action'
diff --git a/app/client/modules/samplernn/views/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js
index a905b7c..e74de4f 100644
--- a/app/client/modules/samplernn/views/samplernn.show.js
+++ b/app/client/modules/samplernn/views/samplernn.show.js
@@ -68,7 +68,7 @@ class SampleRNNShow extends Component {
           onPickFile={(file, e) => {
             e.preventDefault()
             e.stopPropagation()
-            console.log('picked a file', file)
+            // console.log('picked a file', file)
             this.handlePick(file)
           }}
           datasetActions={this.datasetActions}
@@ -107,6 +107,7 @@ class SampleRNNShow extends Component {
     )
   }
   handlePick(file){
+    // console.log(file)
     this.props.audioPlayer.play(file)
   }
 }