From dc0aab172de264a8600f537b67ca48f3c32cb6af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?=
 <lilian.jonsdottir@gmail.com>
Date: Mon, 15 Jul 2024 15:07:39 -0700
Subject: [PATCH] use standard library right

---
 internal/files/files.go | 67 +++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/internal/files/files.go b/internal/files/files.go
index a050984..4191ef3 100644
--- a/internal/files/files.go
+++ b/internal/files/files.go
@@ -1,7 +1,10 @@
 // Package files finds and displays files on disk
 package files
 
-import "time"
+import (
+	"cmp"
+	"time"
+)
 
 type File interface {
 	Name() string
@@ -14,16 +17,6 @@ type File interface {
 type Files []File
 
 func SortByModified(a, b File) int {
-	if a.Date().After(b.Date()) {
-		return 1
-	} else if a.Date().Before(b.Date()) {
-		return -1
-	} else {
-		return 0
-	}
-}
-
-func SortByModifiedReverse(a, b File) int {
 	if a.Date().Before(b.Date()) {
 		return 1
 	} else if a.Date().After(b.Date()) {
@@ -33,60 +26,54 @@ func SortByModifiedReverse(a, b File) int {
 	}
 }
 
-func SortBySize(a, b File) int {
-	if a.Filesize() > b.Filesize() {
+func SortByModifiedReverse(a, b File) int {
+	if a.Date().After(b.Date()) {
 		return 1
-	} else if a.Filesize() < b.Filesize() {
+	} else if a.Date().Before(b.Date()) {
 		return -1
 	} else {
 		return 0
 	}
 }
 
+func SortBySize(a, b File) int {
+	return cmp.Compare(b.Filesize(), a.Filesize())
+}
+
 func SortBySizeReverse(a, b File) int {
-	if a.Filesize() < b.Filesize() {
-		return 1
-	} else if a.Filesize() > b.Filesize() {
-		return -1
-	} else {
-		return 0
-	}
+	return cmp.Compare(a.Filesize(), b.Filesize())
 }
 
 func SortByName(a, b File) int {
-	if a.Name() > b.Name() {
-		return 1
-	} else if a.Name() < b.Name() {
-		return -1
-	} else {
-		return 0
-	}
+	return cmp.Compare(a.Name(), b.Name())
 }
 
 func SortByNameReverse(a, b File) int {
-	if a.Name() < b.Name() {
-		return 1
-	} else if a.Name() > b.Name() {
-		return -1
-	} else {
-		return 0
-	}
+	return cmp.Compare(b.Name(), a.Name())
 }
 
 func SortByPath(a, b File) int {
-	if a.Path() > b.Path() {
+	return cmp.Compare(a.Path(), b.Path())
+}
+
+func SortByPathReverse(a, b File) int {
+	return cmp.Compare(b.Path(), a.Path())
+}
+
+func SortDirectoriesFirst(a, b File) int {
+	if !a.IsDir() && b.IsDir() {
 		return 1
-	} else if a.Path() < b.Path() {
+	} else if a.IsDir() && !b.IsDir() {
 		return -1
 	} else {
 		return 0
 	}
 }
 
-func SortByPathReverse(a, b File) int {
-	if a.Path() < b.Path() {
+func SortDirectoriesLast(a, b File) int {
+	if a.IsDir() && !b.IsDir() {
 		return 1
-	} else if a.Path() > b.Path() {
+	} else if !a.IsDir() && b.IsDir() {
 		return -1
 	} else {
 		return 0