images.go

@@ -90,7 +90,9 @@ func getImageResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string
 	case results := <-cacheChan:
 		if results == nil {
 			combinedResults = fetchImageResults(query, safe, lang, page)
+			if len(combinedResults) > 0 {
 				resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
+			}
 		} else {
 			_, _, imageResults := convertToSpecificResults(results)
 			combinedResults = imageResults
@@ -98,20 +100,31 @@ func getImageResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string
 	case <-time.After(2 * time.Second):
 		log.Println("Cache check timeout")
 		combinedResults = fetchImageResults(query, safe, lang, page)
+		if len(combinedResults) > 0 {
 			resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
 		}
+	}
 
 	return combinedResults
 }
 
 func fetchImageResults(query, safe, lang string, page int) []ImageSearchResult {
+	var results []ImageSearchResult
+	var err error
+
+	for attempts := 0; attempts < len(imageEngines); attempts++ {
 		engine := selectImageEngine()
 		log.Printf("Using image search engine: %s", engine.Name)
 
-	results, err := engine.Func(query, safe, lang, page)
+		results, err = engine.Func(query, safe, lang, page)
 		if err != nil {
 			log.Printf("Error performing image search with %s: %v", engine.Name, err)
-		return nil
+			continue
+		}
+
+		if len(results) > 0 {
+			break
+		}
 	}
 
 	return results

text.go

@@ -69,7 +69,9 @@ func getTextResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string,
 	case results := <-cacheChan:
 		if results == nil {
 			combinedResults = fetchTextResults(query, safe, lang, page)
+			if len(combinedResults) > 0 {
 				resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
+			}
 		} else {
 			textResults, _, _ := convertToSpecificResults(results)
 			combinedResults = textResults
@@ -77,8 +79,10 @@ func getTextResultsFromCacheOrFetch(cacheKey CacheKey, query, safe, lang string,
 	case <-time.After(2 * time.Second):
 		log.Println("Cache check timeout")
 		combinedResults = fetchTextResults(query, safe, lang, page)
+		if len(combinedResults) > 0 {
 			resultsCache.Set(cacheKey, convertToSearchResults(combinedResults))
 		}
+	}
 
 	return combinedResults
 }
@@ -88,20 +92,31 @@ func prefetchPage(query, safe, lang string, page int) {
 	if _, exists := resultsCache.Get(cacheKey); !exists {
 		log.Printf("Page %d not cached, caching now...", page)
 		pageResults := fetchTextResults(query, safe, lang, page)
+		if len(pageResults) > 0 {
 			resultsCache.Set(cacheKey, convertToSearchResults(pageResults))
+		}
 	} else {
 		log.Printf("Page %d already cached", page)
 	}
 }
 
 func fetchTextResults(query, safe, lang string, page int) []TextSearchResult {
+	var results []TextSearchResult
+	var err error
+
+	for attempts := 0; attempts < len(searchEngines); attempts++ {
 		engine := selectSearchEngine()
 		log.Printf("Using search engine: %s", engine.Name)
 
-	results, err := engine.Func(query, safe, lang, page)
+		results, err = engine.Func(query, safe, lang, page)
 		if err != nil {
 			log.Printf("Error performing search with %s: %v", engine.Name, err)
-		return nil
+			continue
+		}
+
+		if len(results) > 0 {
+			break
+		}
 	}
 
 	return results