Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix json time when unmarshalling

Browse Source 
https://github.com/stashapp/stash/issues/25
This commit is contained in:
Stash Dev
2019-03-09 10:14:55 -08:00
parent f57c2bff1d
commit c4d45db30c
8 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/utils/date.go
View File

@@ -14,34 +14,34 @@ func GetYMDFromDatabaseDate(dateString string) string {
func ParseDateStringAsFormat(dateString string, format string) (string, error) {
t, e := ParseDateStringAsTime(dateString)
if t != nil {
if e == nil {
return t.Format(format), e
}
return "", fmt.Errorf("ParseDateStringAsFormat failed: dateString <%s>, format <%s>", dateString, format)
}
func ParseDateStringAsTime(dateString string) (*time.Time, error) {
func ParseDateStringAsTime(dateString string) (time.Time, error) {
// https://stackoverflow.com/a/20234207 WTF?
t, e := time.Parse(time.RFC3339, dateString)
if e == nil {
return &t, nil
return t, nil
}
t, e = time.Parse("2006-01-02", dateString)
if e == nil {
return &t, nil
return t, nil
}
t, e = time.Parse("2006-01-02 15:04:05", dateString)
if e == nil {
return &t, nil
return t, nil
}
t, e = time.Parse(railsTimeLayout, dateString)
if e == nil {
return &t, nil
return t, nil
}
return nil, fmt.Errorf("ParseDateStringAsTime failed: dateString <%s>", dateString)
return time.Time{}, fmt.Errorf("ParseDateStringAsTime failed: dateString <%s>", dateString)
}