Fix time parser for "ZZ" prefix

I think this means UTC-08:00, but this just strips it since time
handling is pretty naïve already.
pull/75/head
Harvey Tindall 4 years ago
parent 1a6d78352c
commit fc6b6a9c6b
No known key found for this signature in database
GPG Key ID: BBC65952848FB1A2

@ -3,6 +3,7 @@
{{ .youCanLoginWith }}:
{{ .jellyfinURLString }}: {{ .jellyfinURL }}
{{ .usernameString }}: {{ .username }}

@ -20,7 +20,13 @@ func (t *Time) UnmarshalJSON(b []byte) (err error) {
str := strings.TrimSuffix(strings.TrimPrefix(string(b), "\""), "\"")
// Trim nanoseconds to always have 6 digits, so overall length is always the same.
if str[len(str)-1] == 'Z' {
str = str[:26] + "Z"
if str[len(str)-2] == 'Z' {
/* From #69, "ZZ" is sometimes used, meaning UTC-8:00.
TZ doesn't really matter to us, so we'll pretend it's UTC. */
str = str[:25] + "0Z"
} else {
str = str[:26] + "Z"
}
} else {
str = str[:26]
}
@ -39,7 +45,7 @@ func (t *Time) UnmarshalJSON(b []byte) (err error) {
return
}
fmt.Println("THIRDERR", err)
// magic method
// if all else fails, just do whatever would usually be done.
// some stored dates from jellyfin have no timezone at the end, if not we assume UTC
if str[len(str)-1] != 'Z' {
str += "Z"

Loading…
Cancel
Save