hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-22 09:00:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix time parser for "ZZ" prefix

Browse Source 
I think this means UTC-08:00, but this just strips it since time
handling is pretty naïve already.
This commit is contained in:
Harvey Tindall 2021-03-23 16:10:25 +00:00
parent 1a6d78352c
commit fc6b6a9c6b
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/welcome.txt
View File

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

10
mediabrowser/models.go
View File

@ -20,7 +20,13 @@ func (t *Time) UnmarshalJSON(b []byte) (err error) {
str := strings.TrimSuffix(strings.TrimPrefix(string(b), "\""), "\"") str := strings.TrimSuffix(strings.TrimPrefix(string(b), "\""), "\"")
// Trim nanoseconds to always have 6 digits, so overall length is always the same. // Trim nanoseconds to always have 6 digits, so overall length is always the same.
if str[len(str)-1] == 'Z' { 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 { } else {
str = str[:26] str = str[:26]
} }
@ -39,7 +45,7 @@ func (t *Time) UnmarshalJSON(b []byte) (err error) {
return return
} }
fmt.Println("THIRDERR", err) 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 // some stored dates from jellyfin have no timezone at the end, if not we assume UTC
if str[len(str)-1] != 'Z' { if str[len(str)-1] != 'Z' {
str += "Z" str += "Z"