mirror of
https://github.com/taigrr/wtf
synced 2025-01-18 04:03:14 -08:00
Fix clocks module chronological sorting issue #98
`clock.LocalTime()` sets the location of a `time.Time` object, but doesn't change the point in time. Since `clock.LocalTime()` calls `time.Now()` to create the "local time", what ends up happening is that the first `LocalTime()` is always "before" the second one (because of the order of function calls), leading to unstable sorting. This change does two things to fix chronological sorting. The first is to add a `clock.ToLocal(time.Time)` function that acts like `clock.LocalTime()` for a given time point, so that a single stable time point can be used throughout sorting. The second is to do chronological sorting by comparing the string versions of the local time, which look like (for London vs. SF): 2018-06-01 19:48:26.591550198 +0100 BST vs. 2018-06-01 11:48:26.5915538 -0700 PDT There may be a better way, this feels hacky-ish but works for me on OSX. One remaining downside is that for locations in the same time zone (i.e. Avignon and Barcelona in the default settings), order is determined ~randomly on startup. You could maybe append the location to the string used for comparison to make alphabetical sorting a fallback for equivalent times, but at least they don't jump around anymore.
This commit is contained in:
parent
e4ce3975ae
commit
010c7ddbe0
@ -25,7 +25,11 @@ func (clock *Clock) Date() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (clock *Clock) LocalTime() time.Time {
|
func (clock *Clock) LocalTime() time.Time {
|
||||||
return time.Now().In(clock.Location)
|
return clock.ToLocal(time.Now())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (clock *Clock) ToLocal(t time.Time) time.Time {
|
||||||
|
return t.In(clock.Location)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (clock *Clock) Time() string {
|
func (clock *Clock) Time() string {
|
||||||
|
@ -2,6 +2,7 @@ package clocks
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"sort"
|
"sort"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ClockCollection struct {
|
type ClockCollection struct {
|
||||||
@ -28,10 +29,11 @@ func (clocks *ClockCollection) SortedAlphabetically() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (clocks *ClockCollection) SortedChronologically() {
|
func (clocks *ClockCollection) SortedChronologically() {
|
||||||
|
now := time.Now()
|
||||||
sort.Slice(clocks.Clocks, func(i, j int) bool {
|
sort.Slice(clocks.Clocks, func(i, j int) bool {
|
||||||
clock := clocks.Clocks[i]
|
clock := clocks.Clocks[i]
|
||||||
other := clocks.Clocks[j]
|
other := clocks.Clocks[j]
|
||||||
|
|
||||||
return clock.LocalTime().Before(other.LocalTime())
|
return clock.ToLocal(now).String() < other.ToLocal(now).String()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user