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

Fix merge error

Browse Source
This commit is contained in:
WithoutPants
2025-03-25 11:19:14 +11:00
parent e5446a2336
commit 2ec264ed62
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scraper/stash.go
View File

@@ -170,7 +170,7 @@ func (s *stashScraper) scrapeByPerformerFragment(ctx context.Context, scrapedPer
return &ret, nil return &ret, nil
} }
func (s *stashScraper) scrapeBySceneFragment(ctx context.Context, scrapedScene ScrapedSceneInput) (ScrapedContent, error) { func (s *stashScraper) scrapeBySceneFragment(ctx context.Context, scrapedScene models.ScrapedSceneInput) (ScrapedContent, error) {
client := s.getStashClient() client := s.getStashClient()
var q struct { var q struct {
@@ -216,10 +216,10 @@ type scrapedStudioStash struct {
type stashFindSceneNamesResultType struct { type stashFindSceneNamesResultType struct {
Count int `graphql:"count"` Count int `graphql:"count"`
Scenes []*ScrapedSceneStash `graphql:"scenes"` Scenes []*scrapedSceneStash `graphql:"scenes"`
} }
func (s *stashScraper) scrapedStashSceneToScrapedScene(ctx context.Context, scene *ScrapedSceneStash) (*models.ScrapedScene, error) { func (s *stashScraper) scrapedStashSceneToScrapedScene(ctx context.Context, scene *scrapedSceneStash) (*models.ScrapedScene, error) {
ret := models.ScrapedScene{} ret := models.ScrapedScene{}
err := copier.Copy(&ret, scene) err := copier.Copy(&ret, scene)
if err != nil { if err != nil {
@@ -329,7 +329,7 @@ func (f stashVideoFile) SceneFileType() models.SceneFileType {
return ret return ret
} }
type ScrapedSceneStash struct { type scrapedSceneStash struct {
ID string `graphql:"id" json:"id"` ID string `graphql:"id" json:"id"`
Title *string `graphql:"title" json:"title"` Title *string `graphql:"title" json:"title"`
Details *string `graphql:"details" json:"details"` Details *string `graphql:"details" json:"details"`
@@ -344,7 +344,7 @@ type ScrapedSceneStash struct {
func (s *stashScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) { func (s *stashScraper) scrapeSceneByScene(ctx context.Context, scene *models.Scene) (*models.ScrapedScene, error) {
// query by MD5 // query by MD5
var q struct { var q struct {
FindScene *ScrapedSceneStash `graphql:"findSceneByHash(input: $c)"` FindScene *scrapedSceneStash `graphql:"findSceneByHash(input: $c)"`
} }
type SceneHashInput struct { type SceneHashInput struct {