mirror of
https://github.com/stashapp/stash.git
synced 2025-12-07 00:43:12 +01:00
4089fcf1e2
* Push scrapeByURL into scrapers Replace ScrapePerfomerByURL, ScrapeMovie..., ... with ScrapeByURL in the scraperActionImpl interface. This allows us to delete a lot of repeated code in the scrapers and replace the central part with a switch on the scraper type. * Fold name scraping into one call Follow up on scraper refactoring. Name scrapers use the same code path. This allows us to restructure some code and kill some functions, adding variance to the name scraping code. It allows us to remove some code repetition as well. * Do not export loop refs. * Simplify fragment scraping Generalize fragment scrapers into ScrapeByFragment. This simplifies fragment code flows into a simpler pathing which should be easier to handle in the future. * Eliminate more context.TODO() In a number of cases, we have a context now. Use the context rather than TODO() for those cases in order to make those operations cancellable. * Pass the context for the stashbox scraper This removes all context.TODO() in the path of the stashbox scraper, and replaces it with the context that's present on each of the paths. * Pass the context into subscrapers Mostly a mechanical update, where we pass in the context for subscraping. This removes the final context.TODO() in the scraper code. * Warn on unknown fields from scripts A common mistake for new script writers are that they return fields not known to stash. For instance the name "description" is used rather than "details". Decode disallowing unknown fields. If this fails, use a tee-reader to fall back to the old behavior, but print a warning for the user in this case. Thus, we retain the old behavior, but print warnings for scripts which fails the more strict unknown-fields detection. * Nil-check before running the postprocessing chain Fixes panics when scraping returns nil values. * Lift nil-ness in post-postprocessing If the struct we are trying to post-process is nil, we shouldn't enter the postprocessing flow at all. Pass the struct as a value rather than a pointer, eliminating nil-checks as we go. Use the top-level postProcess call to make the nil-check and then abort there if the object we are looking at is nil. * Allow conversion routines to handle values If we have a non-pointer type in the interface, we should also convert those into ScrapedContent. Otherwise we get errors on deprecated functions.
139 lines
3.6 KiB
Go
139 lines
3.6 KiB
Go
package api
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/stashapp/stash/pkg/models"
|
|
)
|
|
|
|
// marshalScrapedScenes converts ScrapedContent into ScrapedScene. If conversion fails, an
|
|
// error is returned to the caller.
|
|
func marshalScrapedScenes(content []models.ScrapedContent) ([]*models.ScrapedScene, error) {
|
|
var ret []*models.ScrapedScene
|
|
for _, c := range content {
|
|
if c == nil {
|
|
ret = append(ret, nil)
|
|
continue
|
|
}
|
|
|
|
switch s := c.(type) {
|
|
case *models.ScrapedScene:
|
|
ret = append(ret, s)
|
|
case models.ScrapedScene:
|
|
ret = append(ret, &s)
|
|
default:
|
|
return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedScene", models.ErrConversion)
|
|
}
|
|
}
|
|
|
|
return ret, nil
|
|
}
|
|
|
|
// marshalScrapedPerformers converts ScrapedContent into ScrapedPerformer. If conversion
|
|
// fails, an error is returned to the caller.
|
|
func marshalScrapedPerformers(content []models.ScrapedContent) ([]*models.ScrapedPerformer, error) {
|
|
var ret []*models.ScrapedPerformer
|
|
for _, c := range content {
|
|
if c == nil {
|
|
ret = append(ret, nil)
|
|
continue
|
|
}
|
|
|
|
switch p := c.(type) {
|
|
case *models.ScrapedPerformer:
|
|
ret = append(ret, p)
|
|
case models.ScrapedPerformer:
|
|
ret = append(ret, &p)
|
|
default:
|
|
return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedPerformer", models.ErrConversion)
|
|
}
|
|
}
|
|
|
|
return ret, nil
|
|
}
|
|
|
|
// marshalScrapedGalleries converts ScrapedContent into ScrapedGallery. If
|
|
// conversion fails, an error is returned.
|
|
func marshalScrapedGalleries(content []models.ScrapedContent) ([]*models.ScrapedGallery, error) {
|
|
var ret []*models.ScrapedGallery
|
|
for _, c := range content {
|
|
if c == nil {
|
|
ret = append(ret, nil)
|
|
continue
|
|
}
|
|
|
|
switch g := c.(type) {
|
|
case *models.ScrapedGallery:
|
|
ret = append(ret, g)
|
|
case models.ScrapedGallery:
|
|
ret = append(ret, &g)
|
|
default:
|
|
return nil, fmt.Errorf("%w: cannot turn ScrapedContent into ScrapedGallery", models.ErrConversion)
|
|
}
|
|
}
|
|
|
|
return ret, nil
|
|
}
|
|
|
|
// marshalScrapedMovies converts ScrapedContent into ScrapedMovie. If conversion
|
|
// fails, an error is returned.
|
|
func marshalScrapedMovies(content []models.ScrapedContent) ([]*models.ScrapedMovie, error) {
|
|
var ret []*models.ScrapedMovie
|
|
for _, c := range content {
|
|
if c == nil {
|
|
ret = append(ret, nil)
|
|
continue
|
|
}
|
|
|
|
switch m := c.(type) {
|
|
case *models.ScrapedMovie:
|
|
ret = append(ret, m)
|
|
case models.ScrapedMovie:
|
|
ret = append(ret, &m)
|
|
default:
|
|
return nil, fmt.Errorf("%w: cannot turn ScrapedConetnt into ScrapedMovie", models.ErrConversion)
|
|
}
|
|
}
|
|
|
|
return ret, nil
|
|
}
|
|
|
|
// marshalScrapedPerformer will marshal a single performer
|
|
func marshalScrapedPerformer(content models.ScrapedContent) (*models.ScrapedPerformer, error) {
|
|
p, err := marshalScrapedPerformers([]models.ScrapedContent{content})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return p[0], nil
|
|
}
|
|
|
|
// marshalScrapedScene will marshal a single scraped scene
|
|
func marshalScrapedScene(content models.ScrapedContent) (*models.ScrapedScene, error) {
|
|
s, err := marshalScrapedScenes([]models.ScrapedContent{content})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return s[0], nil
|
|
}
|
|
|
|
// marshalScrapedGallery will marshal a single scraped gallery
|
|
func marshalScrapedGallery(content models.ScrapedContent) (*models.ScrapedGallery, error) {
|
|
g, err := marshalScrapedGalleries([]models.ScrapedContent{content})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return g[0], nil
|
|
}
|
|
|
|
// marshalScrapedMovie will marshal a single scraped movie
|
|
func marshalScrapedMovie(content models.ScrapedContent) (*models.ScrapedMovie, error) {
|
|
m, err := marshalScrapedMovies([]models.ScrapedContent{content})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return m[0], nil
|
|
}
|