From 81c6f396fea746a0ec55cfe924b9bdcad8d37c2e Mon Sep 17 00:00:00 2001
From: Nuno Cruces <ncruces@users.noreply.github.com>
Date: Wed, 30 Mar 2022 19:27:54 +0100
Subject: [PATCH] Date formatting fix.

---
 internal/strftime/parser.go   | 12 ++++++------
 internal/strftime/strftime.go | 21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/internal/strftime/parser.go b/internal/strftime/parser.go
index 141f233..bd0dbea 100644
--- a/internal/strftime/parser.go
+++ b/internal/strftime/parser.go
@@ -32,18 +32,18 @@ func (p *parser) parse() error {
 				state = nopadding
 				continue
 			}
-			if s, ok := p.specs[b]; ok {
-				err = p.writeFmt(s)
+			if fmt, ok := p.specs[b]; ok {
+				err = p.writeFmt(fmt)
 			} else {
 				err = p.fallback(b, true)
 			}
 			state = initial
 
 		case nopadding:
-			if s, ok := p.unpadded[b]; ok {
-				err = p.writeFmt(s)
-			} else if s, ok := p.specs[b]; ok {
-				err = p.writeFmt(s)
+			if fmt, ok := p.unpadded[b]; ok {
+				err = p.writeFmt(fmt)
+			} else if fmt, ok := p.specs[b]; ok {
+				err = p.writeFmt(fmt)
 			} else {
 				err = p.fallback(b, false)
 			}
diff --git a/internal/strftime/strftime.go b/internal/strftime/strftime.go
index 88ea218..1db0bd8 100644
--- a/internal/strftime/strftime.go
+++ b/internal/strftime/strftime.go
@@ -19,10 +19,10 @@ func Format(fmt string, t time.Time) string {
 
 	parser.writeFmt = func(fmt string) error {
 		switch fmt {
-		default:
-			res.WriteString(t.Format(fmt))
 		case "000", "000000", "000000000":
 			res.WriteString(t.Format("." + fmt)[1:])
+		default:
+			res.WriteString(t.Format(fmt))
 		}
 		return nil
 	}
@@ -80,14 +80,21 @@ func Layout(fmt string) (string, error) {
 
 	parser.writeLit = func(b byte) error {
 		if bytes.IndexByte([]byte("MonJan_0123456789"), b) >= 0 {
-			return errors.New("strftime: unsupported literal: " + string(b))
+			return errors.New("strftime: unsupported literal: '" + string(b) + "'")
 		}
 		res.WriteByte(b)
 		return nil
 	}
 
-	parser.writeFmt = func(s string) error {
-		res.WriteString(s)
+	parser.writeFmt = func(fmt string) error {
+		switch fmt {
+		case "000", "000000", "000000000":
+			res := res.String()
+			if len := len(res); len <= 0 || res[len-1] != '.' && res[len-1] != ',' {
+				return errors.New("strftime: unsupported specifier: fractional seconds must follow '.' or ','")
+			}
+		}
+		res.WriteString(fmt)
 		return nil
 	}
 
@@ -126,12 +133,12 @@ func UTS35(fmt string) (string, error) {
 		return nil
 	}
 
-	parser.writeFmt = func(s string) error {
+	parser.writeFmt = func(fmt string) error {
 		if literal {
 			literal = false
 			res.WriteByte(quote)
 		}
-		res.WriteString(s)
+		res.WriteString(fmt)
 		return nil
 	}