fix: fix exceeding the paging size can not be displayed

52funny · Jul 16, 2024 · 3052215 · 3052215
1 parent 0c17ea9
commit 3052215
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/internal/pikpak/file.go b/internal/pikpak/file.go
@@ -96,7 +96,6 @@ func (p *PikPak) GetFolderFileStatList(parentId string) ([]FileStat, error) {
 	fileList := make([]FileStat, 0)
 
 	for {
-		// query.Add("filters", filters)
 		req, err := http.NewRequest("GET", "https://api-drive.mypikpak.com/drive/v1/files?"+query.Encode(), nil)
 		if err != nil {
 			return fileList, err

diff --git a/internal/pikpak/folder.go b/internal/pikpak/folder.go
@@ -49,29 +49,36 @@ func (p *PikPak) GetFolderId(parentId string, dir string) (string, error) {
 	value.Add("with_audit", "false")
 	value.Add("thumbnail_size", "SIZE_LARGE")
 	value.Add("limit", "200")
-	req, err := http.NewRequest("GET", fmt.Sprintf("https://api-drive.mypikpak.com/drive/v1/files?"+value.Encode()), nil)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Country", "CN")
-	req.Header.Set("X-Peer-Id", p.DeviceId)
-	req.Header.Set("X-User-Region", "1")
-	req.Header.Set("X-Alt-Capability", "3")
-	req.Header.Set("X-Client-Version-Code", "10083")
-	req.Header.Set("X-Captcha-Token", p.CaptchaToken)
-	bs, err := p.sendRequest(req)
-	if err != nil {
-		return "", err
-	}
-	files := gjson.GetBytes(bs, "files").Array()
+	for {
+		req, err := http.NewRequest("GET", fmt.Sprintf("https://api-drive.mypikpak.com/drive/v1/files?"+value.Encode()), nil)
+		if err != nil {
+			return "", err
+		}
+		req.Header.Set("Country", "CN")
+		req.Header.Set("X-Peer-Id", p.DeviceId)
+		req.Header.Set("X-User-Region", "1")
+		req.Header.Set("X-Alt-Capability", "3")
+		req.Header.Set("X-Client-Version-Code", "10083")
+		req.Header.Set("X-Captcha-Token", p.CaptchaToken)
+		bs, err := p.sendRequest(req)
+		if err != nil {
+			return "", err
+		}
+		files := gjson.GetBytes(bs, "files").Array()
 
-	for _, file := range files {
-		kind := file.Get("kind").String()
-		name := file.Get("name").String()
-		trashed := file.Get("trashed").Bool()
-		if kind == "drive#folder" && name == dir && !trashed {
-			return file.Get("id").String(), nil
+		for _, file := range files {
+			kind := file.Get("kind").String()
+			name := file.Get("name").String()
+			trashed := file.Get("trashed").Bool()
+			if kind == "drive#folder" && name == dir && !trashed {
+				return file.Get("id").String(), nil
+			}
+		}
+		nextToken := gjson.GetBytes(bs, "next_page_token").String()
+		if nextToken == "" {
+			break
 		}
+		value.Set("page_token", nextToken)
 	}
 	return "", ErrNotFoundFolder
 }