adjust youtube info parsing

OdyseeTeam · Nov 6, 2023 · b382f33 · b382f33
1 parent e5886f0
commit b382f33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/sdk/api.go b/sdk/api.go
@@ -185,7 +185,10 @@ func (a *APIConfig) SetChannelStatus(channelID string, status string, failureRea
 		return a.SetChannelStatus(channelID, status, failureReason, transferState)
 	}
 	defer res.Body.Close()
-	body, _ := io.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, nil, errors.Err(err)
+	}
 	if res.StatusCode >= http.StatusInternalServerError {
 		util.SendErrorToSlack("Error %d while trying to call %s. Waiting to retry", res.StatusCode, endpoint)
 		log.Debugln(string(body))

diff --git a/ytapi/ytapi.go b/ytapi/ytapi.go
@@ -173,8 +173,10 @@ func ChannelInfo(channelID string, attemptNo int, ipPool *ip_manager.IPPool) (*Y
 	if dataStartIndex == 25 {
 		dataStartIndex = strings.Index(pageBody, "var ytInitialData = ") + 20
 	}
-	dataEndIndex := strings.Index(pageBody, "]}}};</script>") + 4
-	if dataEndIndex < dataStartIndex {
+	// get end index by matching pattern AFTER the start index
+	dataEndIndex := strings.Index(pageBody[dataStartIndex:], ";</script>") + dataStartIndex
+	//dataEndIndex := strings.Index(pageBody, "}]}}};</script>") + 5
+	if dataEndIndex == dataStartIndex {
 		return nil, errors.Err("start index is lower than end index. cannot extract channel info!")
 	}
 	data := pageBody[dataStartIndex:dataEndIndex]