Unify scrape refactor

gqlgen.yml

@@ -34,24 +34,8 @@ models:
  model: github.com/stashapp/stash/pkg/models.Movie
  Tag:
  model: github.com/stashapp/stash/pkg/models.Tag
- ScrapedPerformer:
- model: github.com/stashapp/stash/pkg/models.ScrapedPerformer
- ScrapedScene:
- model: github.com/stashapp/stash/pkg/models.ScrapedScene
- ScrapedScenePerformer:
- model: github.com/stashapp/stash/pkg/models.ScrapedScenePerformer
- ScrapedSceneStudio:
- model: github.com/stashapp/stash/pkg/models.ScrapedSceneStudio
- ScrapedSceneMovie:
- model: github.com/stashapp/stash/pkg/models.ScrapedSceneMovie 
- ScrapedSceneTag:
- model: github.com/stashapp/stash/pkg/models.ScrapedSceneTag
  SceneFileType:
  model: github.com/stashapp/stash/pkg/models.SceneFileType
- ScrapedMovie:
- model: github.com/stashapp/stash/pkg/models.ScrapedMovie
- ScrapedMovieStudio:
- model: github.com/stashapp/stash/pkg/models.ScrapedMovieStudio
  SavedFilter:
  model: github.com/stashapp/stash/pkg/models.SavedFilter
  StashID:

graphql/documents/data/scrapers.graphql

