Performer tags (#1132)

* Add scraping support for performer tags
* Add performer count to tag cards
* Refactor sqlite test setup
* Add performer tag filtering in gallery and image
* Add bulk update performer
* Add Performers tab to tag page
* Add count filters and sort bys for tags
* Move scene count to icon in performer card #1148

pkg/scraper/mapped.go

@@ -94,10 +94,10 @@ func (s mappedConfig) postProcess(q mappedQuery, attrConfig mappedScraperAttrCon
 type mappedSceneScraperConfig struct {
 	mappedConfig
 
-	Tags       mappedConfig `yaml:"Tags"`
-	Performers mappedConfig `yaml:"Performers"`
-	Studio     mappedConfig `yaml:"Studio"`
-	Movies     mappedConfig `yaml:"Movies"`
+	Tags       mappedConfig                 `yaml:"Tags"`
+	Performers mappedPerformerScraperConfig `yaml:"Performers"`
+	Studio     mappedConfig                 `yaml:"Studio"`
+	Movies     mappedConfig                 `yaml:"Movies"`
 }
 type _mappedSceneScraperConfig mappedSceneScraperConfig
 
@@ -211,10 +211,54 @@ func (s *mappedGalleryScraperConfig) UnmarshalYAML(unmarshal func(interface{}) e
 
 type mappedPerformerScraperConfig struct {
 	mappedConfig
+
+	Tags mappedConfig `yaml:"Tags"`
 }
+type _mappedPerformerScraperConfig mappedPerformerScraperConfig
+
+const (
+	mappedScraperConfigPerformerTags = "Tags"
+)
 
 func (s *mappedPerformerScraperConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return unmarshal(&s.mappedConfig)
+	// HACK - unmarshal to map first, then remove known scene sub-fields, then
+	// remarshal to yaml and pass that down to the base map
+	parentMap := make(map[string]interface{})
+	if err := unmarshal(parentMap); err != nil {
+		return err
+	}
+
+	// move the known sub-fields to a separate map
+	thisMap := make(map[string]interface{})
+
+	thisMap[mappedScraperConfigPerformerTags] = parentMap[mappedScraperConfigPerformerTags]
+
+	delete(parentMap, mappedScraperConfigPerformerTags)
+
+	// re-unmarshal the sub-fields
+	yml, err := yaml.Marshal(thisMap)
+	if err != nil {
+		return err
+	}
+
+	// needs to be a different type to prevent infinite recursion
+	c := _mappedPerformerScraperConfig{}
+	if err := yaml.Unmarshal(yml, &c); err != nil {
+		return err
+	}
+
+	*s = mappedPerformerScraperConfig(c)
+
+	yml, err = yaml.Marshal(parentMap)
+	if err != nil {
+		return err
+	}
+
+	if err := yaml.Unmarshal(yml, &s.mappedConfig); err != nil {
+		return err
+	}
+
+	return nil
 }
 
 type mappedMovieScraperConfig struct {
@@ -647,9 +691,23 @@ func (s mappedScraper) scrapePerformer(q mappedQuery) (*models.ScrapedPerformer,
 		return nil, nil
 	}
 
+	performerTagsMap := performerMap.Tags
+
 	results := performerMap.process(q, s.Common)
 	if len(results) > 0 {
 		results[0].apply(&ret)
+
+		// now apply the tags
+		if performerTagsMap != nil {
+			logger.Debug(`Processing performer tags:`)
+			tagResults := performerTagsMap.process(q, s.Common)
+
+			for _, p := range tagResults {
+				tag := &models.ScrapedSceneTag{}
+				p.apply(tag)
+				ret.Tags = append(ret.Tags, tag)
+			}
+		}
 	}
 
 	return &ret, nil
@@ -687,19 +745,34 @@ func (s mappedScraper) scrapeScene(q mappedQuery) (*models.ScrapedScene, error)
 	sceneStudioMap := sceneScraperConfig.Studio
 	sceneMoviesMap := sceneScraperConfig.Movies
 
+	scenePerformerTagsMap := scenePerformersMap.Tags
+
 	logger.Debug(`Processing scene:`)
 	results := sceneMap.process(q, s.Common)
 	if len(results) > 0 {
 		results[0].apply(&ret)
 
+		// process performer tags once
+		var performerTagResults mappedResults
+		if scenePerformerTagsMap != nil {
+			performerTagResults = scenePerformerTagsMap.process(q, s.Common)
+		}
+
 		// now apply the performers and tags
-		if scenePerformersMap != nil {
+		if scenePerformersMap.mappedConfig != nil {
 			logger.Debug(`Processing scene performers:`)
 			performerResults := scenePerformersMap.process(q, s.Common)
 
 			for _, p := range performerResults {
 				performer := &models.ScrapedScenePerformer{}
 				p.apply(performer)
+
+				for _, p := range performerTagResults {
+					tag := &models.ScrapedSceneTag{}
+					p.apply(tag)
+					ret.Tags = append(ret.Tags, tag)
+				}
+
 				ret.Performers = append(ret.Performers, performer)
 			}
 		}