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

Fix setting images (#2068)

Browse Source 
When postprocessing, pass the images by reference rather than value,
so we get the Image fields populated correctly in the output.
This commit is contained in:
SmallCoccinelle
2021-11-29 04:54:01 +01:00
committed by GitHub
parent 7953fa356f
commit cf4ab843f6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/scraper/image.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/stashapp/stash/pkg/utils" "github.com/stashapp/stash/pkg/utils"
) )
func setPerformerImage(ctx context.Context, client *http.Client, p models.ScrapedPerformer, globalConfig GlobalConfig) error { func setPerformerImage(ctx context.Context, client *http.Client, p *models.ScrapedPerformer, globalConfig GlobalConfig) error {
if p.Image == nil || !strings.HasPrefix(*p.Image, "http") { if p.Image == nil || !strings.HasPrefix(*p.Image, "http") {
// nothing to do // nothing to do
return nil return nil
@@ -29,7 +29,7 @@ func setPerformerImage(ctx context.Context, client *http.Client, p models.Scrape
return nil return nil
} }
func setSceneImage(ctx context.Context, client *http.Client, s models.ScrapedScene, globalConfig GlobalConfig) error { func setSceneImage(ctx context.Context, client *http.Client, s *models.ScrapedScene, globalConfig GlobalConfig) error {
// don't try to get the image if it doesn't appear to be a URL // don't try to get the image if it doesn't appear to be a URL
if s.Image == nil || !strings.HasPrefix(*s.Image, "http") { if s.Image == nil || !strings.HasPrefix(*s.Image, "http") {
// nothing to do // nothing to do
@@ -46,7 +46,7 @@ func setSceneImage(ctx context.Context, client *http.Client, s models.ScrapedSce
return nil return nil
} }
func setMovieFrontImage(ctx context.Context, client *http.Client, m models.ScrapedMovie, globalConfig GlobalConfig) error { func setMovieFrontImage(ctx context.Context, client *http.Client, m *models.ScrapedMovie, globalConfig GlobalConfig) error {
// don't try to get the image if it doesn't appear to be a URL // don't try to get the image if it doesn't appear to be a URL
if m.FrontImage == nil || !strings.HasPrefix(*m.FrontImage, "http") { if m.FrontImage == nil || !strings.HasPrefix(*m.FrontImage, "http") {
// nothing to do // nothing to do
@@ -63,7 +63,7 @@ func setMovieFrontImage(ctx context.Context, client *http.Client, m models.Scrap
return nil return nil
} }
func setMovieBackImage(ctx context.Context, client *http.Client, m models.ScrapedMovie, globalConfig GlobalConfig) error { func setMovieBackImage(ctx context.Context, client *http.Client, m *models.ScrapedMovie, globalConfig GlobalConfig) error {
// don't try to get the image if it doesn't appear to be a URL // don't try to get the image if it doesn't appear to be a URL
if m.BackImage == nil || !strings.HasPrefix(*m.BackImage, "http") { if m.BackImage == nil || !strings.HasPrefix(*m.BackImage, "http") {
// nothing to do // nothing to do

8
pkg/scraper/postprocessing.go
View File

@@ -63,7 +63,7 @@ func (c Cache) postScrapePerformer(ctx context.Context, p models.ScrapedPerforme
} }
// post-process - set the image if applicable // post-process - set the image if applicable
if err := setPerformerImage(ctx, c.client, p, c.globalConfig); err != nil { if err := setPerformerImage(ctx, c.client, &p, c.globalConfig); err != nil {
logger.Warnf("Could not set image using URL %s: %s", *p.Image, err.Error()) logger.Warnf("Could not set image using URL %s: %s", *p.Image, err.Error())
} }
@@ -80,10 +80,10 @@ func (c Cache) postScrapeMovie(ctx context.Context, m models.ScrapedMovie) (mode
} }
// post-process - set the image if applicable // post-process - set the image if applicable
if err := setMovieFrontImage(ctx, c.client, m, c.globalConfig); err != nil { if err := setMovieFrontImage(ctx, c.client, &m, c.globalConfig); err != nil {
logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err) logger.Warnf("could not set front image using URL %s: %v", *m.FrontImage, err)
} }
if err := setMovieBackImage(ctx, c.client, m, c.globalConfig); err != nil { if err := setMovieBackImage(ctx, c.client, &m, c.globalConfig); err != nil {
logger.Warnf("could not set back image using URL %s: %v", *m.BackImage, err) logger.Warnf("could not set back image using URL %s: %v", *m.BackImage, err)
} }
@@ -155,7 +155,7 @@ func (c Cache) postScrapeScene(ctx context.Context, scene models.ScrapedScene) (
} }
// post-process - set the image if applicable // post-process - set the image if applicable
if err := setSceneImage(ctx, c.client, scene, c.globalConfig); err != nil { if err := setSceneImage(ctx, c.client, &scene, c.globalConfig); err != nil {
logger.Warnf("Could not set image using URL %s: %v", *scene.Image, err) logger.Warnf("Could not set image using URL %s: %v", *scene.Image, err)
} }