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

update merged performer upon batch update (#5664)

Browse Source 
* update merged performer upon batch update
* Handle aliases and name for merged performer
* Refactor merge performer code

Log when merging performers
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
fume8866
2025-02-26 22:23:48 -05:00
committed by GitHub
parent 661e9eba51
commit 4d447c3340
5 changed files with 92 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/models/model_scraped_item.go
View File

@@ -128,13 +128,15 @@ type ScrapedPerformer struct {
Aliases *string `json:"aliases"`
Tags []*ScrapedTag `json:"tags"`
// This should be a base64 encoded data URL
Image *string `json:"image"` // deprecated: use Images
Images []string `json:"images"`
Details *string `json:"details"`
DeathDate *string `json:"death_date"`
HairColor *string `json:"hair_color"`
Weight *string `json:"weight"`
RemoteSiteID *string `json:"remote_site_id"`
Image *string `json:"image"` // deprecated: use Images
Images []string `json:"images"`
Details *string `json:"details"`
DeathDate *string `json:"death_date"`
HairColor *string `json:"hair_color"`
Weight *string `json:"weight"`
RemoteSiteID *string `json:"remote_site_id"`
RemoteDeleted bool `json:"remote_deleted"`
RemoteMergedIntoId *string `json:"remote_merged_into_id"`
}
func (ScrapedPerformer) IsScrapedContent() {}

28
pkg/scraper/stashbox/graphql/generated_client.go
View File

@@ -196,6 +196,8 @@ type PerformerFragment struct {
Aliases []string "json:\"aliases\" graphql:\"aliases\""
Gender *GenderEnum "json:\"gender,omitempty\" graphql:\"gender\""
MergedIds []string "json:\"merged_ids\" graphql:\"merged_ids\""
Deleted bool "json:\"deleted\" graphql:\"deleted\""
MergedIntoID *string "json:\"merged_into_id,omitempty\" graphql:\"merged_into_id\""
Urls []*URLFragment "json:\"urls\" graphql:\"urls\""
Images []*ImageFragment "json:\"images\" graphql:\"images\""
BirthDate *string "json:\"birth_date,omitempty\" graphql:\"birth_date\""
@@ -249,6 +251,18 @@ func (t *PerformerFragment) GetMergedIds() []string {
}
return t.MergedIds
}
func (t *PerformerFragment) GetDeleted() bool {
if t == nil {
t = &PerformerFragment{}
}
return t.Deleted
}
func (t *PerformerFragment) GetMergedIntoID() *string {
if t == nil {
t = &PerformerFragment{}
}
return t.MergedIntoID
}
func (t *PerformerFragment) GetUrls() []*URLFragment {
if t == nil {
t = &PerformerFragment{}
@@ -860,6 +874,8 @@ fragment PerformerFragment on Performer {
aliases
gender
merged_ids
deleted
merged_into_id
urls {
... URLFragment
}
@@ -993,6 +1009,8 @@ fragment PerformerFragment on Performer {
aliases
gender
merged_ids
deleted
merged_into_id
urls {
... URLFragment
}
@@ -1126,6 +1144,8 @@ fragment PerformerFragment on Performer {
aliases
gender
merged_ids
deleted
merged_into_id
urls {
... URLFragment
}
@@ -1259,6 +1279,8 @@ fragment PerformerFragment on Performer {
aliases
gender
merged_ids
deleted
merged_into_id
urls {
... URLFragment
}
@@ -1331,6 +1353,8 @@ fragment PerformerFragment on Performer {
aliases
gender
merged_ids
deleted
merged_into_id
urls {
... URLFragment
}
@@ -1408,6 +1432,8 @@ fragment PerformerFragment on Performer {
aliases
gender
merged_ids
deleted
merged_into_id
urls {
... URLFragment
}
@@ -1546,6 +1572,8 @@ fragment PerformerFragment on Performer {
aliases
gender
merged_ids
deleted
merged_into_id
urls {
... URLFragment
}

22
pkg/scraper/stashbox/performer.go
View File

@@ -297,16 +297,18 @@ func performerFragmentToScrapedPerformer(p graphql.PerformerFragment) *models.Sc
}
sp := &models.ScrapedPerformer{
Name: &p.Name,
Disambiguation: p.Disambiguation,
Country: p.Country,
Measurements: formatMeasurements(*p.Measurements),
CareerLength: formatCareerLength(p.CareerStartYear, p.CareerEndYear),
Tattoos: formatBodyModifications(p.Tattoos),
Piercings: formatBodyModifications(p.Piercings),
Twitter: findURL(p.Urls, "TWITTER"),
RemoteSiteID: &p.ID,
Images: images,
Name: &p.Name,
Disambiguation: p.Disambiguation,
Country: p.Country,
Measurements: formatMeasurements(*p.Measurements),
CareerLength: formatCareerLength(p.CareerStartYear, p.CareerEndYear),
Tattoos: formatBodyModifications(p.Tattoos),
Piercings: formatBodyModifications(p.Piercings),
Twitter: findURL(p.Urls, "TWITTER"),
RemoteSiteID: &p.ID,
RemoteDeleted: p.Deleted,
RemoteMergedIntoId: p.MergedIntoID,
Images: images,
// TODO - tags not currently supported
// graphql schema change to accommodate this. Leave off for now.
}