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

Resolve performer/studio stashIDs for scraped scenes (#2006)

Browse Source 
* Resolve performer/studio stashIDs for scraped scenes
* Check endpoint when matching stashids
This commit is contained in:
InfiniteTF
2021-11-14 21:51:52 +01:00
committed by GitHub
parent 2a5afecc77
commit c571687c99
9 changed files with 116 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/match/scraped.go
View File

@@ -10,11 +10,27 @@ import (
// ScrapedPerformer matches the provided performer with the
// performers in the database and sets the ID field if one is found.
func ScrapedPerformer(qb models.PerformerReader, p *models.ScrapedPerformer) error {
func ScrapedPerformer(qb models.PerformerReader, p *models.ScrapedPerformer, stashBoxEndpoint *string) error {
if p.StoredID != nil || p.Name == nil {
return nil
}
// Check if a performer with the StashID already exists
if stashBoxEndpoint != nil && p.RemoteSiteID != nil {
performers, err := qb.FindByStashID(models.StashID{
StashID: *p.RemoteSiteID,
Endpoint: *stashBoxEndpoint,
})
if err != nil {
return err
}
if len(performers) > 0 {
id := strconv.Itoa(performers[0].ID)
p.StoredID = &id
return nil
}
}
performers, err := qb.FindByNames([]string{*p.Name}, true)
if err != nil {
@@ -33,11 +49,27 @@ func ScrapedPerformer(qb models.PerformerReader, p *models.ScrapedPerformer) err
// ScrapedStudio matches the provided studio with the studios
// in the database and sets the ID field if one is found.
func ScrapedStudio(qb models.StudioReader, s *models.ScrapedStudio) error {
func ScrapedStudio(qb models.StudioReader, s *models.ScrapedStudio, stashBoxEndpoint *string) error {
if s.StoredID != nil {
return nil
}
// Check if a studio with the StashID already exists
if stashBoxEndpoint != nil && s.RemoteSiteID != nil {
studios, err := qb.FindByStashID(models.StashID{
StashID: *s.RemoteSiteID,
Endpoint: *stashBoxEndpoint,
})
if err != nil {
return err
}
if len(studios) > 0 {
id := strconv.Itoa(studios[0].ID)
s.StoredID = &id
return nil
}
}
st, err := studio.ByName(qb, s.Name)
if err != nil {