Better sort

main/index.js

@@ -199,17 +199,33 @@ app.on('ready', () => {
 function sortList (keyA, keyB) {
   var aObj = state.trackDict[keyA]
   var bObj = state.trackDict[keyB]
+  // sort by albumartist
+  // if (aObj.albumartist[0] < bObj.albumartist[0]) return -1
+  // if (aObj.albumartist[0] > bObj.albumartist[0]) return 1
+
   // sort by artist
-  if (aObj.artist < bObj.artist) return -1
-  if (aObj.artist > bObj.artist) return 1
+  // if (aObj.artist[0] < bObj.artist[0]) return -1
+  // if (aObj.artist[0] > bObj.artist[0]) return 1
 
   // then by album
   if (aObj.album < bObj.album) return -1
   if (aObj.album > bObj.album) return 1
 
+  // then by disc no
+  if (aObj.disk.no < bObj.disk.no) return -1
+  if (aObj.disk.no > bObj.disk.no) return 1
+
+  // then by disc no
+  if (aObj.track.no < bObj.track.no) return -1
+  if (aObj.track.no > bObj.track.no) return 1
+
   // then by title
   if (aObj.title < bObj.title) return -1
   if (aObj.title > bObj.title) return 1
+
+  // then by filepath
+  if (aObj.filepath < bObj.filepath) return -1
+  if (aObj.filepath > bObj.filepath) return 1
   return 0
 }
 

main/library.js

@@ -62,15 +62,37 @@ function parseMetadata (data, cb) {
           return cb(null)
       }
     }
-
-    var { title, artist, album, duration } = meta
+    // delete meta.picture
+    // console.dir(meta, {colors: true, depth: 5})
+    var {
+      albumartist,
+      title,
+      artist,
+      album,
+      year,
+      track,
+      disk,
+      genre,
+      duration
+    } = meta
 
     if (!title) {
       var { basename } = data
       var ext = path.extname(basename)
       title = path.basename(basename, ext)
     }
 
-    cb(null, {title, artist, album, duration, filepath})
+    cb(null, {
+      albumartist,
+      title,
+      artist,
+      album,
+      duration,
+      filepath,
+      year,
+      track,
+      disk,
+      genre
+    })
   })
 }

package.json

@@ -82,7 +82,8 @@
     "test:deps": "dependency-check ./package.json --entry renderer/index.js --no-dev --ignore-module electron",
     "test:lint": "standard | snazzy",
     "test-skip:tape": "xvfb-maybe tape test/* | tap-format-spec",
-    "test:artwork-module": "tape main/lib/**/test.js | tap-format-spec",
+    "test:main": "tape main/lib/**/test.js | tap-format-spec",
+    "test:renderer": "tape renderer/**/test.js | tap-format-spec",
     "rebuild": "electron-rebuild",
     "build": "build --dir",
     "dist": "build"

renderer/elements/table/index.js

@@ -25,8 +25,11 @@ Table.prototype._render = function (state, emit) {
             <tr>
               <th>Title</th>
               <th class="${styles.time}">Time</th>
+              <th class="${styles.disk}">Disk</th>
+              <th class="${styles.track}">Track</th>
               <th>Artist</th>
               <th>Album</th>
+              <th class="${styles.year}">Year</th>
             </tr>
           </thead>
         </table>

renderer/elements/table/lib.js

@@ -0,0 +1,7 @@
+exports.formatCount = formatCount
+
+function formatCount (countObj) {
+  if (!countObj.no && !countObj.of) return ''
+  if (!countObj.of) return countObj.no.toString()
+  return `${countObj.no} of ${countObj.of}`
+}

renderer/elements/table/rows.js

@@ -3,6 +3,7 @@ var fd = require('format-duration')
 var classNames = require('classnames')
 var Component = require('cache-component')
 var document = require('global/document')
+var {formatCount} = require('./lib')
 var styles = require('./styles')
 // var debounce = require('lodash.debounce')
 
@@ -121,8 +122,11 @@ TableRows.prototype._rowMap = function (key, idx) {
         className="${classNames(classes)}">
       <td>${meta.title}</td>
       <td class="${styles.time}">${meta.duration ? fd(meta.duration * 1000) : ''}</td>
+      <td class="${styles.disk}">${meta.disk ? formatCount(meta.disk) : ''}</td>
+      <td class="${styles.track}">${meta.track ? formatCount(meta.track) : ''}</td>
       <td>${meta.artist}</td>
       <td>${meta.album}</td>
+      <td class="${styles.year}">${meta.year}</td>
     </tr>
   `
 }

renderer/elements/table/styles.js

@@ -32,6 +32,9 @@ module.exports = css`
     border-right: var(--border);
     border-bottom: var(--border);
   }
+  .mediaList td {
+    border-right: var(--border);
+  }
   .mediaList th:last-child {
     border-right: none;
   }
@@ -50,7 +53,8 @@ module.exports = css`
 
   .tableScrollWindow {
     flex: 1 0;
-    overflow: auto;
+    overflow-y: overlay;
+    overflow-x: hidden;
     will-change: transform;
   }
 
@@ -70,8 +74,22 @@ module.exports = css`
     width: 6em;
   }
 
+  .mediaList .track {
+    text-align: right;
+    width: 7em;
+  }
+
+  .mediaList .disk {
+    text-align: right;
+    width: 5em;
+  }
+
+  .mediaList .year {
+    width: 5em;
+  }
+
   .mediaList  .track {
-    width: 6em;
+    width: 7em;
   }
 
   .playing {

renderer/elements/table/test.js

@@ -0,0 +1,25 @@
+var test = require('tape')
+var {formatCount} = require('./lib')
+
+test('format disk and track objects correctly', function (t) {
+  var tests = [
+    {
+      in: { no: 14, of: 17 },
+      expect: '14 of 17'
+    },
+    {
+      in: { no: 0, of: 0 },
+      expect: ''
+    },
+    {
+      in: { no: 5, of: 0 },
+      expect: '5'
+    }
+  ]
+
+  tests.forEach(function (testCase) {
+    t.equal(formatCount(testCase.in), testCase.expect, `${JSON.stringify(testCase.in)} formats to ${testCase.expect}`)
+  })
+
+  t.end()
+})