evan/zenity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unpadded dates.

Browse source
This commit is contained in:
Nuno Cruces 2022-03-29 14:09:01 +01:00
parent 198d2504fe
commit ef114d19a8
2 changed files with 128 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
date_test.go
View file

@ -8,6 +8,7 @@ import (
"time"
"github.com/ncruces/zenity"
"go.uber.org/goleak"
)
func ExampleCalendar() {
@ -17,21 +18,28 @@ func ExampleCalendar() {
}
func TestCalendarTimeout(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second/10)
defer goleak.VerifyNone(t)
ctx, cancel := context.WithTimeout(context.Background(), time.Second/5)
defer cancel()
_, err := zenity.Calendar("", zenity.Context(ctx))
if skip, err := skip(err); skip {
t.Skip("skipping:", err)
}
if !os.IsTimeout(err) {
t.Error("did not timeout:", err)
}
cancel()
}
func TestCalendarCancel(t *testing.T) {
defer goleak.VerifyNone(t)
ctx, cancel := context.WithCancel(context.Background())
cancel()
_, err := zenity.Calendar("", zenity.Context(ctx))
if skip, err := skip(err); skip {
t.Skip("skipping:", err)
}
if !errors.Is(err, context.Canceled) {
t.Error("was not canceled:", err)
}

99
internal/zenutil/date.go
View file

@ -2,8 +2,10 @@ package zenutil
import "strings"
// https://strftime.org/
var strftimeTable = map[byte]string{
// Strftime is internal.
func Strftime(fmt string) string {
// https://strftime.org/
return strftime(fmt, map[byte]string{
'B': "January",
'b': "Jan",
'h': "Jan",
@ -24,8 +26,9 @@ var strftimeTable = map[byte]string{
'z': "-0700",
'L': "000",
'f': "000000",
'N': "000000000",
'+': "Mon Jan _2 03:04:05 PM MST 2006",
'+': "Mon Jan _2 15:04:05 MST 2006",
'c': "Mon Jan _2 15:04:05 2006",
'F': "2006-01-02",
'D': "01/02/06",
@ -38,45 +41,19 @@ var strftimeTable = map[byte]string{
'%': "%",
't': "\t",
'n': LineBreak,
}, map[byte]string{
'm': "1",
'd': "2",
'I': "3",
'M': "4",
'S': "5",
})
}
// Strftime is internal.
func Strftime(fmt string) string {
var res strings.Builder
res.Grow(len(fmt))
const (
initial = iota
special
)
state := initial
for _, b := range []byte(fmt) {
switch state {
case initial:
if b == '%' {
state = special
} else {
res.WriteByte(b)
state = initial
}
case special:
s, ok := strftimeTable[b]
if ok {
res.WriteString(s)
} else {
res.WriteByte(b)
}
state = initial
}
}
return res.String()
}
// https://nsdateformatter.com/
var strftimeUTS35Table = map[byte]string{
// StrftimeUTS35 is internal.
func StrftimeUTS35(fmt string) string {
// https://nsdateformatter.com/
return strftime(fmt, map[byte]string{
'B': "MMMM",
'b': "MMM",
'h': "MMM",
@ -99,8 +76,9 @@ var strftimeUTS35Table = map[byte]string{
'z': "Z",
'L': "SSS",
'f': "SSSSSS",
'N': "SSSSSSSSS",
'+': "E MMM d hh:mm:ss a zzz yyyy",
'+': "E MMM d HH:mm:ss zzz yyyy",
'c': "E MMM d HH:mm:ss yyyy",
'F': "yyyy-MM-dd",
'D': "MM/dd/yy",
@ -113,16 +91,25 @@ var strftimeUTS35Table = map[byte]string{
'%': "%",
't': "\t",
'n': LineBreak,
}, map[byte]string{
'm': "M",
'd': "d",
'j': "D",
'H': "H",
'I': "h",
'M': "m",
'S': "s",
})
}
// StrftimeUTS35 is internal.
func StrftimeUTS35(fmt string) string {
func strftime(fmt string, formats, unpadded map[byte]string) string {
var res strings.Builder
res.Grow(len(fmt))
const (
initial = iota
special
padding
)
state := initial
@ -133,19 +120,39 @@ func StrftimeUTS35(fmt string) string {
state = special
} else {
res.WriteByte(b)
state = initial
}
case special:
s, ok := strftimeUTS35Table[b]
if ok {
if b == '-' {
state = padding
continue
}
if s, ok := formats[b]; ok {
res.WriteString(s)
} else {
res.WriteByte('%')
res.WriteByte(b)
}
state = initial
case padding:
if s, ok := unpadded[b]; ok {
res.WriteString(s)
} else if s, ok := formats[b]; ok {
res.WriteString(s)
} else {
res.WriteString("%-")
res.WriteByte(b)
}
state = initial
}
}
switch state {
case padding:
res.WriteString("%-")
case special:
res.WriteByte('%')
}
return res.String()
}