From 2149eb581c35a93d41dbad6e3409c498b4bed804 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sun, 3 Jun 2018 00:13:02 +0200
Subject: sort files

---
 app/client/modules/samplernn/samplernn.actions.js  | 18 ++++++++++++++++--
 app/client/modules/samplernn/samplernn.datasets.js |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'app/client/modules')

diff --git a/app/client/modules/samplernn/samplernn.actions.js b/app/client/modules/samplernn/samplernn.actions.js
index cb8b47b..1a60719 100644
--- a/app/client/modules/samplernn/samplernn.actions.js
+++ b/app/client/modules/samplernn/samplernn.actions.js
@@ -76,7 +76,7 @@ export const load_directories = (id) => (dispatch) => {
     })
 
     // console.log(datasets)
-    // const flatDatasets = datasets.filter(s => s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir)
+    const flatDatasets = datasets.filter(s => s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir)
     const builtDatasets = datasets.filter(s => s.dir)
     builtDatasets.forEach(dir => {
       let dataset = datasetLookup[dir.name]
@@ -88,6 +88,18 @@ export const load_directories = (id) => (dispatch) => {
       dataset.isBuilt = true
     })
 
+    flatDatasets.forEach(file => {
+      const name = file.name.split('.')[0]
+      let dataset = datasetLookup[name]
+      if (! dataset) {
+        dataset = empty_dataset(name)
+        datasetLookup[dataset.name] = dataset
+        folderLookup.unsorted.datasets.push(dataset)
+      }
+      file.persisted = false
+      dataset.input.push(file)
+    })
+
     // exp:coccokit_3-frame_sizes:8,2-n_rnn:2-dataset:coccokit_3
     const checkpoints = results.filter(s => s.dir).map(s => {
       const checkpoint = s.name
@@ -96,6 +108,7 @@ export const load_directories = (id) => (dispatch) => {
         .filter(b => b.length && b[1])
         .reduce((a,b) => (a[b[0]] = b[1]) && a, {})
       checkpoint.name = checkpoint.dataset || checkpoint.exp
+      checkpoint.date = s.date
       checkpoint.dir = s
       let dataset = datasetLookup[checkpoint.dataset]
       if (! dataset) {
@@ -115,8 +128,9 @@ export const load_directories = (id) => (dispatch) => {
         datasetLookup[dataset.name] = dataset
         folderLookup.unsorted.datasets.push(dataset)
       }
+      file.persisted = false
+      file.epoch = file.epoch || pair[1].replace(/^\D+/, '')
       dataset.output.push(file)
-      file.epoch = file.epoch || pair[1]
     })
 
     dispatch({
diff --git a/app/client/modules/samplernn/samplernn.datasets.js b/app/client/modules/samplernn/samplernn.datasets.js
index 8b86007..b6a12cc 100644
--- a/app/client/modules/samplernn/samplernn.datasets.js
+++ b/app/client/modules/samplernn/samplernn.datasets.js
@@ -62,7 +62,7 @@ class SampleRNNDatasets extends Component {
       return (
         <div className='row dataset'>
           <div className='col'>
-            {!!dataset.input.length && <FileList files={dataset.input} />}
+            {!!dataset.input.length && <FileList files={dataset.input} className='input_files' fileListClassName='' rowClassName='input_file' />}
           </div>
           <div className='col quiet'>
             <div>{dataset.isBuilt ? 'has dataset' : 'not built'}</div>
@@ -71,7 +71,7 @@ class SampleRNNDatasets extends Component {
             {!!dataset.checkpoints.length && <FileRow file={dataset.checkpoints[0]} />}
           </div>
           <div className='col'>
-            {!!dataset.output.length && <FileList files={dataset.output} />}
+            {!!dataset.output.length && <FileList files={dataset.output} orderBy='epoch desc' />}
           </div>
         </div>
       )
-- 
cgit v1.2.3-70-g09d2