From d80ec1d7a1518f44b579d016abb916cfc19b1c77 Mon Sep 17 00:00:00 2001
From: bnkai <48220860+bnkai@users.noreply.github.com>
Date: Mon, 30 Jan 2023 00:40:53 +0200
Subject: [PATCH] Fix scene studio results when doing a search scrape (#3246)

---
 pkg/scraper/mapped.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/scraper/mapped.go b/pkg/scraper/mapped.go
index 5fd0d86bc..77c4911ae 100644
--- a/pkg/scraper/mapped.go
+++ b/pkg/scraper/mapped.go
@@ -822,7 +822,7 @@ func (s mappedScraper) scrapePerformers(ctx context.Context, q mappedQuery) ([]*
 	return ret, nil
 }
 
-func (s mappedScraper) processScene(ctx context.Context, q mappedQuery, r mappedResult) *ScrapedScene {
+func (s mappedScraper) processScene(ctx context.Context, q mappedQuery, r mappedResult, resultIndex int) *ScrapedScene {
 	var ret ScrapedScene
 
 	sceneScraperConfig := s.Scene
@@ -876,9 +876,10 @@ func (s mappedScraper) processScene(ctx context.Context, q mappedQuery, r mapped
 		logger.Debug(`Processing scene studio:`)
 		studioResults := sceneStudioMap.process(ctx, q, s.Common)
 
-		if len(studioResults) > 0 {
+		if len(studioResults) > 0 && resultIndex < len(studioResults) {
 			studio := &models.ScrapedStudio{}
-			studioResults[0].apply(studio)
+			// when doing a `search` scrape get the related studio
+			studioResults[resultIndex].apply(studio)
 			ret.Studio = studio
 		}
 	}
@@ -908,9 +909,9 @@ func (s mappedScraper) scrapeScenes(ctx context.Context, q mappedQuery) ([]*Scra
 
 	logger.Debug(`Processing scenes:`)
 	results := sceneMap.process(ctx, q, s.Common)
-	for _, r := range results {
+	for i, r := range results {
 		logger.Debug(`Processing scene:`)
-		ret = append(ret, s.processScene(ctx, q, r))
+		ret = append(ret, s.processScene(ctx, q, r, i))
 	}
 
 	return ret, nil
@@ -928,7 +929,7 @@ func (s mappedScraper) scrapeScene(ctx context.Context, q mappedQuery) (*Scraped
 	logger.Debug(`Processing scene:`)
 	results := sceneMap.process(ctx, q, s.Common)
 	if len(results) > 0 {
-		ret = s.processScene(ctx, q, results[0])
+		ret = s.processScene(ctx, q, results[0], 0)
 	}
 
 	return ret, nil