Restore Envato and Artgrid fallback search breadth

backend/services/cse.go

@@ -92,47 +92,58 @@ func (s *SearchService) SearchMedia(queries []string, enabledPlatforms map[strin
 	results := make([]SearchResult, 0, 90)
 	var lastErr error
 
-	baseQueries := limitQueries(queries, 3)
-	for _, base := range baseQueries {
-		base = strings.TrimSpace(base)
-		if base == "" {
-			continue
-		}
-		for _, source := range sources {
-			if len(enabledPlatforms) > 0 && !enabledPlatforms[strings.ToLower(source.name)] {
+	baseQueries := limitQueries(queries, 6)
+	primaryQueries := baseQueries[:minInt(len(baseQueries), 3)]
+	runSearchPass := func(bases []string, onlyMissing bool) {
+		for _, base := range bases {
+			base = strings.TrimSpace(base)
+			if base == "" {
 				continue
 			}
-			if sourceCounts[source.name] >= source.maxResults {
-				continue
-			}
-			for _, searchQuery := range source.build(base) {
-				if sourceCounts[source.name] >= source.maxResults {
-					break
-				}
-				items, err := s.search(searchQuery, source.categories, source.engine, source.name)
-				if err != nil {
-					lastErr = err
-					items, err = s.search(searchQuery, source.categories, "", source.name)
-				}
-				if err != nil {
-					lastErr = err
+			for _, source := range sources {
+				if len(enabledPlatforms) > 0 && !enabledPlatforms[strings.ToLower(source.name)] {
 					continue
 				}
-				for _, item := range items {
-					if item.Link == "" || seen[item.Link] || !source.accept(item) {
-						continue
-					}
-					seen[item.Link] = true
-					results = append(results, item)
-					sourceCounts[source.name]++
+				if sourceCounts[source.name] >= source.maxResults {
+					continue
+				}
+				if onlyMissing && sourceCounts[source.name] > 0 {
+					continue
+				}
+				for _, searchQuery := range source.build(base) {
 					if sourceCounts[source.name] >= source.maxResults {
 						break
 					}
+					items, err := s.search(searchQuery, source.categories, source.engine, source.name)
+					if err != nil {
+						lastErr = err
+						items, err = s.search(searchQuery, source.categories, "", source.name)
+					}
+					if err != nil {
+						lastErr = err
+						continue
+					}
+					for _, item := range items {
+						if item.Link == "" || seen[item.Link] || !source.accept(item) {
+							continue
+						}
+						seen[item.Link] = true
+						results = append(results, item)
+						sourceCounts[source.name]++
+						if sourceCounts[source.name] >= source.maxResults {
+							break
+						}
+					}
 				}
 			}
 		}
 	}
 
+	runSearchPass(primaryQueries, false)
+	if len(baseQueries) > len(primaryQueries) {
+		runSearchPass(baseQueries[len(primaryQueries):], true)
+	}
+
 	if len(results) == 0 && lastErr != nil {
 		return nil, lastErr
 	}