fs: Implement Scan method for SizeSuffix and Duration

fs/parseduration.go

@@ -1,6 +1,8 @@
 package fs
 
 import (
+	"fmt"
+	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -17,6 +19,13 @@ func (d Duration) String() string {
 	if d == DurationOff {
 		return "off"
 	}
+	for i := len(ageSuffixes) - 2; i >= 0; i-- {
+		ageSuffix := &ageSuffixes[i]
+		if math.Abs(float64(d)) >= float64(ageSuffix.Multiplier) {
+			timeUnits := float64(d) / float64(ageSuffix.Multiplier)
+			return strconv.FormatFloat(timeUnits, 'f', -1, 64) + ageSuffix.Suffix
+		}
+	}
 	return time.Duration(d).String()
 }
 
@@ -30,10 +39,6 @@ var ageSuffixes = []struct {
 	Suffix     string
 	Multiplier time.Duration
 }{
-	{Suffix: "ms", Multiplier: time.Millisecond},
-	{Suffix: "s", Multiplier: time.Second},
-	{Suffix: "m", Multiplier: time.Minute},
-	{Suffix: "h", Multiplier: time.Hour},
 	{Suffix: "d", Multiplier: time.Hour * 24},
 	{Suffix: "w", Multiplier: time.Hour * 24 * 7},
 	{Suffix: "M", Multiplier: time.Hour * 24 * 30},
@@ -51,6 +56,12 @@ func ParseDuration(age string) (time.Duration, error) {
 		return time.Duration(DurationOff), nil
 	}
 
+	// Attempt to parse as a time.Duration first
+	d, err := time.ParseDuration(age)
+	if err == nil {
+		return d, nil
+	}
+
 	for _, ageSuffix := range ageSuffixes {
 		if strings.HasSuffix(age, ageSuffix.Suffix) {
 			numberString := age[:len(age)-len(ageSuffix.Suffix)]
@@ -81,3 +92,12 @@ func (d *Duration) Set(s string) error {
 func (d Duration) Type() string {
 	return "duration"
 }
+
+// Scan implements the fmt.Scanner interface
+func (d *Duration) Scan(s fmt.ScanState, ch rune) error {
+	token, err := s.Token(true, nil)
+	if err != nil {
+		return err
+	}
+	return d.Set(string(token))
+}