sort files

1 files changed, 126 insertions, 240 deletions

diff --git a/public/bundle.js b/public/bundle.js
index c5ce68f..a5985c1 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -946,7 +946,9 @@ exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FileRow = exports.FileList = undefined;
+exports.FileRow = exports.fieldSet = exports.orderByFn = exports.FileList = undefined;
+
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
 var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js");
 
@@ -973,16 +975,28 @@ var defaultFields = new Set(['date', 'size']);
 var FileList = exports.FileList = function FileList(props) {
   var files = props.files,
       fields = props.fields,
-      linkFiles = props.linkFiles,
+      sort = props.sort,
       title = props.title,
+      linkFiles = props.linkFiles,
       onClick = props.onClick,
+      _props$orderBy = props.orderBy,
+      orderBy = _props$orderBy === undefined ? 'name asc' : _props$orderBy,
       _props$className = props.className,
-      className = _props$className === undefined ? "" : _props$className;
+      className = _props$className === undefined ? '' : _props$className,
+      _props$fileListClassN = props.fileListClassName,
+      fileListClassName = _props$fileListClassN === undefined ? 'filelist' : _props$fileListClassN,
+      _props$rowClassName = props.rowClassName,
+      rowClassName = _props$rowClassName === undefined ? 'row file' : _props$rowClassName;
 
-  var fileList = (files || []).map(function (file) {
+  var _orderByFn = orderByFn(orderBy),
+      mapFn = _orderByFn.mapFn,
+      sortFn = _orderByFn.sortFn;
+
+  var fileList = (files || []).map(mapFn).sort(sortFn).map(function (pair) {
     return (0, _preact.h)(FileRow, {
-      file: file,
-      fields: fields || defaultFields,
+      file: pair[1],
+      fields: fieldSet(fields),
+      className: rowClassName,
       linkFiles: true,
       onClick: true
     });
@@ -1005,28 +1019,105 @@ var FileList = exports.FileList = function FileList(props) {
     ),
     (0, _preact.h)(
       'div',
-      { className: 'filelist rows' },
+      { className: 'rows ' + fileListClassName },
       fileList
     )
   );
 };
 
+var numericSort = {
+  asc: function asc(a, b) {
+    return a[0] - b[0];
+  },
+  desc: function desc(a, b) {
+    return b[0] - a[0];
+  }
+};
+var stringSort = {
+  asc: function asc(a, b) {
+    return a[0].localeCompare(b[0]);
+  },
+  desc: function desc(a, b) {
+    return b[0].localeCompare(a[0]);
+  }
+};
+var orderByFn = exports.orderByFn = function orderByFn() {
+  var s = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'name asc';
+
+  var _s$split = s.split(' '),
+      _s$split2 = _slicedToArray(_s$split, 2),
+      _s$split2$ = _s$split2[0],
+      field = _s$split2$ === undefined ? 'name' : _s$split2$,
+      _s$split2$2 = _s$split2[1],
+      direction = _s$split2$2 === undefined ? 'asc' : _s$split2$2;
+
+  var mapFn = void 0,
+      sortFn = void 0;
+  switch (field) {
+    case 'epoch':
+      mapFn = function mapFn(a) {
+        return [a.epoch || a.epochs, a];
+      };
+      sortFn = numericSort[direction];
+      break;
+    case 'size':
+      mapFn = function mapFn(a) {
+        return [a.size, a];
+      };
+      sortFn = numericSort[direction];
+      break;
+    case 'date':
+      mapFn = function mapFn(a) {
+        return [+new Date(a.date || a.created_at), a];
+      };
+      sortFn = numericSort[direction];
+      break;
+    case 'name':
+    default:
+      mapFn = function mapFn(a) {
+        return [a.id || a.name, a];
+      };
+      sortFn = stringSort[direction];
+      break;
+  }
+  return { mapFn: mapFn, sortFn: sortFn };
+};
+
+var fieldSet = exports.fieldSet = function fieldSet(fields) {
+  if (fields) {
+    if (fields instanceof Set) {
+      return fields;
+    }
+    return new Set(fields.split(' '));
+  }
+  return defaultFields;
+};
+
 var FileRow = exports.FileRow = function FileRow(props) {
   var file = props.file,
       linkFiles = props.linkFiles,
-      _onClick = props.onClick;
+      _onClick = props.onClick,
+      _props$className2 = props.className,
+      className = _props$className2 === undefined ? 'row file' : _props$className2,
+      _props$username = props.username,
+      username = _props$username === undefined ? '' : _props$username;
+
+  var fields = fieldSet(props.fields);
 
-  var fields = props.fields || defaultFields;
   var size = util.hush_size(file.size);
-  var date = file.created_at;
-  var username = file.username || "";
+  var date = file.date || file.created_at;
+
   return (0, _preact.h)(
     'div',
-    { 'class': 'row file', key: file.name },
+    { 'class': className, key: file.name },
     (0, _preact.h)(
       'div',
       { className: 'filename', title: file.name || file.url },
-      linkFiles && file.url ? (0, _preact.h)(
+      file.persisted === false ? (0, _preact.h)(
+        'span',
+        null,
+        file.name || file.url
+      ) : linkFiles && file.url ? (0, _preact.h)(
         'a',
         { target: '_blank', href: file.url },
         file.name || file.url
@@ -4484,7 +4575,9 @@ var load_directories = exports.load_directories = function load_directories(id)
       });
 
       // console.log(datasets)
-      // const flatDatasets = datasets.filter(s => s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir)
+      var flatDatasets = datasets.filter(function (s) {
+        return s.name.match(/(wav|aiff?|flac|mp3)$/) && !s.dir;
+      });
       var builtDatasets = datasets.filter(function (s) {
         return s.dir;
       });
@@ -4498,6 +4591,18 @@ var load_directories = exports.load_directories = function load_directories(id)
         dataset.isBuilt = true;
       });
 
+      flatDatasets.forEach(function (file) {
+        var name = file.name.split('.')[0];
+        var 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
       var checkpoints = results.filter(function (s) {
         return s.dir;
@@ -4510,6 +4615,7 @@ var load_directories = exports.load_directories = function load_directories(id)
           return (a[b[0]] = b[1]) && a;
         }, {});
         checkpoint.name = checkpoint.dataset || checkpoint.exp;
+        checkpoint.date = s.date;
         checkpoint.dir = s;
         var dataset = datasetLookup[checkpoint.dataset];
         if (!dataset) {
@@ -4529,8 +4635,9 @@ var load_directories = exports.load_directories = function load_directories(id)
           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({
@@ -4748,7 +4855,7 @@ var SampleRNNDatasets = function (_Component) {
           (0, _preact.h)(
             'div',
             { className: 'col' },
-            !!dataset.input.length && (0, _preact.h)(_fileList.FileList, { files: dataset.input })
+            !!dataset.input.length && (0, _preact.h)(_fileList.FileList, { files: dataset.input, className: 'input_files', fileListClassName: '', rowClassName: 'input_file' })
           ),
           (0, _preact.h)(
             'div',
@@ -4767,7 +4874,7 @@ var SampleRNNDatasets = function (_Component) {
           (0, _preact.h)(
             'div',
             { className: 'col' },
-            !!dataset.output.length && (0, _preact.h)(_fileList.FileList, { files: dataset.output })
+            !!dataset.output.length && (0, _preact.h)(_fileList.FileList, { files: dataset.output, orderBy: 'epoch desc' })
           )
         );
       });
@@ -6789,230 +6896,9 @@ exports.default = (_system$app$folder$fi = {
   !*** ./app/client/util.js ***!
   \****************************/
 /*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.clamp = clamp;
-exports.norm = norm;
-exports.lerp = lerp;
-exports.mix = mix;
-exports.randint = randint;
-exports.randrange = randrange;
-exports.timeInSeconds = timeInSeconds;
-exports.gerund = gerund;
-exports.commatize = commatize;
-exports.carbon_date = carbon_date;
-exports.hush_views = hush_views;
-exports.hush_threads = hush_threads;
-exports.hush_size = hush_size;
-exports.hush_null = hush_null;
-exports.get_age = get_age;
-exports.courtesy_s = courtesy_s;
-var is_iphone = exports.is_iphone = !!(navigator.userAgent.match(/iPhone/i) || navigator.userAgent.match(/iPod/i));
-var is_ipad = exports.is_ipad = !!navigator.userAgent.match(/iPad/i);
-var is_android = exports.is_android = !!navigator.userAgent.match(/Android/i);
-var is_mobile = exports.is_mobile = is_iphone || is_ipad || is_android;
-var is_desktop = exports.is_desktop = !is_mobile;
-
-var htmlClassList = document.body.parentNode.classList;
-htmlClassList.add(is_desktop ? 'desktop' : 'mobile');
-htmlClassList.remove('loading');
-
-// window.debug = false
-
-function clamp(n, a, b) {
-  return n < a ? a : n < b ? n : b;
-}
-function norm(n, a, b) {
-  return (n - a) / (b - a);
-}
-function lerp(n, a, b) {
-  return (b - a) * n + a;
-}
-function mix(n, a, b) {
-  return a * (1 - n) + b * n;
-}
-function randint(n) {
-  return Math.floor(Math.random() * n);
-}
-function randrange(a, b) {
-  return Math.random() * (b - a) + a;
-}
-
-document.body.style.backgroundImage = 'linear-gradient(' + (randint(40) + 40) + 'deg, #fde, #ffe)';
+/***/ (function(module, exports) {
 
-function timeInSeconds(n) {
-  return (n / 10).toFixed(1) + ' s.';
-}
-function gerund(s) {
-  return s.replace(/e?$/, 'ing');
-}
-function commatize(n, radix) {
-  radix = radix || 1024;
-  var nums = [],
-      i,
-      counter = 0,
-      r = Math.floor;
-  if (n > radix) {
-    n /= radix;
-    nums.unshift(r(n * 10 % 10));
-    nums.unshift(".");
-  }
-  do {
-    i = n % 10;
-    n = r(n / 10);
-    if (n && !(++counter % 3)) {
-      i = ' ' + r(i);
-    }
-    nums.unshift(r(i));
-  } while (n);
-  return nums.join("");
-}
-function carbon_date(date, no_bold) {
-  var span = (+new Date() - new Date(date)) / 1000,
-      color;
-  if (!no_bold && span < 86400) // modified today
-    {
-      color = "new";
-    } else if (span < 604800) // modifed this week
-    {
-      color = "recent";
-    } else if (span < 1209600) // modifed 2 weeks ago
-    {
-      color = "med";
-    } else if (span < 3024000) // modifed 5 weeks ago
-    {
-      color = "old";
-    } else if (span < 12315200) // modifed 6 months ago
-    {
-      color = "older";
-    } else {
-    color = "quiet";
-  }
-  return color;
-}
-function hush_views(n, bias, no_bold) {
-  var txt = commatize(n, 1000);
-  bias = bias || 1;
-  n = n || 0;
-  if (n < 30) {
-    return ["quiet", n + " v."];
-  }
-  if (n < 200) {
-    return ["quiet", txt + " v."];
-  } else if (n < 500) {
-    return ["quiet", txt + " v."];
-  } else if (n < 1000) {
-    return ["old", txt + " v."];
-  } else if (n < 5000) {
-    return ["med", txt + " kv."];
-  } else if (no_bold || n < 10000) {
-    return ["recent", txt + " kv."];
-  } else {
-    return ["new", txt + " kv."];
-  }
-}
-function hush_threads(n, bias, no_bold) {
-  var txt = commatize(n, 1000);
-  bias = bias || 1;
-  n = n || 0;
-  if (n < 10) {
-    return ["quiet", n + " t."];
-  } else if (n < 25) {
-    return ["old", txt + " t."];
-  } else if (n < 50) {
-    return ["med", txt + " t."];
-  } else if (no_bold || n < 100) {
-    return ["recent", txt + " t."];
-  } else {
-    return ["new", txt + " t."];
-  }
-}
-function hush_size(n, bias, no_bold) {
-  var txt = commatize(Math.floor(n / 1024));
-  bias = 1 || bias;
-  n = n || 0;
-  if (!n) {
-    return ['', ''];
-  }
-  if (n < 1024) {
-    return ["quiet", n + " b."];
-  }
-  if (n < 1024 * 1024) {
-    return ["quiet", txt + " kb."];
-  } else if (n < 20000000 / bias) {
-    return ["quiet", txt + " mb."];
-  } else if (n < 50000000 / bias) {
-    return ["old", txt + " mb."];
-  } else if (n < 80000000 / bias) {
-    return ["med", txt + " mb."];
-  } else if (no_bold || n < 170000000 / bias) {
-    return ["recent", txt + " mb."];
-  } else {
-    return ["new", txt + " mb."];
-  }
-}
-function hush_null(n, unit, no_bold) {
-  var s = unit ? n + " " + unit + "." : n;
-  if (n < 3) {
-    return ["quiet", s];
-  } else if (n < 6) {
-    return ["older", s];
-  } else if (n < 10) {
-    return ["old", s];
-  } else if (n < 16) {
-    return ["med", s];
-  } else if (no_bold || n < 21) {
-    return ["recent", s];
-  } else {
-    return ["new", s];
-  }
-}
-function get_age(t) {
-  var age = Math.abs(+Date.now() - new Date(t)) / 1000;
-  var r = Math.floor;
-  var m;
-  if (age < 5) {
-    return "now";
-  }
-  if (age < 60) {
-    return r(age) + "s";
-  }
-  age /= 60;
-  if (age < 60) {
-    return r(age) + "m";
-  }
-  m = r(age % 60);
-  age /= 60;
-  if (m > 0 && age < 2) {
-    return r(age) + "h" + m + "m";
-  }
-  if (age < 24) {
-    return r(age) + "h";
-  }
-  age /= 24;
-  if (age < 7) {
-    return r(age) + "d";
-  }
-  age /= 7;
-  if (age < 12) {
-    return r(age) + "w";
-  }
-  age /= 4;
-  if (age < 12) {
-    return r(age) + "m";
-  }
-  age /= 12;
-  return r(age) + "y";
-}
-function courtesy_s(n, s) {
-  return n == 1 ? "" : s || "s";
-}
+throw new Error("Module build failed: Error: ENOENT: no such file or directory, open '/Users/user/neural/live-cortex/app/client/util.js'");
 
 /***/ }),