fix: zjooc and cx can be chosen now

BaiMeow · BaiMeow · commit e41491b8e530 · 2022-11-10T21:06:47.000+08:00
diff --git a/collector/collector.go b/collector/collector.go
@@ -0,0 +1,47 @@
+package collector
+
+type collector[T any] struct {
+	Add          chan T
+	todo         []T
+	errs         []error
+	ErrCollector chan error
+	done         chan struct{}
+}
+
+func New[T any]() *collector[T] {
+	c := collector[T]{
+		Add:          make(chan T, 8),
+		todo:         make([]T, 0, 4),
+		ErrCollector: make(chan error, 8),
+		done:         make(chan struct{}),
+	}
+	go func() {
+		for {
+			select {
+			case <-c.done:
+				return
+			case a := <-c.Add:
+				c.todo = append(c.todo, a)
+			}
+		}
+	}()
+	go func() {
+		for {
+			select {
+			case err := <-c.ErrCollector:
+				if err != nil {
+					c.errs = append(c.errs, err)
+				}
+			case <-c.done:
+				return
+			}
+		}
+	}()
+	return &c
+}
+
+func (c *collector[T]) Done() ([]T, []error) {
+	c.done <- struct{}{}
+	c.done <- struct{}{}
+	return c.todo, c.errs
+}
diff --git a/cx.go b/cx.go
@@ -1,14 +1,14 @@
 package main
 
 import (
+	"ddl-api/collector"
 	"errors"
 	"fmt"
 	cx "github.com/hduLib/hdu/chaoxing"
-	"github.com/hduLib/hdu/client"
 	"sync"
 )
 