@@ -1,4 +1,5 @@
 fragment ScrapedPerformerData on ScrapedPerformer {
+ stored_id
  name
  gender
  url
@@ -18,15 +19,15 @@ fragment ScrapedPerformerData on ScrapedPerformer {
  tags {
  ...ScrapedSceneTagData
  }
- image
+ images
  details
  death_date
  hair_color
  weight
  remote_site_id
 }
 
-fragment ScrapedScenePerformerData on ScrapedScenePerformer {
+fragment ScrapedScenePerformerData on ScrapedPerformer {
  stored_id
  name
  gender
@@ -55,8 +56,8 @@ fragment ScrapedScenePerformerData on ScrapedScenePerformer {
  weight
 }
 
-fragment ScrapedMovieStudioData on ScrapedMovieStudio {
- id
+fragment ScrapedMovieStudioData on ScrapedStudio {
+ stored_id
  name
  url
 }
@@ -78,7 +79,7 @@ fragment ScrapedMovieData on ScrapedMovie {
  }
 }
 
-fragment ScrapedSceneMovieData on ScrapedSceneMovie {
+fragment ScrapedSceneMovieData on ScrapedMovie {
  stored_id
  name
  aliases
@@ -90,14 +91,14 @@ fragment ScrapedSceneMovieData on ScrapedSceneMovie {
  synopsis
 }
 
-fragment ScrapedSceneStudioData on ScrapedSceneStudio {
+fragment ScrapedSceneStudioData on ScrapedStudio {
  stored_id
  name
  url
  remote_site_id
 }
 
-fragment ScrapedSceneTagData on ScrapedSceneTag {
+fragment ScrapedSceneTagData on ScrapedTag {
  stored_id
  name
 }
@@ -108,6 +109,7 @@ fragment ScrapedSceneData on ScrapedScene {
  url
  date
  image
+ remote_site_id
 
  file {
  size
@@ -135,6 +137,12 @@ fragment ScrapedSceneData on ScrapedScene {
  movies {
  ...ScrapedSceneMovieData
  }
+
+ fingerprints {
+ hash
+ algorithm
+ duration
+ }
 }
 
 fragment ScrapedGalleryData on ScrapedGallery {

graphql/documents/queries/scrapers/scrapers.graphql

@@ -42,14 +42,14 @@ query ListMovieScrapers {
  }
 }
 
-query ScrapePerformerList($scraper_id: ID!, $query: String!) {
- scrapePerformerList(scraper_id: $scraper_id, query: $query) {
+query ScrapeSinglePerformer($source: ScraperSourceInput!, $input: ScrapeSinglePerformerInput!) {
+ scrapeSinglePerformer(source: $source, input: $input) {
  ...ScrapedPerformerData
  }
 }
 
-query ScrapePerformer($scraper_id: ID!, $scraped_performer: ScrapedPerformerInput!) {
- scrapePerformer(scraper_id: $scraper_id, scraped_performer: $scraped_performer) {
+query ScrapeMultiPerformers($source: ScraperSourceInput!, $input: ScrapeMultiPerformersInput!) {
+ scrapeMultiPerformers(source: $source, input: $input) {
  ...ScrapedPerformerData
  }
 }
@@ -60,8 +60,14 @@ query ScrapePerformerURL($url: String!) {
  }
 }
 
-query ScrapeScene($scraper_id: ID!, $scene: SceneUpdateInput!) {
- scrapeScene(scraper_id: $scraper_id, scene: $scene) {
+query ScrapeSingleScene($source: ScraperSourceInput!, $input: ScrapeSingleSceneInput!) {
+ scrapeSingleScene(source: $source, input: $input) {
+ ...ScrapedSceneData
+ }
+}
+
+query ScrapeMultiScenes($source: ScraperSourceInput!, $input: ScrapeMultiScenesInput!) {
+ scrapeMultiScenes(source: $source, input: $input) {
  ...ScrapedSceneData
  }
 }
@@ -72,8 +78,8 @@ query ScrapeSceneURL($url: String!) {
  }
 }
 
-query ScrapeGallery($scraper_id: ID!, $gallery: GalleryUpdateInput!) {
- scrapeGallery(scraper_id: $scraper_id, gallery: $gallery) {
+query ScrapeSingleGallery($source: ScraperSourceInput!, $input: ScrapeSingleGalleryInput!) {
+ scrapeSingleGallery(source: $source, input: $input) {
  ...ScrapedGalleryData
  }
 }
@@ -89,15 +95,3 @@ query ScrapeMovieURL($url: String!) {
  ...ScrapedMovieData
  }
 }
-
-query QueryStashBoxScene($input: StashBoxSceneQueryInput!) {
- queryStashBoxScene(input: $input) {
- ...ScrapedStashBoxSceneData
- }
-}
-
-query QueryStashBoxPerformer($input: StashBoxPerformerQueryInput!) {
- queryStashBoxPerformer(input: $input) {
- ...ScrapedStashBoxPerformerData
- }
-}

graphql/schema/schema.graphql

@@ -72,31 +72,50 @@ type Query {
  listGalleryScrapers: [Scraper!]!
  listMovieScrapers: [Scraper!]!
 
- """Scrape a list of performers based on name"""
- scrapePerformerList(scraper_id: ID!, query: String!): [ScrapedPerformer!]!
- """Scrapes a complete performer record based on a scrapePerformerList result"""
- scrapePerformer(scraper_id: ID!, scraped_performer: ScrapedPerformerInput!): ScrapedPerformer
+ """Scrape for a single scene"""
+ scrapeSingleScene(source: ScraperSourceInput!, input: ScrapeSingleSceneInput!): [ScrapedScene!]!
+ """Scrape for multiple scenes"""
+ scrapeMultiScenes(source: ScraperSourceInput!, input: ScrapeMultiScenesInput!): [[ScrapedScene!]!]!
+
+ """Scrape for a single performer"""
+ scrapeSinglePerformer(source: ScraperSourceInput!, input: ScrapeSinglePerformerInput!): [ScrapedPerformer!]!
+ """Scrape for multiple performers"""
+ scrapeMultiPerformers(source: ScraperSourceInput!, input: ScrapeMultiPerformersInput!): [[ScrapedPerformer!]!]!
+
+ """Scrape for a single gallery"""
+ scrapeSingleGallery(source: ScraperSourceInput!, input: ScrapeSingleGalleryInput!): [ScrapedGallery!]!
+
+ """Scrape for a single movie"""
+ scrapeSingleMovie(source: ScraperSourceInput!, input: ScrapeSingleMovieInput!): [ScrapedMovie!]!
+
  """Scrapes a complete performer record based on a URL"""
  scrapePerformerURL(url: String!): ScrapedPerformer
- """Scrapes a complete scene record based on an existing scene"""
- scrapeScene(scraper_id: ID!, scene: SceneUpdateInput!): ScrapedScene
  """Scrapes a complete performer record based on a URL"""
  scrapeSceneURL(url: String!): ScrapedScene
- """Scrapes a complete gallery record based on an existing gallery"""
- scrapeGallery(scraper_id: ID!, gallery: GalleryUpdateInput!): ScrapedGallery
  """Scrapes a complete gallery record based on a URL"""
  scrapeGalleryURL(url: String!): ScrapedGallery
  """Scrapes a complete movie record based on a URL"""
  scrapeMovieURL(url: String!): ScrapedMovie
 
+ """Scrape a list of performers based on name"""
+ scrapePerformerList(scraper_id: ID!, query: String!): [ScrapedPerformer!]! @deprecated(reason: "use scrapeSinglePerformer")
+ """Scrapes a complete performer record based on a scrapePerformerList result"""
+ scrapePerformer(scraper_id: ID!, scraped_performer: ScrapedPerformerInput!): ScrapedPerformer @deprecated(reason: "use scrapeSinglePerformer")
+ """Scrapes a complete scene record based on an existing scene"""
+ scrapeScene(scraper_id: ID!, scene: SceneUpdateInput!): ScrapedScene @deprecated(reason: "use scrapeSingleScene")
+ """Scrapes a complete gallery record based on an existing gallery"""
+ scrapeGallery(scraper_id: ID!, gallery: GalleryUpdateInput!): ScrapedGallery @deprecated(reason: "use scrapeSingleGallery")
+
  """Scrape a performer using Freeones"""
- scrapeFreeones(performer_name: String!): ScrapedPerformer
+ scrapeFreeones(performer_name: String!): ScrapedPerformer @deprecated(reason: "use scrapeSinglePerformer with scraper_id = builtin_freeones")
  """Scrape a list of performers from a query"""
- scrapeFreeonesPerformerList(query: String!): [String!]!
+ scrapeFreeonesPerformerList(query: String!): [String!]! @deprecated(reason: "use scrapeSinglePerformer with scraper_id = builtin_freeones")
 
  """Query StashBox for scenes"""
- queryStashBoxScene(input: StashBoxSceneQueryInput!): [ScrapedScene!]!
- queryStashBoxPerformer(input: StashBoxPerformerQueryInput!): [StashBoxPerformerQueryResult!]!
+ queryStashBoxScene(input: StashBoxSceneQueryInput!): [ScrapedScene!]! @deprecated(reason: "use scrapeSingleScene or scrapeMultiScenes")
+ """Query StashBox for performers"""
+ queryStashBoxPerformer(input: StashBoxPerformerQueryInput!): [StashBoxPerformerQueryResult!]! @deprecated(reason: "use scrapeSinglePerformer or scrapeMultiPerformers")
+ # === end deprecated methods ===
 
  # Plugins
  """List loaded plugins"""

graphql/schema/types/scraped-movie.graphql

@@ -1,12 +1,6 @@
-type ScrapedMovieStudio {
- """Set if studio matched"""
- id: ID
- name: String!
- url: String
-}
-
 """A movie from a scraping operation..."""
 type ScrapedMovie {
+ stored_id: ID
  name: String
  aliases: String
  duration: String
@@ -15,7 +9,7 @@ type ScrapedMovie {
  director: String
  url: String
  synopsis: String
- studio: ScrapedMovieStudio
+ studio: ScrapedStudio
 
  """This should be a base64 encoded data URL"""
  front_image: String

graphql/schema/types/scraped-performer.graphql

@@ -1,5 +1,7 @@
 """A performer from a scraping operation..."""
 type ScrapedPerformer {
+ """Set if performer matched"""
+ stored_id: ID
  name: String
  gender: String
  url: String
@@ -16,11 +18,11 @@ type ScrapedPerformer {
  tattoos: String
  piercings: String
  aliases: String
- # Should be ScrapedPerformerTag - but would be identical types
- tags: [ScrapedSceneTag!]
+ tags: [ScrapedTag!]
 
  """This should be a base64 encoded data URL"""
- image: String
+ image: String @deprecated(reason: "use images instead")
+ images: [String!]
  details: String
  death_date: String
  hair_color: String
@@ -29,6 +31,8 @@ type ScrapedPerformer {
 }
 
 input ScrapedPerformerInput {
+ """Set if performer matched"""
+ stored_id: ID
  name: String
  gender: String
  url: String