Skip to content

fix(drivers/189): support updated time format from 189Cloud #2918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AmPlace wants to merge 2 commits into from
+149 −2
Closed

fix(drivers/189): support updated time format from 189Cloud #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bac76bb
fix(189pc): support new cloud time format
AmPlace Aug 11, 2026
eba0ae1
fix(189tv): support updated cloud time format
AmPlace Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion drivers/189_tv/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,15 @@ func (t *Time) UnmarshalXML(e *xml.Decoder, ee xml.StartElement) error {
}
func (t *Time) Unmarshal(b []byte) error {
bs := strings.Trim(string(b), "\"")
bs = strings.ReplaceAll(bs, "\u202f", " ")
bs = strings.ReplaceAll(bs, "\u00a0", " ")
var v time.Time
var err error
for _, f := range []string{"2006-01-02 15:04:05 -07", "Jan 2, 2006 15:04:05 PM -07"} {
for _, f := range []string{
"2006-01-02 15:04:05 -07",
"Jan 2, 2006 15:04:05 PM -07",
"Jan 2, 2006, 3:04:05 PM -07",
} {
v, err = time.ParseInLocation(f, bs+" +08", time.Local)
if err == nil {
break
Expand Down
70 changes: 70 additions & 0 deletions drivers/189_tv/help_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package _189_tv

import (
"testing"
"time"
)

func TestTimeUnmarshal(t *testing.T) {
tests := []struct {
name string
input string
want time.Time
}{
{
name: "numeric date",
input: "2026-08-12 03:32:44",
want: time.Date(2026, time.August, 12, 3, 32, 44, 0, time.Local),
},
{
name: "legacy month date",
input: "Aug 12, 2026 15:32:44 PM",
want: time.Date(2026, time.August, 12, 15, 32, 44, 0, time.Local),
},
{
name: "updated format with AM",
input: "Aug 12, 2026, 12:35:41 AM",
want: time.Date(2026, time.August, 12, 0, 35, 41, 0, time.Local),
},
{
name: "updated format with PM",
input: "Aug 12, 2026, 3:32:44 PM",
want: time.Date(2026, time.August, 12, 15, 32, 44, 0, time.Local),
},
{
name: "narrow no-break space",
input: "Aug 12, 2026, 3:32:44\u202fPM",
want: time.Date(2026, time.August, 12, 15, 32, 44, 0, time.Local),
},
{
name: "no-break space",
input: "Aug 12, 2026, 3:32:44\u00a0AM",
want: time.Date(2026, time.August, 12, 3, 32, 44, 0, time.Local),
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var got Time
if err := got.Unmarshal([]byte(tt.input)); err != nil {
t.Fatalf("Time.Unmarshal(%q) returned error: %v", tt.input, err)
}
gotTime := time.Time(got)
gotYear, gotMonth, gotDay := gotTime.Date()
wantYear, wantMonth, wantDay := tt.want.Date()
gotHour, gotMinute, gotSecond := gotTime.Clock()
wantHour, wantMinute, wantSecond := tt.want.Clock()
if gotYear != wantYear || gotMonth != wantMonth || gotDay != wantDay ||
gotHour != wantHour || gotMinute != wantMinute || gotSecond != wantSecond {
t.Fatalf("Time.Unmarshal(%q) = %v, want %v", tt.input, gotTime, tt.want)
}
})
}
}

func TestTimeUnmarshalRejectsInvalidTime(t *testing.T) {
var got Time
if err := got.Unmarshal([]byte("Aug 12, 2026, 25:32:44 PM")); err == nil {
t.Fatal("Time.Unmarshal accepted an invalid time")
}
}
8 changes: 7 additions & 1 deletion drivers/189pc/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,15 @@ func (t *Time) UnmarshalXML(e *xml.Decoder, ee xml.StartElement) error {
}
func (t *Time) Unmarshal(b []byte) error {
bs := strings.Trim(string(b), "\"")
bs = strings.ReplaceAll(bs, "\u202f", " ")
bs = strings.ReplaceAll(bs, "\u00a0", " ")
var v time.Time
var err error
for _, f := range []string{"2006-01-02 15:04:05 -07", "Jan 2, 2006 15:04:05 PM -07"} {
for _, f := range []string{
"2006-01-02 15:04:05 -07",
"Jan 2, 2006 15:04:05 PM -07",
"Jan 2, 2006, 3:04:05 PM -07",
} {
v, err = time.ParseInLocation(f, bs+" +08", time.Local)
if err == nil {
break
Expand Down
65 changes: 65 additions & 0 deletions drivers/189pc/help_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package _189pc

import (
"testing"
"time"
)

func TestTimeUnmarshal(t *testing.T) {
tests := []struct {
name string
input string
want time.Time
}{
{
name: "numeric date",
input: "2026-08-12 03:32:44",
want: time.Date(2026, time.August, 12, 3, 32, 44, 0, time.Local),
},
{
name: "legacy month date",
input: "Aug 12, 2026 15:32:44 PM",
want: time.Date(2026, time.August, 12, 15, 32, 44, 0, time.Local),
},
{
name: "updated month date",
input: "Aug 12, 2026, 3:32:44 AM",
want: time.Date(2026, time.August, 12, 3, 32, 44, 0, time.Local),
},
{
name: "narrow no-break space before meridiem",
input: "Aug 12, 2026, 3:32:44\u202fAM",
want: time.Date(2026, time.August, 12, 3, 32, 44, 0, time.Local),
},
{
name: "no-break space before meridiem",
input: "Aug 12, 2026, 3:32:44\u00a0AM",
want: time.Date(2026, time.August, 12, 3, 32, 44, 0, time.Local),
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var got Time
if err := got.Unmarshal([]byte(tt.input)); err != nil {
t.Fatalf("Time.Unmarshal(%q) returned error: %v", tt.input, err)
}
gotTime := time.Time(got)
gotYear, gotMonth, gotDay := gotTime.Date()
wantYear, wantMonth, wantDay := tt.want.Date()
gotHour, gotMinute, gotSecond := gotTime.Clock()
wantHour, wantMinute, wantSecond := tt.want.Clock()
if gotYear != wantYear || gotMonth != wantMonth || gotDay != wantDay ||
gotHour != wantHour || gotMinute != wantMinute || gotSecond != wantSecond {
t.Fatalf("Time.Unmarshal(%q) = %v, want %v", tt.input, gotTime, tt.want)
}
})
}
}

func TestTimeUnmarshalRejectsInvalidTime(t *testing.T) {
var got Time
if err := got.Unmarshal([]byte("Aug 12, 2026, 25:32:44 AM")); err == nil {
t.Fatal("Time.Unmarshal accepted an invalid time")
}
}