feat: zjooc

fix: wait forever

Author: BaiMeow

cx.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	cx "github.com/hduLib/hdu/chaoxing"
-	"github.com/hduLib/hdu/net"
+	"github.com/hduLib/hdu/client"
 	"sync"
 )
 
@@ -38,9 +38,10 @@ func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
 		course := course
 		wg.Add(1)
 		go func() {
+			defer wg.Done()
 			c, err := course.Detail()
 			if err != nil {
-				if err, ok := err.(*net.ErrNotOk); ok {
+				if err, ok := err.(*client.ErrNotOk); ok {
 					errCollector <- fmt.Errorf("fail to get course detail:status code %d: %s", err.StatusCode, err.Body)
 					return
 				}
@@ -49,9 +50,10 @@ func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
 			}
 			wg.Add(1)
 			go func() {
+				defer wg.Done()
 				workList, err := c.WorkList()
 				if err != nil {
-					if err, ok := err.(*net.ErrNotOk); ok {
+					if err, ok := err.(*client.ErrNotOk); ok {
 						errCollector <- fmt.Errorf("fail to get work list:status code %d: %s", err.StatusCode, err.Body)
 						return
 					}
@@ -65,10 +67,10 @@ func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
 						}
 					}
 				}
-				wg.Done()
 			}()
 			wg.Add(1)
 			go func() {
+				defer wg.Done()
 				examList, err := c.ExamList()
 				if err != nil {
 					errCollector <- fmt.Errorf("fail to get exam list:%v", err)
@@ -81,9 +83,7 @@ func GettingCxddl(account, passwd, Type string) ([]ddl, []error) {
 						}
 					}
 				}
-				wg.Done()
 			}()
-			wg.Done()
 		}()
 	}
 	// collector

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/gin-gonic/gin v1.8.1
-	github.com/hduLib/hdu v0.0.0-20221104115041-1fbd284df8eb
+	github.com/hduLib/hdu v0.0.0-20221109082842-2f2a8910069d
 )
 
 require (
@@ -21,6 +21,9 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
+	github.com/tidwall/gjson v1.14.2 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
 	golang.org/x/net v0.1.0 // indirect

go.sum

@@ -24,8 +24,8 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/hduLib/hdu v0.0.0-20221104115041-1fbd284df8eb h1:Ftt2ol6LSLh/eJivRaDG6VXm5Kx71bZ6c7F/vtFIMCs=
-github.com/hduLib/hdu v0.0.0-20221104115041-1fbd284df8eb/go.mod h1:ETz0Es+bQwkOUFOn01rjJovN57eDg8RQbKTuw34g4u4=
+github.com/hduLib/hdu v0.0.0-20221109082842-2f2a8910069d h1:SZMxATQehnCfMzXchC0qRB1PlHMk4UjCjqrKvCm+754=
+github.com/hduLib/hdu v0.0.0-20221109082842-2f2a8910069d/go.mod h1:m/fQPKtYdFhvvoeYaq2jgoZlJsdTRmHbwjjbTWENIeE=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -58,6 +58,12 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tidwall/gjson v1.14.2 h1:6BBkirS0rAHjumnjHF6qgy5d2YAJ1TLIaFE2lzfOLqo=
+github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=

main.go

@@ -1,12 +1,13 @@
 package main
 
 import (
-	"ddl-api/client"
+	rateClient "ddl-api/client"
 	"flag"
 	"github.com/gin-gonic/gin"
-	"github.com/hduLib/hdu/net"
+	"github.com/hduLib/hdu/client"
 	"net/http"
 	"strconv"
+	"sync"
 )
 
 const threads = 32
@@ -27,9 +28,31 @@ type RespForm struct {
 }
 
 var port int
+var lock = new(sync.Mutex)
+var wg sync.WaitGroup
+
+func getAndAppend(ddls *[]ddl, errs *[]error, f func() ([]ddl, []error)) {
+	d, e := f()
+	lock.Lock()
+	defer func() {
+		lock.Unlock()
+		wg.Done()
+	}()
+	*ddls = append(*ddls, d...)
+	*errs = append(*errs, e...)
+}
 
 func handleRequest(c *gin.Context) {
-	ddls, errs := GettingCxddl(c.Query("cx_account"), c.Query("cx_passwd"), c.Query("cx_loginType"))
+	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"))
+	})
+	wg.Wait()
 	if errs != nil {
 		c.JSON(http.StatusBadRequest, &RespForm{
 			Code:   -1,
@@ -48,7 +71,7 @@ func handleRequest(c *gin.Context) {
 func main() {
 	flag.IntVar(&port, "p", 8080, "port")
 	flag.Parse()
-	net.DefaultClient = client.NewWaitingClient(threads)
+	client.DefaultClient = rateClient.NewWaitingClient(threads)
 	r := gin.Default()
 	r.GET("/ddl/all", handleRequest)
 	r.Run(":" + strconv.Itoa(port))

zjooc.go

@@ -0,0 +1,91 @@
+package main
+
+import (
+	"fmt"
+	"github.com/hduLib/hdu/zjooc"
+	"sync"
+	"time"
+)
+
+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)}
+	}
+	list, err := user.CurrentCourses(zjooc.Published)
+	if err != nil {
+		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)
+	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)
+				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)
+						return
+					}
+					add <- ddl{
+						v.CourseName, v.PaperName, t.Unix(), typename, "在浙学",
+					}
+				}
+			}
+		}
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			wg.Add(1)
+			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
+}