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

Include missing fields in performer batch tag (#3718)

Browse Source
This commit is contained in:
WithoutPants
2023-05-05 09:39:09 +10:00
committed by GitHub
parent 242f61b5df
commit ca45c391da
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
internal/manager/task_stash_box_tag.go
View File

@@ -119,24 +119,28 @@ func (t *StashBoxPerformerTagTask) stashBoxPerformerTag(ctx context.Context) {
aliases = []string{} aliases = []string{}
} }
newPerformer := models.Performer{ newPerformer := models.Performer{
Aliases: models.NewRelatedStrings(aliases), Aliases: models.NewRelatedStrings(aliases),
Birthdate: getDate(performer.Birthdate), Disambiguation: getString(performer.Disambiguation),
CareerLength: getString(performer.CareerLength), Details: getString(performer.Details),
Country: getString(performer.Country), Birthdate: getDate(performer.Birthdate),
CreatedAt: currentTime, DeathDate: getDate(performer.DeathDate),
Ethnicity: getString(performer.Ethnicity), CareerLength: getString(performer.CareerLength),
EyeColor: getString(performer.EyeColor), Country: getString(performer.Country),
FakeTits: getString(performer.FakeTits), CreatedAt: currentTime,
Gender: models.GenderEnum(getString(performer.Gender)), Ethnicity: getString(performer.Ethnicity),
Height: getIntPtr(performer.Height), EyeColor: getString(performer.EyeColor),
Weight: getIntPtr(performer.Weight), HairColor: getString(performer.HairColor),
Instagram: getString(performer.Instagram), FakeTits: getString(performer.FakeTits),
Measurements: getString(performer.Measurements), Gender: models.GenderEnum(getString(performer.Gender)),
Name: *performer.Name, Height: getIntPtr(performer.Height),
Piercings: getString(performer.Piercings), Weight: getIntPtr(performer.Weight),
Tattoos: getString(performer.Tattoos), Instagram: getString(performer.Instagram),
Twitter: getString(performer.Twitter), Measurements: getString(performer.Measurements),
URL: getString(performer.URL), Name: *performer.Name,
Piercings: getString(performer.Piercings),
Tattoos: getString(performer.Tattoos),
Twitter: getString(performer.Twitter),
URL: getString(performer.URL),
StashIDs: models.NewRelatedStashIDs([]models.StashID{ StashIDs: models.NewRelatedStashIDs([]models.StashID{
{ {
Endpoint: t.box.Endpoint, Endpoint: t.box.Endpoint,
@@ -192,6 +196,10 @@ func (t *StashBoxPerformerTagTask) getPartial(performer *models.ScrapedPerformer
value := getDate(performer.Birthdate) value := getDate(performer.Birthdate)
partial.Birthdate = models.NewOptionalDate(*value) partial.Birthdate = models.NewOptionalDate(*value)
} }
if performer.DeathDate != nil && *performer.DeathDate != "" && !excluded["deathdate"] {
value := getDate(performer.DeathDate)
partial.Birthdate = models.NewOptionalDate(*value)
}
if performer.CareerLength != nil && !excluded["career_length"] { if performer.CareerLength != nil && !excluded["career_length"] {
partial.CareerLength = models.NewOptionalString(*performer.CareerLength) partial.CareerLength = models.NewOptionalString(*performer.CareerLength)
} }
@@ -204,6 +212,9 @@ func (t *StashBoxPerformerTagTask) getPartial(performer *models.ScrapedPerformer
if performer.EyeColor != nil && !excluded["eye_color"] { if performer.EyeColor != nil && !excluded["eye_color"] {
partial.EyeColor = models.NewOptionalString(*performer.EyeColor) partial.EyeColor = models.NewOptionalString(*performer.EyeColor)
} }
if performer.HairColor != nil && !excluded["hair_color"] {
partial.HairColor = models.NewOptionalString(*performer.HairColor)
}
if performer.FakeTits != nil && !excluded["fake_tits"] { if performer.FakeTits != nil && !excluded["fake_tits"] {
partial.FakeTits = models.NewOptionalString(*performer.FakeTits) partial.FakeTits = models.NewOptionalString(*performer.FakeTits)
} }
@@ -231,6 +242,9 @@ func (t *StashBoxPerformerTagTask) getPartial(performer *models.ScrapedPerformer
if excluded["name"] && performer.Name != nil { if excluded["name"] && performer.Name != nil {
partial.Name = models.NewOptionalString(*performer.Name) partial.Name = models.NewOptionalString(*performer.Name)
} }
if performer.Disambiguation != nil && !excluded["disambiguation"] {
partial.Disambiguation = models.NewOptionalString(*performer.Disambiguation)
}
if performer.Piercings != nil && !excluded["piercings"] { if performer.Piercings != nil && !excluded["piercings"] {
partial.Piercings = models.NewOptionalString(*performer.Piercings) partial.Piercings = models.NewOptionalString(*performer.Piercings)
} }