better file sorting

Author: Peter Klaesson

frontend/src/components/File.vue

@@ -9,7 +9,7 @@
   </div>
 </template>
 <script>
-export default{
+export default {
   props: ['file'],
   computed: {
     selected () {
@@ -38,12 +38,12 @@ export default{
       }
       return this.formatSize((size / 1125899906842624)) + 'PB'
     },
-    formatSize(size) {
-      var formatted = size.toString(10).substr(0,4)
+    formatSize (size) {
+      var formatted = size.toString(10).substr(0, 4)
 
       return formatted[3] === '.'
-      ? formatted.substr(0,3)
-      : formatted
+        ? formatted.substr(0, 3)
+        : formatted
     },
     modified (date) {
       return new Date(date).toLocaleString()

frontend/src/components/FileView.vue

@@ -38,7 +38,7 @@ import FileHeader from './FileHeader.vue'
 import { Rpc } from '../rpc.js'
 import { EventBus } from '../EventBus'
 
-export default{
+export default {
   props: ['id'],
   data: () => {
     return {
@@ -140,17 +140,19 @@ export default{
       this.loading = true
       Rpc.call('ls', [this.selectedRoot + this.pathString])
         .then((response) => {
-          let files = response.result.filter((file) => {
-            return file.type === 'd'
-          }).concat(
-            response.result.filter((file) => {
-              return file.type === 'f'
+          let files = response.result.filter((file) => { return file.type === 'd' })
+          files.sort((a, b) => a.name.localeCompare(b.name))
+
+          let directories = response.result.filter((file) => { return file.type === 'f' })
+          directories.sort((a, b) => a.name.localeCompare(b.name))
+
+          files = files.concat(directories)
+            .map(file => {
+              file.selected = false
+              file.focused = false
+              return file
             })
-          ).map(file => {
-            file.selected = false
-            file.focused = false
-            return file
-          })
+
           vm.loading = false
           this.$store.state.views[this.id].files = files
         })

server/commands/Ls.go

@@ -5,8 +5,8 @@ import (
 	"time"
 )
 
-func (command Command) Ls() ([]File, error){
-	if err := command.validateUnaryParameters(); err != nil{
+func (command Command) Ls() ([]File, error) {
+	if err := command.validateUnaryParameters(); err != nil {
 		return nil, err
 	}
 	return ls(command.Params[0])
@@ -19,7 +19,7 @@ func ls(directory string) ([]File, error) {
 	}
 
 	files, _ := ioutil.ReadDir(path)
-	response := []File{}
+	var response []File
 
 	for _, file := range files {
 		f := File{Name: file.Name(), Size: file.Size(), Modified: file.ModTime()}
@@ -34,8 +34,8 @@ func ls(directory string) ([]File, error) {
 }
 
 type File struct {
-	Type string `json:"type"`
-	Name string `json:"name"`
+	Type     string    `json:"type"`
+	Name     string    `json:"name"`
 	Modified time.Time `json:"modified"`
-	Size int64 `json:"size"`
+	Size     int64     `json:"size"`
 }