From 1a3c62bb8f5db549d7e272c54795e66c2a5d8f6e Mon Sep 17 00:00:00 2001 From: Jiaheng Sun Date: Wed, 30 Oct 2024 11:24:26 +0800 Subject: [PATCH 1/6] small change to try --- go.sum | 4 ++-- ics/generate.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.sum b/go.sum index 231cdd6..d75840f 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,8 @@ github.com/neucn/neugo v0.2.0 h1:aOzLQWJ9FZmTpciKedaHIuA3w05IjJ3yPpemWTFKYCM= github.com/neucn/neugo v0.2.0/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= github.com/neucn/neugo v0.2.1 h1:nIh+LYEyqyOeiFZnvbNMbfFB0+h4wCUlfqQAgSu9Uoc= github.com/neucn/neugo v0.2.1/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= -github.com/neucn/neugo v0.3.0 h1:JwNAYgXA3GxJ01iGggps+yqJPqyAOp91PjnO/fQLRMg= -github.com/neucn/neugo v0.3.0/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= +github.com/neucn/neugo v0.4.0 h1:JwNAYgXA3GxJ01iGggps+yqJPqyAOp91PjnO/fQLRMg= +github.com/neucn/neugo v0.4.0/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= diff --git a/ics/generate.go b/ics/generate.go index 8f64e8d..f499caf 100644 --- a/ics/generate.go +++ b/ics/generate.go @@ -79,7 +79,7 @@ var classEndTimeNanhu = []string{ } // ics文件用到的星期几简称 -var dayOfWeek = []string{"MO", "TU", "WE", "TH", "FR", "SA", "SU"} +var dayOfWeek = []string{"SU", "MO", "TU", "WE", "TH", "FR", "SA"} // 导出ICS格式的课程表 func Generate(courses []*elise.Course, startDay time.Time, output string) (string, error) { From 5db2188b4d0393386dc3b3aa379292b88f1245f1 Mon Sep 17 00:00:00 2001 From: Jiaheng Sun Date: Wed, 30 Oct 2024 11:35:24 +0800 Subject: [PATCH 2/6] changes to mod --- go.mod | 4 ++-- go.sum | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index feeff34..6343b6b 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/neucn/elise go 1.23.0 require ( - github.com/google/uuid v1.1.2 - github.com/neucn/neugo v0.3.0 + github.com/google/uuid v1.6.0 + github.com/neucn/neugo v0.4.0 ) diff --git a/go.sum b/go.sum index d75840f..b4fdee0 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,16 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/neucn/neugo v0.2.0 h1:aOzLQWJ9FZmTpciKedaHIuA3w05IjJ3yPpemWTFKYCM= github.com/neucn/neugo v0.2.0/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= github.com/neucn/neugo v0.2.1 h1:nIh+LYEyqyOeiFZnvbNMbfFB0+h4wCUlfqQAgSu9Uoc= github.com/neucn/neugo v0.2.1/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= -github.com/neucn/neugo v0.4.0 h1:JwNAYgXA3GxJ01iGggps+yqJPqyAOp91PjnO/fQLRMg= -github.com/neucn/neugo v0.4.0/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= +github.com/neucn/neugo v0.3.0 h1:JwNAYgXA3GxJ01iGggps+yqJPqyAOp91PjnO/fQLRMg= +github.com/neucn/neugo v0.3.0/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= +github.com/neucn/neugo v0.4.0 h1:2zsVBIaJvMNf/nPH/0SINP18E+wobFZ3MhvfCbZuXkU= +github.com/neucn/neugo v0.4.0/go.mod h1:58gIwIAZVecSpRPcDgEsMR3uwu77V7ryywDnv/OgYDI= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= From b39c458446d4ffcf7f7fc1e1bca524bc32fdc1e6 Mon Sep 17 00:00:00 2001 From: Jiaheng Sun Date: Wed, 30 Oct 2024 15:23:19 +0800 Subject: [PATCH 3/6] fix small bug --- generator.go | 7 ++++--- ics/generate.go | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/generator.go b/generator.go index 6cf1f95..285c110 100644 --- a/generator.go +++ b/generator.go @@ -38,6 +38,7 @@ func (s *session) Generate(generateFunc GenerateFunc, output string) (path strin } startDay := getSemesterStartDay(week) + fmt.Println("学期开始日期为", startDay.Format("2006-01-02")) fmt.Println("当前为第", week, "教学周") fmt.Println("计算得到本学期开始于", startDay.Format("2006-01-02")) fmt.Println("官方校历 http://www.neu.edu.cn/xl/list.htm") @@ -136,9 +137,9 @@ func New(username, password string, webVPN bool) (Generator, error) { var platform neugo.Platform if webVPN { platform = neugo.WebVPN - s.currentWeekUrl = neugo.EncryptToWebVPN(defaultCurrentWeekUrl) - s.courseTableUrl = neugo.EncryptToWebVPN(defaultCourseTableUrl) - s.courseTableActionUrl = neugo.EncryptToWebVPN(defaultCourseTableActionUrl) + s.currentWeekUrl = neugo.EncryptURLToWebVPN(defaultCurrentWeekUrl) + s.courseTableUrl = neugo.EncryptURLToWebVPN(defaultCourseTableUrl) + s.courseTableActionUrl = neugo.EncryptURLToWebVPN(defaultCourseTableActionUrl) } else { platform = neugo.CAS s.currentWeekUrl = defaultCurrentWeekUrl diff --git a/ics/generate.go b/ics/generate.go index f499caf..bd229a6 100644 --- a/ics/generate.go +++ b/ics/generate.go @@ -79,11 +79,12 @@ var classEndTimeNanhu = []string{ } // ics文件用到的星期几简称 -var dayOfWeek = []string{"SU", "MO", "TU", "WE", "TH", "FR", "SA"} +var dayOfWeek = []string{"MO", "TU", "WE", "TH", "FR", "SA", "SU"} // 导出ICS格式的课程表 func Generate(courses []*elise.Course, startDay time.Time, output string) (string, error) { // 生成ics文件头 + fmt.Println("开始日期", startDay.Format("2006-01-02")) var icsData string icsData = `BEGIN:VCALENDAR PRODID:-//nian//getMyCourses 20190522//EN @@ -95,6 +96,7 @@ X-WR-TIMEZONE:Asia/Shanghai BEGIN:VTIMEZONE TZID:Asia/Shanghai X-LIC-LOCATION:Asia/Shanghai +WKST=SU BEGIN:STANDARD TZOFFSETFROM:+0800 TZOFFSETTO:+0800 @@ -177,7 +179,7 @@ END:VTIMEZONE` + "\n" for i := 0; i < len(periods); i++ { var eventData string eventData = `BEGIN:VEVENT` + "\n" - startDate := startDay.AddDate(0, 0, (startWeek[i]-1)*7+weekDay+1) + startDate := startDay.AddDate(0, 0, (startWeek[i]-1)*7+(weekDay+1)%7) if strings.Contains(course.RoomName, "浑南") { eventData = eventData + `DTSTART;TZID=Asia/Shanghai:` + startDate.Format("20060102T") + ClassStartTimeHunnan[st] + "\n" From 7c2afb3664895d3eb29b497d7bf26008498b52c7 Mon Sep 17 00:00:00 2001 From: Jiaheng Sun Date: Wed, 30 Oct 2024 15:25:16 +0800 Subject: [PATCH 4/6] changes --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a08655d..4b3453b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea/ -courses.ics \ No newline at end of file +courses.ics +*.exe \ No newline at end of file From 3e759e7d242289383dd0e3f854163952d59174cb Mon Sep 17 00:00:00 2001 From: Jiaheng Sun Date: Fri, 1 Nov 2024 09:03:49 +0800 Subject: [PATCH 5/6] update to v0.4.1 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6343b6b..4e9c223 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.23.0 require ( github.com/google/uuid v1.6.0 - github.com/neucn/neugo v0.4.0 + github.com/neucn/neugo v0.4.1 ) diff --git a/go.sum b/go.sum index b4fdee0..ac37735 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,8 @@ github.com/neucn/neugo v0.3.0 h1:JwNAYgXA3GxJ01iGggps+yqJPqyAOp91PjnO/fQLRMg= github.com/neucn/neugo v0.3.0/go.mod h1:sKga4X9FF5N5ApwXxv+7RyqXZPDiBztj27PJX5r4wa8= github.com/neucn/neugo v0.4.0 h1:2zsVBIaJvMNf/nPH/0SINP18E+wobFZ3MhvfCbZuXkU= github.com/neucn/neugo v0.4.0/go.mod h1:58gIwIAZVecSpRPcDgEsMR3uwu77V7ryywDnv/OgYDI= +github.com/neucn/neugo v0.4.1 h1:Hj8V7KanJ/s4N4lLbmQE4g5pQTK4A6Mn6ruKeboSGUI= +github.com/neucn/neugo v0.4.1/go.mod h1:58gIwIAZVecSpRPcDgEsMR3uwu77V7ryywDnv/OgYDI= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= From 031049f81935279b2697cb1187059993b8b103c7 Mon Sep 17 00:00:00 2001 From: Jiaheng Sun Date: Fri, 1 Nov 2024 09:06:44 +0800 Subject: [PATCH 6/6] remove some debug message --- generator.go | 1 - ics/generate.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/generator.go b/generator.go index 285c110..a0a50b5 100644 --- a/generator.go +++ b/generator.go @@ -38,7 +38,6 @@ func (s *session) Generate(generateFunc GenerateFunc, output string) (path strin } startDay := getSemesterStartDay(week) - fmt.Println("学期开始日期为", startDay.Format("2006-01-02")) fmt.Println("当前为第", week, "教学周") fmt.Println("计算得到本学期开始于", startDay.Format("2006-01-02")) fmt.Println("官方校历 http://www.neu.edu.cn/xl/list.htm") diff --git a/ics/generate.go b/ics/generate.go index bd229a6..83af112 100644 --- a/ics/generate.go +++ b/ics/generate.go @@ -84,7 +84,6 @@ var dayOfWeek = []string{"MO", "TU", "WE", "TH", "FR", "SA", "SU"} // 导出ICS格式的课程表 func Generate(courses []*elise.Course, startDay time.Time, output string) (string, error) { // 生成ics文件头 - fmt.Println("开始日期", startDay.Format("2006-01-02")) var icsData string icsData = `BEGIN:VCALENDAR PRODID:-//nian//getMyCourses 20190522//EN @@ -96,7 +95,6 @@ X-WR-TIMEZONE:Asia/Shanghai BEGIN:VTIMEZONE TZID:Asia/Shanghai X-LIC-LOCATION:Asia/Shanghai -WKST=SU BEGIN:STANDARD TZOFFSETFROM:+0800 TZOFFSETTO:+0800