Spitfire/Search
Spitfire/Search
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

added "VisitedNodes" to message, to prevent re-requesting

Browse source
This commit is contained in:
partisan 2024-08-09 12:59:37 +02:00
parent d34ca730e4
commit 6b99213ec4
7 changed files with 120 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

24
video.go
View file

@ -155,7 +155,7 @@ func handleVideoSearch(w http.ResponseWriter, query, safe, lang string, page int
results := fetchVideoResults(query, safe, lang, page)
if len(results) == 0 {
log.Printf("No results from primary search, trying other nodes")
results = tryOtherNodesForVideoSearch(query, safe, lang, page)
results = tryOtherNodesForVideoSearch(query, safe, lang, page, []string{hostID})
}
elapsed := time.Since(start)
@ -210,9 +210,12 @@ func fetchVideoResults(query, safe, lang string, page int) []VideoResult {
return results
}
func tryOtherNodesForVideoSearch(query, safe, lang string, page int) []VideoResult {
func tryOtherNodesForVideoSearch(query, safe, lang string, page int, visitedNodes []string) []VideoResult {
for _, nodeAddr := range peers {
results, err := sendVideoSearchRequestToNode(nodeAddr, query, safe, lang, page)
if contains(visitedNodes, nodeAddr) {
continue // Skip nodes already visited
}
results, err := sendVideoSearchRequestToNode(nodeAddr, query, safe, lang, page, visitedNodes)
if err != nil {
log.Printf("Error contacting node %s: %v", nodeAddr, err)
continue
@ -224,19 +227,22 @@ func tryOtherNodesForVideoSearch(query, safe, lang string, page int) []VideoResu
return nil
}
func sendVideoSearchRequestToNode(nodeAddr, query, safe, lang string, page int) ([]VideoResult, error) {
func sendVideoSearchRequestToNode(nodeAddr, query, safe, lang string, page int, visitedNodes []string) ([]VideoResult, error) {
visitedNodes = append(visitedNodes, nodeAddr)
searchParams := struct {
Query string `json:"query"`
Safe string `json:"safe"`
Lang string `json:"lang"`
Page int `json:"page"`
ResponseAddr string `json:"responseAddr"`
Query string `json:"query"`
Safe string `json:"safe"`
Lang string `json:"lang"`
Page int `json:"page"`
ResponseAddr string `json:"responseAddr"`
VisitedNodes []string `json:"visitedNodes"`
}{
Query: query,
Safe: safe,
Lang: lang,
Page: page,
ResponseAddr: fmt.Sprintf("http://localhost:%d/node", config.Port),
VisitedNodes: visitedNodes,
}
msgBytes, err := json.Marshal(searchParams)