Add ability to sort by name or date, asc or desc

frontend/Gruntfile.coffee

@@ -14,9 +14,10 @@ module.exports = (grunt) ->
           cwd: 'app/',
           dest: '<%= config.dist_dir %>/'
           src: [
-            'index.html',
+            'index.html'
             'partials/*'
             'assets/*'
+            'js/**/*.html'
           ]
         ]
       vendor:

frontend/app/js/app.coffee

@@ -31,7 +31,7 @@
 
     # last state, because of the wildcard url match
     ).state("browse.uri",
-      url: "/{uri:.*}?page"
+      url: "/{uri:.*}?page&sort&direction"
       parent: "main"
       controller: "BrowseCtrl as browseCtrl"
       templateUrl: "partials/browse.html"

frontend/app/js/browse-ctrl.coffee

@@ -29,7 +29,9 @@ mod.controller("BrowseCtrl", ($scope, $stateParams, $state, library, playlist) -
   $scope.$on "$stateChangeSuccess", (event, toState, toParams, fromState, fromParams) ->
     toParams.uri ?= "/"
     toParams.page ?= 1
-    library.ls(toParams.uri).then (items) ->
+    toParams.sort ?= "date"
+    toParams.direction ?= "desc"
+    library.ls(toParams.uri, toParams.sort, toParams.direction).then (items) ->
       that.paginate(items, parseInt(toParams.page))
       $scope.breadcrumbs = that.breadcrumbs(toParams.uri)
 

frontend/app/js/library-service.coffee

@@ -6,21 +6,25 @@ mod.factory "library", ["$q", "mpd", ($q, mpd) ->
   # Cache a single library path, so the controller can paginate without fetching
   # the data again.
   cache =
-    uri: null
+    key: null
     items: null
 
+  cacheKey = (uri, sort, direction) ->
+    "#{uri}-#{sort}-#{direction}"
+
   api =
     update: (uri) -> mpd.update(uri)
 
-    ls: (uri) ->
+    ls: (uri, sort, direction) ->
       deferred = $q.defer()
-      if uri == cache.uri
+      key = cacheKey(uri, sort, direction)
+      if key == cache.key
         # Requesting the same path, return the data from the cache.
         deferred.resolve(cache.items)
       else
-        mpd.ls(uri).then (items) ->
+        mpd.ls(uri, sort, direction).then (items) ->
           deferred.resolve(items)
-          cache.uri = uri
+          cache.key = key
           cache.items = items
       deferred.promise
 ]

frontend/app/js/m-sort-by/m-sort-by.coffee

@@ -0,0 +1,5 @@
+mod = angular.module('player')
+
+mod.directive 'mSortBy', ->
+  restrict: 'E'
+  templateUrl: 'js/m-sort-by/m-sort-by.html',

frontend/app/js/m-sort-by/m-sort-by.html

@@ -0,0 +1,20 @@
+<div class="btn-group pull-right" dropdown is-open="status.isopen">
+  <button type="button" class="btn btn-primary dropdown-toggle" ng-disabled="disabled">
+    <i class="fa fa-sort-amount-asc"></i>
+    <span class="caret"></span>
+  </button>
+  <ul class="dropdown-menu" role="menu">
+    <li><a ui-sref="{ sort: 'date', direction: 'desc' }">
+      <i class="fa fa-sort-numeric-desc"></i> Newest first
+    </a></li>
+    <li><a ui-sref="{ sort: 'date', direction: 'asc' }">
+      <i class="fa fa-sort-numeric-asc"></i> Oldest first
+    </a></li>
+    <li><a ui-sref="{ sort: 'name', direction: 'asc' }">
+      <i class="fa fa-sort-alpha-asc"></i> A to Z
+    </a></li>
+    <li><a ui-sref="{ sort: 'name', direction: 'desc' }">
+      <i class="fa fa-sort-alpha-desc"></i> Z to A
+    </a></li>
+  </ul>
+</div>

frontend/app/js/mpd-service.coffee

@@ -50,9 +50,11 @@ mod.factory "mpd", ["$rootScope", "$http", "$interval", "$q", ($rootScope, $http
         replace: replace
         play: play
 
-    ls: (uri) ->
+    ls: (uri, sort, direction) ->
       deferred = $q.defer()
-      $http.get("/files?uri=#{escape(uri)}").success (data) ->
+      $http.get(
+        "/files?uri=#{escape(uri)}&sort=#{sort}&direction=#{direction}"
+      ).success (data) ->
         deferred.resolve(data)
       deferred.promise
 

frontend/app/partials/browse.html

@@ -7,14 +7,18 @@
     </li>
   </ol>
 
-  <nav ng-show="pages.length > 1">
-    <ul class="pagination">
+  <nav>
+
+    <m-sort-by></m-sort-by>
+
+    <ul class="pagination" ng-show="pages.length > 1">
       <li><a ui-sref="{ page: page - 1 }">&laquo;</a></li>
       <li ng-repeat="p in ::pages" ng-class="{ 'active':p==page }">
         <a ui-sref="{ page: p }">{{::p}}</a>
       </li>
       <li><a ui-sref="{ page: page + 1 }">&raquo;</a></li>
     </ul>
+
   </nav>
 
   <div class="list-group">

handlers/library.go

@@ -5,17 +5,30 @@ import (
 	"fmt"
 	"net/http"
 	"path"
+	"sort"
 
 	"github.com/golang/glog"
 	"github.com/zefer/mothership/mpd"
 )
 
 type FileListEntry struct {
-	Path string `json:"path"`
-	Type string `json:"type"`
-	Base string `json:"base"`
+	Path         string `json:"path"`
+	Type         string `json:"type"`
+	Base         string `json:"base"`
+	LastModified string `json:"lastModified"`
 }
 
+type ByDate []*FileListEntry
+type ByName []*FileListEntry
+
+func (a ByDate) Len() int           { return len(a) }
+func (a ByDate) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a ByDate) Less(i, j int) bool { return a[i].LastModified < a[j].LastModified }
+
+func (a ByName) Len() int           { return len(a) }
+func (a ByName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a ByName) Less(i, j int) bool { return a[i].Path < a[j].Path }
+
 func FileListHandler(c *mpd.Client) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != "GET" {
@@ -32,14 +45,33 @@ func FileListHandler(c *mpd.Client) http.Handler {
 			for _, t := range []string{"file", "directory", "playlist"} {
 				if p, ok := item[t]; ok {
 					out[i] = &FileListEntry{
-						Path: p,
-						Type: t,
-						Base: path.Base(p),
+						Path:         p,
+						Type:         t,
+						Base:         path.Base(p),
+						LastModified: item["last-modified"],
 					}
 					break
 				}
 			}
 		}
+
+		// Sort the list by the specified field and direction.
+		s := r.FormValue("sort")
+		d := r.FormValue("direction")
+		if s == "date" {
+			if d == "desc" {
+				sort.Sort(sort.Reverse(ByDate(out)))
+			} else {
+				sort.Sort(ByDate(out))
+			}
+		} else {
+			if d == "desc" {
+				sort.Sort(sort.Reverse(ByName(out)))
+			} else {
+				sort.Sort(ByName(out))
+			}
+		}
+
 		b, err := json.Marshal(out)
 		w.Header().Add("Content-Type", "application/json")
 		fmt.Fprint(w, string(b))