Performer disambiguation and aliases

graphql/documents/data/performer-slim.graphql

@@ -1,6 +1,7 @@
 fragment SlimPerformerData on Performer {
   id
   name
+  disambiguation
   gender
   url
   twitter
@@ -18,6 +19,7 @@ fragment SlimPerformerData on Performer {
   career_length
   tattoos
   piercings
+  alias_list
   tags {
     id
     name

graphql/documents/data/performer.graphql

@@ -2,6 +2,7 @@ fragment PerformerData on Performer {
   id
   checksum
   name
+  disambiguation
   url
   gender
   twitter
@@ -16,7 +17,7 @@ fragment PerformerData on Performer {
   career_length
   tattoos
   piercings
-  aliases
+  alias_list
   favorite
   ignore_auto_tag
   image_path

graphql/documents/data/scrapers.graphql

@@ -1,6 +1,7 @@
 fragment ScrapedPerformerData on ScrapedPerformer {
   stored_id
   name
+  disambiguation
   gender
   url
   twitter
@@ -30,6 +31,7 @@ fragment ScrapedPerformerData on ScrapedPerformer {
 fragment ScrapedScenePerformerData on ScrapedPerformer {
   stored_id
   name
+  disambiguation
   gender
   url
   twitter

graphql/schema/types/filters.graphql

@@ -45,6 +45,7 @@ input PerformerFilterType {
   NOT: PerformerFilterType
 
   name: StringCriterionInput
+  disambiguation: StringCriterionInput
   details: StringCriterionInput
 
   """Filter by favorite"""

graphql/schema/types/performer.graphql

@@ -9,8 +9,9 @@ enum GenderEnum {
 
 type Performer {
   id: ID!
-  checksum: String!
-  name: String
+  checksum: String @deprecated(reason: "Not used") 
+  name: String!
+  disambiguation: String
   url: String
   gender: GenderEnum
   twitter: String
@@ -26,7 +27,8 @@ type Performer {
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  aliases: String @deprecated(reason: "Use alias_list")
+  alias_list: [String!]!
   favorite: Boolean!
   tags: [Tag!]!
   ignore_auto_tag: Boolean!
@@ -50,6 +52,7 @@ type Performer {
 
 input PerformerCreateInput {
   name: String!
+  disambiguation: String
   url: String
   gender: GenderEnum
   birthdate: String
@@ -64,7 +67,8 @@ input PerformerCreateInput {
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  aliases: String @deprecated(reason: "Use alias_list")
+  alias_list: [String!]
   twitter: String
   instagram: String
   favorite: Boolean
@@ -83,6 +87,7 @@ input PerformerCreateInput {
 input PerformerUpdateInput {
   id: ID!
   name: String
+  disambiguation: String
   url: String
   gender: GenderEnum
   birthdate: String
@@ -97,7 +102,8 @@ input PerformerUpdateInput {
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  aliases: String @deprecated(reason: "Use alias_list")
+  alias_list: [String!]
   twitter: String
   instagram: String
   favorite: Boolean
@@ -113,9 +119,15 @@ input PerformerUpdateInput {
   ignore_auto_tag: Boolean
 }
 
+input BulkUpdateStrings {
+  values: [String!]
+  mode: BulkUpdateIdMode!
+}
+
 input BulkPerformerUpdateInput {
   clientMutationId: String
   ids: [ID!]
+  disambiguation: String
   url: String
   gender: GenderEnum
   birthdate: String
@@ -130,7 +142,8 @@ input BulkPerformerUpdateInput {
   career_length: String
   tattoos: String
   piercings: String
-  aliases: String
+  aliases: String @deprecated(reason: "Use alias_list")
+  alias_list: BulkUpdateStrings
   twitter: String
   instagram: String
   favorite: Boolean

graphql/schema/types/scraped-performer.graphql

@@ -3,6 +3,7 @@ type ScrapedPerformer {
   """Set if performer matched"""
   stored_id: ID
   name: String
+  disambiguation: String
   gender: String
   url: String
   twitter: String
@@ -17,6 +18,7 @@ type ScrapedPerformer {
   career_length: String
   tattoos: String
   piercings: String
+  # aliases must be comma-delimited to be parsed correctly
   aliases: String
   tags: [ScrapedTag!]
 
@@ -34,6 +36,7 @@ input ScrapedPerformerInput {
   """Set if performer matched"""
   stored_id: ID
   name: String
+  disambiguation: String
   gender: String
   url: String
   twitter: String

internal/api/resolver_model_performer.go

@@ -3,13 +3,45 @@ package api
 import (
 	"context"
 	"strconv"
+	"strings"
 
+	"github.com/stashapp/stash/internal/api/loaders"
 	"github.com/stashapp/stash/internal/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/gallery"
 	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
 )
 
+// Checksum is deprecated
+func (r *performerResolver) Checksum(ctx context.Context, obj *models.Performer) (*string, error) {
+	return nil, nil
+}
+
+func (r *performerResolver) Aliases(ctx context.Context, obj *models.Performer) (*string, error) {
+	if !obj.Aliases.Loaded() {
+		if err := r.withTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadAliases(ctx, r.repository.Performer)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	ret := strings.Join(obj.Aliases.List(), ", ")
+	return &ret, nil
+}
+
+func (r *performerResolver) AliasList(ctx context.Context, obj *models.Performer) ([]string, error) {
+	if !obj.Aliases.Loaded() {
+		if err := r.withTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadAliases(ctx, r.repository.Performer)
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	return obj.Aliases.List(), nil
+}
+
 func (r *performerResolver) Height(ctx context.Context, obj *models.Performer) (*string, error) {
 	if obj.Height != nil {
 		ret := strconv.Itoa(*obj.Height)
@@ -37,14 +69,17 @@ func (r *performerResolver) ImagePath(ctx context.Context, obj *models.Performer
 }
 
 func (r *performerResolver) Tags(ctx context.Context, obj *models.Performer) (ret []*models.Tag, err error) {
-	if err := r.withTxn(ctx, func(ctx context.Context) error {
-		ret, err = r.repository.Tag.FindByPerformerID(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
+	if !obj.TagIDs.Loaded() {
+		if err := r.withTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadTagIDs(ctx, r.repository.Performer)
+		}); err != nil {
+			return nil, err
+		}
 	}
 
-	return ret, nil
+	var errs []error
+	ret, errs = loaders.From(ctx).TagByID.LoadAll(obj.TagIDs.List())
+	return ret, firstError(errs)
 }
 
 func (r *performerResolver) SceneCount(ctx context.Context, obj *models.Performer) (ret *int, err error) {
@@ -95,16 +130,13 @@ func (r *performerResolver) Scenes(ctx context.Context, obj *models.Performer) (
 }
 
 func (r *performerResolver) StashIds(ctx context.Context, obj *models.Performer) ([]*models.StashID, error) {
-	var ret []models.StashID
 	if err := r.withTxn(ctx, func(ctx context.Context) error {
-		var err error
-		ret, err = r.repository.Performer.GetStashIDs(ctx, obj.ID)
-		return err
+		return obj.LoadStashIDs(ctx, r.repository.Performer)
 	}); err != nil {
 		return nil, err
 	}
 
-	return stashIDsSliceToPtrSlice(ret), nil
+	return stashIDsSliceToPtrSlice(obj.StashIDs.List()), nil
 }
 
 func (r *performerResolver) DeathDate(ctx context.Context, obj *models.Performer) (*string, error) {