-func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
+func GettingCxddl(account, passwd, Type string) ([]DDL, []error) {
 	var user *cx.Cx
 	var err error
 	if Type == "cx" {
@@ -29,10 +29,7 @@ func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
 	if err != nil {
 		return nil, []error{fmt.Errorf("get course list fail:%v", err)}
 	}
-
-	var todo []ddl
-	errCollector := make(chan error, 8)
-	add := make(chan ddl, 8)
+	collect := collector.New[DDL]()
 	wg := &sync.WaitGroup{}
 	for _, course := range list.Courses {
 		course := course
@@ -41,28 +38,20 @@ func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
 			defer wg.Done()
 			c, err := course.Detail()
 			if err != nil {
-				if err, ok := err.(*client.ErrNotOk); ok {
-					errCollector <- fmt.Errorf("fail to get course detail:status code %d: %s", err.StatusCode, err.Body)
-					return
-				}
-				errCollector <- fmt.Errorf("fail to get course detail:%v", err)
+				collect.ErrCollector <- fmt.Errorf("fail to get course detail:%v", err)
 				return
 			}
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
 				workList, err := c.WorkList()
 				if err != nil {
-					if err, ok := err.(*client.ErrNotOk); ok {
-						errCollector <- fmt.Errorf("fail to get work list:status code %d: %s", err.StatusCode, err.Body)
-						return
-					}
-					errCollector <- fmt.Errorf("fail to get work list:%v", err)
+					collect.ErrCollector <- fmt.Errorf("fail to get work list:%v", err)
 					return
 				}
 				for _, v := range workList.Works {
 					if v.Status == "未交" && v.Time.Unix() != 0 {
-						add <- ddl{
+						collect.Add <- DDL{
 							course.Title, v.Title, v.Time.Unix(), "作业", "超星",
 						}
 					}
@@ -73,51 +62,19 @@ func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
 				defer wg.Done()
 				examList, err := c.ExamList()
 				if err != nil {
-					errCollector <- fmt.Errorf("fail to get exam list:%v", err)
+					collect.ErrCollector <- fmt.Errorf("fail to get exam list:%v", err)
 					return
 				}
 				for _, v := range examList.Exams {
 					if v.Status == "待做" {
-						add <- ddl{
+						collect.Add <- DDL{
 							course.Title, v.Title, v.Time.Unix(), "考试", "超星",
 						}
 					}
 				}
 			}()
 		}()
 	}
-	// collector
-	Done := make(chan struct{})
-	go func() {
-		for {
-			select {
-			case <-Done:
-				return
-			case a := <-add:
-				todo = append(todo, a)
-			}
-		}
-	}()
-	// fmt.Println("tasks:", tasks)
-	var errs []error
-	go func() {
-		for {
-			select {
-			case err := <-errCollector:
-				if err != nil {
-					errs = append(errs, err)
-				}
-			case <-Done:
-				return
-			}
-		}
-	}()
 	wg.Wait()
-	// close 2 goroutine
-	Done <- struct{}{}
-	Done <- struct{}{}
-	if errs != nil {
-		return nil, errs
-	}
-	return todo, nil
+	return collect.Done()
 }
diff --git a/main.go b/main.go
@@ -10,9 +10,9 @@ import (
 	"sync"
 )
 
-const threads = 32
+const threads = 64
 
-type ddl struct {
+type DDL struct {
 	Course string `json:"course"`
 	Title  string `json:"title"`
 	Time   int64  `json:"time"`
@@ -31,7 +31,7 @@ var port int
 var lock = new(sync.Mutex)
 var wg sync.WaitGroup
 
-func getAndAppend(ddls *[]ddl, errs *[]error, f func() ([]ddl, []error)) {
+func getAndAppend(ddls *[]DDL, errs *[]error, f func() ([]DDL, []error)) {
 	d, e := f()
 	lock.Lock()
 	defer func() {
@@ -43,20 +43,25 @@ func getAndAppend(ddls *[]ddl, errs *[]error, f func() ([]ddl, []error)) {
 }
 
 func handleRequest(c *gin.Context) {
-	var ddls []ddl
+	var ddls []DDL
 	var errs []error
-	wg.Add(2)
-	go getAndAppend(&ddls, &errs, func() ([]ddl, []error) {
-		return GettingCxddl(c.Query("cx_account"), c.Query("cx_passwd"), c.Query("cx_loginType"))
-	})
-	go getAndAppend(&ddls, &errs, func() ([]ddl, []error) {
-		return GettingZjoocDdl(c.Query("zjooc_account"), c.Query("zjooc_passwd"))
-	})
+	if c.Query("cx_account") != "" {
+		wg.Add(1)
+		go getAndAppend(&ddls, &errs, func() ([]DDL, []error) {
+			return GettingCxddl(c.Query("cx_account"), c.Query("cx_passwd"), c.Query("cx_loginType"))
+		})
+	}
+	if c.Query("zjooc_account") != "" {
+		wg.Add(1)
+		go getAndAppend(&ddls, &errs, func() ([]DDL, []error) {
+			return GettingZjoocDdl(c.Query("zjooc_account"), c.Query("zjooc_passwd"))
+		})
+	}
 	wg.Wait()
 	if errs != nil {
 		c.JSON(http.StatusBadRequest, &RespForm{
 			Code:   -1,
-			Data:   nil,
+			Data:   ddls,
 			Errors: errs2strs(errs),
 		})
 		return
diff --git a/zjooc.go b/zjooc.go
@@ -1,13 +1,14 @@
 package main
 
 import (
+	"ddl-api/collector"
 	"fmt"
 	"github.com/hduLib/hdu/zjooc"
 	"sync"
 	"time"
 )
 
-func GettingZjoocDdl(account, passwd string) ([]ddl, []error) {
+func GettingZjoocDdl(account, passwd string) ([]DDL, []error) {
 	user, err := zjooc.Login(account, passwd)
 	if err != nil {
 		return nil, []error{fmt.Errorf("zjooc login fail:%v", err)}
@@ -17,27 +18,25 @@ func GettingZjoocDdl(account, passwd string) ([]ddl, []error) {
 		return nil, []error{fmt.Errorf("get zjooc course list fail:%v", err)}
 	}
 
-	var todo []ddl
-	errCollector := make(chan error, 8)
-	add := make(chan ddl, 8)
+	collect := collector.New[DDL]()
 	wg := &sync.WaitGroup{}
 	for _, course := range list {
 		course := course
 		find := func(Type int, typename string) {
 			defer wg.Done()
 			workList, err := user.PapersByCourse(course.Id, Type, course.BatchId)
 			if err != nil {
-				errCollector <- fmt.Errorf("fail to get zjooc assignment list:%v", err)
+				collect.ErrCollector <- fmt.Errorf("fail to get zjooc assignment list:%v", err)
 				return
 			}
 			for _, v := range workList {
 				if v.ReviewStatus == 0 && v.ProcessStatus == 0 {
 					t, err := time.Parse("2006-01-02T15:04:05.000-0700", v.EndTime)
 					if err != nil {
-						errCollector <- fmt.Errorf("fail to get zjooc assignment:%v", err)
+						collect.ErrCollector <- fmt.Errorf("fail to get zjooc assignment:%v", err)
 						return
 					}
-					add <- ddl{
+					collect.Add <- DDL{
 						v.CourseName, v.PaperName, t.Unix(), typename, "在浙学",
 					}
 				}
@@ -46,46 +45,12 @@ func GettingZjoocDdl(account, passwd string) ([]ddl, []error) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			wg.Add(1)
+			wg.Add(3)
 			find(zjooc.Assignment, "作业")
-			wg.Add(1)
 			find(zjooc.Test, "测验")
-			wg.Add(1)
 			find(zjooc.Exam, "考试")
 		}()
 	}
-	// collector
-	Done := make(chan struct{})
-	go func() {
-		for {
-			select {
-			case <-Done:
-				return
-			case a := <-add:
-				todo = append(todo, a)
-			}
-		}
-	}()
-	// fmt.Println("tasks:", tasks)
-	var errs []error
-	go func() {
-		for {
-			select {
-			case err := <-errCollector:
-				if err != nil {
-					errs = append(errs, err)
-				}
-			case <-Done:
-				return
-			}
-		}
-	}()
 	wg.Wait()
-	// close 2 goroutine
-	Done <- struct{}{}
-	Done <- struct{}{}
-	if errs != nil {
-		return nil, errs
-	}
-	return todo, nil
+	return collect.Done()
 }
