From 038981347e44b65742f90c3328fb3bb0a359a400 Mon Sep 17 00:00:00 2001
From: Emmanuel Odeke <emm.odeke@gmail.com>
Date: Sun, 28 Aug 2016 04:44:37 -0700
Subject: [PATCH] sort: fixed sorters to be split by comma

Fixes https://github.com/odeke-em/drive/issues/714.

Sort attributes passed in from the commandline are csv values e.g
```shell
$ drive list -sort name_r,modtime
```

The bug previously was that these values were actually never getting
split by comma values, in cmd/drive/main. This CL ensures that we
do the necessary splitting and whitespace trimming before we
make the sorters.

It also updates the CLI doc on sort:
* Before
```shell
$ drive list -sort
  -sort string
      sort items in the order
  * md5.
  * name.
  * size.
  * type.
  * version
```

* After
```shell
$ drive list -sort
  -sort string
      sort items by a combination of attributes
  * modtime.
  * md5.
  * name.
  * size.
  * type.
  * version
```
---
 src/help.go |  2 +-
 src/list.go | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/help.go b/src/help.go
index a7abcb17..a1f991d2 100644
--- a/src/help.go
+++ b/src/help.go
@@ -163,7 +163,7 @@ const (
 		"\n\t* Are on a low power device"
 	DescIgnoreConflict               = "turns off the conflict resolution safety"
 	DescIgnoreNameClashes            = "ignore name clashes"
-	DescSort                         = "sort items in the order\n\t* md5.\n\t* name.\n\t* size.\n\t* type.\n\t* version"
+	DescSort                         = "sort items by a combination of attributes\n\t* modtime.\n\t* md5.\n\t* name.\n\t* size.\n\t* type.\n\t* version\ncomma separated e.g modtime,md5_r,name"
 	DescSkipMime                     = "skip elements with mimeTypes derived from these extensions"
 	DescMatchMime                    = "get elements with the exact mimeTypes derived from extensions"
 	DescMatchTitle                   = "elements with matching titles"
diff --git a/src/list.go b/src/list.go
index 82e7d55b..9c63170c 100644
--- a/src/list.go
+++ b/src/list.go
@@ -39,17 +39,30 @@ type traversalSt struct {
 	matchQuery       *matchQuery
 }
 
-func sorters(opts *Options) (sortKeys []string) {
+func sorters(opts *Options) []string {
 	if opts == nil || opts.Meta == nil {
-		return
+		return nil
 	}
 
 	meta := *(opts.Meta)
 	retr, ok := meta[SortKey]
 	if !ok {
-		return
+		return nil
+	}
+
+	// Keys sent it via meta need to be comma split
+	// first, space trimmed then added.
+	// See Issue https://github.com/odeke-em/drive/issues/714.
+	var sortKeys []string
+	for _, attr := range retr {
+		splits := strings.Split(attr, ",")
+		for _, split := range splits {
+			trimmedAttr := strings.TrimSpace(split)
+			sortKeys = append(sortKeys, trimmedAttr)
+		}
 	}
-	return retr
+
+	return sortKeys
 }
 
 func (g *Commands) ListMatches() error {