Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Performer refactor (#3057)

Browse Source 
* Separate performer model from sqlite model
* Use GenderEnum for gender
This commit is contained in:
WithoutPants
2022-10-31 14:58:01 +11:00
committed by GitHub
parent b1fa933868
commit 270bc317cb
45 changed files with 1558 additions and 1226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
pkg/scraper/stashbox/stash_box.go
View File

@@ -379,7 +379,7 @@ func (c Client) FindStashBoxPerformersByNames(ctx context.Context, performerIDs
return fmt.Errorf("performer with id %d not found", performerID)
}
if performer.Name.Valid {
if performer.Name != "" {
performers = append(performers, performer)
}
}
@@ -413,7 +413,7 @@ func (c Client) FindStashBoxPerformersByPerformerNames(ctx context.Context, perf
return fmt.Errorf("performer with id %d not found", performerID)
}
if performer.Name.Valid {
if performer.Name != "" {
performers = append(performers, performer)
}
}
@@ -439,8 +439,8 @@ func (c Client) FindStashBoxPerformersByPerformerNames(ctx context.Context, perf
func (c Client) findStashBoxPerformersByNames(ctx context.Context, performers []*models.Performer) ([]*StashBoxPerformerQueryResult, error) {
var ret []*StashBoxPerformerQueryResult
for _, performer := range performers {
if performer.Name.Valid {
performerResults, err := c.queryStashBoxPerformer(ctx, performer.Name.String)
if performer.Name != "" {
performerResults, err := c.queryStashBoxPerformer(ctx, performer.Name)
if err != nil {
return nil, err
}
@@ -867,7 +867,7 @@ func (c Client) SubmitSceneDraft(ctx context.Context, scene *models.Scene, endpo
performers := []*graphql.DraftEntityInput{}
for _, p := range scenePerformers {
performerDraft := graphql.DraftEntityInput{
Name: p.Name.String,
Name: p.Name,
}
stashIDs, err := pqb.GetStashIDs(ctx, p.ID)
@@ -947,55 +947,57 @@ func (c Client) SubmitPerformerDraft(ctx context.Context, performer *models.Perf
image = bytes.NewReader(img)
}
if performer.Name.Valid {
draft.Name = performer.Name.String
if performer.Name != "" {
draft.Name = performer.Name
}
if performer.Birthdate.Valid {
draft.Birthdate = &performer.Birthdate.String
if performer.Birthdate != nil {
d := performer.Birthdate.String()
draft.Birthdate = &d
}
if performer.Country.Valid {
draft.Country = &performer.Country.String
if performer.Country != "" {
draft.Country = &performer.Country
}
if performer.Ethnicity.Valid {
draft.Ethnicity = &performer.Ethnicity.String
if performer.Ethnicity != "" {
draft.Ethnicity = &performer.Ethnicity
}
if performer.EyeColor.Valid {
draft.EyeColor = &performer.EyeColor.String
if performer.EyeColor != "" {
draft.EyeColor = &performer.EyeColor
}
if performer.FakeTits.Valid {
draft.BreastType = &performer.FakeTits.String
if performer.FakeTits != "" {
draft.BreastType = &performer.FakeTits
}
if performer.Gender.Valid {
draft.Gender = &performer.Gender.String
if performer.Gender.IsValid() {
v := performer.Gender.String()
draft.Gender = &v
}
if performer.HairColor.Valid {
draft.HairColor = &performer.HairColor.String
if performer.HairColor != "" {
draft.HairColor = &performer.HairColor
}
if performer.Height.Valid {
draft.Height = &performer.Height.String
if performer.Height != "" {
draft.Height = &performer.Height
}
if performer.Measurements.Valid {
draft.Measurements = &performer.Measurements.String
if performer.Measurements != "" {
draft.Measurements = &performer.Measurements
}
if performer.Piercings.Valid {
draft.Piercings = &performer.Piercings.String
if performer.Piercings != "" {
draft.Piercings = &performer.Piercings
}
if performer.Tattoos.Valid {
draft.Tattoos = &performer.Tattoos.String
if performer.Tattoos != "" {
draft.Tattoos = &performer.Tattoos
}
if performer.Aliases.Valid {
draft.Aliases = &performer.Aliases.String
if performer.Aliases != "" {
draft.Aliases = &performer.Aliases
}
var urls []string
if len(strings.TrimSpace(performer.Twitter.String)) > 0 {
urls = append(urls, "https://twitter.com/"+strings.TrimSpace(performer.Twitter.String))
if len(strings.TrimSpace(performer.Twitter)) > 0 {
urls = append(urls, "https://twitter.com/"+strings.TrimSpace(performer.Twitter))
}
if len(strings.TrimSpace(performer.Instagram.String)) > 0 {
urls = append(urls, "https://instagram.com/"+strings.TrimSpace(performer.Instagram.String))
if len(strings.TrimSpace(performer.Instagram)) > 0 {
urls = append(urls, "https://instagram.com/"+strings.TrimSpace(performer.Instagram))
}
if len(strings.TrimSpace(performer.URL.String)) > 0 {
urls = append(urls, strings.TrimSpace(performer.URL.String))
if len(strings.TrimSpace(performer.URL)) > 0 {
urls = append(urls, strings.TrimSpace(performer.URL))
}
if len(urls) > 0 {
draft.Urls = urls