Album ordering

Signed-off-by: mashaal <[email protected]>
mashaal · Jan 9, 2017 · 9b9fc71 · 9b9fc71
1 parent 3d0b877
commit 9b9fc71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/components/connection/local.js b/components/connection/local.js
@@ -4,6 +4,7 @@ import { sortTracks, sortAlbums } from '../utilities'
 const path = require('path')
 const mm = require('musicmetadata')
 const fs = require('fs')
+const dateFns = require('date-fns')
 
 export default class Local {
   collection (fileList) {
@@ -36,7 +37,7 @@ export default class Local {
               metadata.album = metadata.album || ''
               metadata.root = root
               metadata.path = fileName
-              metadata.time = +new Date(fileStats.mtime)
+              metadata.time = Number(dateFns.format(new Date(fileStats.ctime), 'YYYYMMDDmm')) * -1
               this.tracks.push(metadata)
               store.dispatch({type: 'SCANNING', message: 'SCANNING: ' + metadata.artist + ' - ' + metadata.album})
               rs.close()

diff --git a/components/library/album.jsx b/components/library/album.jsx
@@ -45,7 +45,7 @@ export default class Album extends Component {
     let cover = {backgroundImage:`url(../../library/default.jpg)`}
     if (this.props.album.cover) cover = {backgroundImage: 'url("' + this.props.album.cover + '")'}
     return (
-      <li onClick={this.handleClick} onMouseOver={this.activate} onMouseOut={this.reset} style={[styles.base, this.props.newest ? {order: (this.props.album.time * -1)} : '' ]}>
+      <li onClick={this.handleClick} onMouseOver={this.activate} onMouseOut={this.reset} style={[styles.base, this.props.newest ? {order: (this.props.album.time)} : {order: -2} ]}>
         <div style={this.state.fade ? styles.fade : styles.nonfade}>
           <div ref='album' style={[styles.cover, cover, this.state.active ? styles.zoom : '']}></div>
         </div>

diff --git a/components/library/index.jsx b/components/library/index.jsx
@@ -28,7 +28,7 @@ export default class Library extends Component {
   render () {
     return (
     <ul ref='library' style={[styles.base, this.props.player.track ? {padding: '12.5vh 0 33vh'} : {padding: '2em 0 33vh'}]}>
-      <div style={{flexBasis: '100%', padding: '0 2em', cursor: 'pointer'}} onClick={()=> store.dispatch({type: 'EDIT_METADATA'})}>
+      <div style={[{flexBasis: '100%', padding: '0 2em 0', cursor: 'pointer'}, {order: -999999999999}]} onClick={()=> store.dispatch({type: 'EDIT_METADATA'})}>
         <Errors errors={this.countErrors()} />
       </div>
       {this.props.library.albums.map((album, index) => {
@@ -67,6 +67,7 @@ const styles = {
   },
   li: {
     flex: '1 1 300px',
-    padding: '1em 2em'
+    padding: '1em 2em',
+    order: 10
   }
 }