Studio Tagger

docs/DEVELOPMENT.md

@@ -31,6 +31,7 @@ NOTE: The `make` command in Windows will be `mingw32-make` with MingW. For examp
 
 * `make pre-ui` - Installs the UI dependencies. Only needs to be run once before building the UI for the first time, or if the dependencies are updated
 * `make generate` - Generate Go and UI GraphQL files
+* `make generate-stash-box-client` - Generate Go files from a Stash-box
 * `make fmt-ui` - Formats the UI source code
 * `make ui` - Builds the frontend
 * `make build` - Builds the binary (make sure to build the UI as well... see below)

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/disintegration/imaging v1.6.0
 	github.com/fvbommel/sortorder v1.0.2
 	github.com/go-chi/chi v4.0.2+incompatible
+	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/golang-jwt/jwt/v4 v4.0.0
 	github.com/golang-migrate/migrate/v4 v4.15.0-beta.1
 	github.com/gorilla/securecookie v1.1.1

go.sum

@@ -293,6 +293,8 @@ github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhD
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.0.0 h1:RAqyYixv1p7uEnocuy8P1nru5wprCh/MH2BIlW5z5/o=

gqlgen.yml

@@ -78,8 +78,8 @@ models:
     model: github.com/stashapp/stash/internal/manager.AutoTagMetadataInput
   CleanMetadataInput:
     model: github.com/stashapp/stash/internal/manager.CleanMetadataInput
-  StashBoxBatchPerformerTagInput:
-    model: github.com/stashapp/stash/internal/manager.StashBoxBatchPerformerTagInput
+  StashBoxBatchTagInput:
+    model: github.com/stashapp/stash/internal/manager.StashBoxBatchTagInput
   SceneStreamEndpoint:
     model: github.com/stashapp/stash/internal/manager.SceneStreamEndpoint
   ExportObjectTypeInput:

graphql/documents/data/scrapers.graphql

@@ -1,3 +1,18 @@
+fragment ScrapedStudioData on ScrapedStudio {
+  stored_id
+  name
+  url
+  parent {
+    stored_id
+    name
+    url
+    image
+    remote_site_id
+  }
+  image
+  remote_site_id
+}
+
 fragment ScrapedPerformerData on ScrapedPerformer {
   stored_id
   name
@@ -97,6 +112,14 @@ fragment ScrapedSceneStudioData on ScrapedStudio {
   stored_id
   name
   url
+  parent {
+    stored_id
+    name
+    url
+    image
+    remote_site_id
+  }
+  image
   remote_site_id
 }
 

graphql/documents/mutations/stash-box.graphql

@@ -2,10 +2,14 @@ mutation SubmitStashBoxFingerprints($input: StashBoxFingerprintSubmissionInput!)
   submitStashBoxFingerprints(input: $input)
 }
 
-mutation StashBoxBatchPerformerTag($input: StashBoxBatchPerformerTagInput!) {
+mutation StashBoxBatchPerformerTag($input: StashBoxBatchTagInput!) {
   stashBoxBatchPerformerTag(input: $input)
 }
 
+mutation StashBoxBatchStudioTag($input: StashBoxBatchTagInput!) {
+  stashBoxBatchStudioTag(input: $input)
+}
+
 mutation SubmitStashBoxSceneDraft($input: StashBoxDraftSubmissionInput!) {
   submitStashBoxSceneDraft(input: $input)
 }

graphql/documents/queries/scrapers/scrapers.graphql

@@ -42,6 +42,12 @@ query ListMovieScrapers {
   }
 }
 
+query ScrapeSingleStudio($source: ScraperSourceInput!, $input: ScrapeSingleStudioInput!) {
+  scrapeSingleStudio(source: $source, input: $input) {
+    ...ScrapedStudioData
+  }
+}
+
 query ScrapeSinglePerformer($source: ScraperSourceInput!, $input: ScrapeSinglePerformerInput!) {
   scrapeSinglePerformer(source: $source, input: $input) {
     ...ScrapedPerformerData

graphql/schema/schema.graphql

@@ -80,6 +80,9 @@ type Query {
   """Scrape for multiple scenes"""
   scrapeMultiScenes(source: ScraperSourceInput!, input: ScrapeMultiScenesInput!): [[ScrapedScene!]!]!
 
+  """Scrape for a single studio"""
+  scrapeSingleStudio(source: ScraperSourceInput!, input: ScrapeSingleStudioInput!): [ScrapedStudio!]!
+
   """Scrape for a single performer"""
   scrapeSinglePerformer(source: ScraperSourceInput!, input: ScrapeSinglePerformerInput!): [ScrapedPerformer!]!
   """Scrape for multiple performers"""
@@ -311,7 +314,9 @@ type Mutation {
   backupDatabase(input: BackupDatabaseInput!): String
 
   """Run batch performer tag task. Returns the job ID."""
-  stashBoxBatchPerformerTag(input: StashBoxBatchPerformerTagInput!): String!
+  stashBoxBatchPerformerTag(input: StashBoxBatchTagInput!): String!
+  """Run batch studio tag task. Returns the job ID."""
+  stashBoxBatchStudioTag(input: StashBoxBatchTagInput!): String!
 
   """Enables DLNA for an optional duration. Has no effect if DLNA is enabled by default"""
   enableDLNA(input: EnableDLNAInput!): Boolean!

graphql/schema/types/scraper.graphql

@@ -48,11 +48,21 @@ type ScrapedStudio {
   stored_id: ID
   name: String!
   url: String
+  parent: ScrapedStudio
   image: String
 
   remote_site_id: String
 }
 
+type ScrapedParentStudio {
+    stored_id: ID
+    name: String!
+    url: String
+    image: String
+
+    remote_site_id: String
+}
+
 type ScrapedTag {
   """Set if tag matched"""
   stored_id: ID
@@ -147,6 +157,11 @@ input ScrapeMultiScenesInput {
   scene_ids: [ID!]
 }
 
+input ScrapeSingleStudioInput {
+  """Query can be either a name or a Stash ID"""
+  query: String
+}
+
 input ScrapeSinglePerformerInput {
   """Instructs to query by string"""
   query: String
@@ -208,16 +223,18 @@ type StashBoxFingerprint {
   duration: Int!
 }
 
-"""If neither performer_ids nor performer_names are set, tag all performers"""
-input StashBoxBatchPerformerTagInput {
-  "Stash endpoint to use for the performer tagging"
+"""If neither ids nor names are set, tag all items"""
+input StashBoxBatchTagInput {
+  "Stash endpoint to use for the tagging"
   endpoint: Int!
-  "Fields to exclude when executing the performer tagging"
+  "Fields to exclude when executing the tagging"
   exclude_fields: [String!]
-  "Refresh performers already tagged by StashBox if true. Only tag performers with no StashBox tagging if false"
+  "Refresh items already tagged by StashBox if true. Only tag items with no StashBox tagging if false"
   refresh: Boolean!
-  "If set, only tag these performer ids"
-  performer_ids: [ID!]
-  "If set, only tag these performer names"
-  performer_names: [String!]
+  "If batch adding studios, should their parent studios also be created?"
+  createParent: Boolean!
+  "If set, only tag these ids"
+  ids: [ID!]
+  "If set, only tag these names"
+  names: [String!]
 }

graphql/schema/types/studio.graphql

@@ -29,6 +29,7 @@ input StudioCreateInput {
   name: String!
   url: String
   parent_id: ID
+  parent: StudioCreateInput
   """This should be a URL or a base64 encoded data URL"""
   image: String
   stash_ids: [StashIDInput!]
@@ -46,6 +47,7 @@ input StudioUpdateInput {
   name: String
   url: String
   parent_id: ID,
+  parent: StudioCreateInput
   """This should be a URL or a base64 encoded data URL"""
   image: String
   stash_ids: [StashIDInput!]

graphql/stash-box/query.graphql

@@ -16,6 +16,10 @@ fragment StudioFragment on Studio {
   urls {
     ...URLFragment
   }
+  parent {
+    name
+    id
+  }
   images {
     ...ImageFragment
   }
@@ -161,6 +165,12 @@ query FindSceneByID($id: ID!) {
   }
 }
 
+query FindStudio($id: ID, $name: String) {
+  findStudio(id: $id, name: $name) {
+    ...StudioFragment
+  }
+}
+
 mutation SubmitFingerprint($input: FingerprintSubmission!) {
   submitFingerprint(input: $input)
 }

internal/api/resolver_model_studio.go

@@ -2,30 +2,14 @@ package api
 
 import (
 	"context"
-	"time"
 
-	"github.com/stashapp/stash/internal/api/loaders"
 	"github.com/stashapp/stash/internal/api/urlbuilders"
 	"github.com/stashapp/stash/pkg/gallery"
 	"github.com/stashapp/stash/pkg/image"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/performer"
 )
 
-func (r *studioResolver) Name(ctx context.Context, obj *models.Studio) (string, error) {
-	if obj.Name.Valid {
-		return obj.Name.String, nil
-	}
-	panic("null name") // TODO make name required
-}
-
-func (r *studioResolver) URL(ctx context.Context, obj *models.Studio) (*string, error) {
-	if obj.URL.Valid {
-		return &obj.URL.String, nil
-	}
-	return nil, nil
-}
-
 func (r *studioResolver) ImagePath(ctx context.Context, obj *models.Studio) (*string, error) {
 	baseURL, _ := ctx.Value(BaseURLCtxKey).(string)
 	imagePath := urlbuilders.NewStudioURLBuilder(baseURL, obj).GetStudioImageURL()
@@ -47,15 +31,16 @@ func (r *studioResolver) ImagePath(ctx context.Context, obj *models.Studio) (*st
 	return &imagePath, nil
 }
 
-func (r *studioResolver) Aliases(ctx context.Context, obj *models.Studio) (ret []string, err error) {
-	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = r.repository.Studio.GetAliases(ctx, obj.ID)
-		return err
-	}); err != nil {
-		return nil, err
+func (r *studioResolver) Aliases(ctx context.Context, obj *models.Studio) ([]string, error) {
+	if !obj.Aliases.Loaded() {
+		if err := r.withTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadAliases(ctx, r.repository.Studio)
+		}); err != nil {
+			return nil, err
+		}
 	}
 
-	return ret, err
+	return obj.Aliases.List(), nil
 }
 
 func (r *studioResolver) SceneCount(ctx context.Context, obj *models.Studio) (ret *int, err error) {
@@ -107,16 +92,12 @@ func (r *studioResolver) PerformerCount(ctx context.Context, obj *models.Studio)
 }
 
 func (r *studioResolver) ParentStudio(ctx context.Context, obj *models.Studio) (ret *models.Studio, err error) {
-	if !obj.ParentID.Valid {
+	if obj.ParentID == nil {
 		return nil, nil
 	}
 
-	return loaders.From(ctx).StudioByID.Load(int(obj.ParentID.Int64))
-}
-
-func (r *studioResolver) ChildStudios(ctx context.Context, obj *models.Studio) (ret []*models.Studio, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = r.repository.Studio.FindChildren(ctx, obj.ID)
+		ret, err = r.repository.Studio.Find(ctx, *obj.ParentID)
 		return err
 	}); err != nil {
 		return nil, err
@@ -125,48 +106,39 @@ func (r *studioResolver) ChildStudios(ctx context.Context, obj *models.Studio) (
 	return ret, nil
 }
 
-func (r *studioResolver) StashIds(ctx context.Context, obj *models.Studio) ([]*models.StashID, error) {
-	var ret []models.StashID
+func (r *studioResolver) ChildStudios(ctx context.Context, obj *models.Studio) (ret []*models.Studio, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		var err error
-		ret, err = r.repository.Studio.GetStashIDs(ctx, obj.ID)
+		ret, err = r.repository.Studio.FindChildren(ctx, obj.ID)
 		return err
 	}); err != nil {
 		return nil, err
 	}
 
-	return stashIDsSliceToPtrSlice(ret), nil
+	return ret, nil
 }
 
-func (r *studioResolver) Rating(ctx context.Context, obj *models.Studio) (*int, error) {
-	if obj.Rating.Valid {
-		rating := models.Rating100To5(int(obj.Rating.Int64))
-		return &rating, nil
+func (r *studioResolver) StashIds(ctx context.Context, obj *models.Studio) ([]*models.StashID, error) {
+	if !obj.StashIDs.Loaded() {
+		if err := r.withTxn(ctx, func(ctx context.Context) error {
+			return obj.LoadStashIDs(ctx, r.repository.Studio)
+		}); err != nil {
+			return nil, err
+		}
 	}
-	return nil, nil
-}
 
-func (r *studioResolver) Rating100(ctx context.Context, obj *models.Studio) (*int, error) {
-	if obj.Rating.Valid {
-		rating := int(obj.Rating.Int64)
-		return &rating, nil
-	}
-	return nil, nil
+	return stashIDsSliceToPtrSlice(obj.StashIDs.List()), nil
 }
 
-func (r *studioResolver) Details(ctx context.Context, obj *models.Studio) (*string, error) {
-	if obj.Details.Valid {
-		return &obj.Details.String, nil
+func (r *studioResolver) Rating(ctx context.Context, obj *models.Studio) (*int, error) {
+	if obj.Rating != nil {
+		rating := models.Rating100To5(*obj.Rating)
+		return &rating, nil
 	}
 	return nil, nil
 }
 
-func (r *studioResolver) CreatedAt(ctx context.Context, obj *models.Studio) (*time.Time, error) {
-	return &obj.CreatedAt.Timestamp, nil
-}
-
-func (r *studioResolver) UpdatedAt(ctx context.Context, obj *models.Studio) (*time.Time, error) {
-	return &obj.UpdatedAt.Timestamp, nil
+func (r *studioResolver) Rating100(ctx context.Context, obj *models.Studio) (*int, error) {
+	return obj.Rating, nil
 }
 
 func (r *studioResolver) Movies(ctx context.Context, obj *models.Studio) (ret []*models.Movie, err error) {

internal/api/resolver_mutation_stash_box.go

@@ -31,11 +31,16 @@ func (r *mutationResolver) SubmitStashBoxFingerprints(ctx context.Context, input
 	return client.SubmitStashBoxFingerprints(ctx, input.SceneIds, boxes[input.StashBoxIndex].Endpoint)
 }
 
-func (r *mutationResolver) StashBoxBatchPerformerTag(ctx context.Context, input manager.StashBoxBatchPerformerTagInput) (string, error) {
+func (r *mutationResolver) StashBoxBatchPerformerTag(ctx context.Context, input manager.StashBoxBatchTagInput) (string, error) {
 	jobID := manager.GetInstance().StashBoxBatchPerformerTag(ctx, input)
 	return strconv.Itoa(jobID), nil
 }
 
+func (r *mutationResolver) StashBoxBatchStudioTag(ctx context.Context, input manager.StashBoxBatchTagInput) (string, error) {
+	jobID := manager.GetInstance().StashBoxBatchStudioTag(ctx, input)
+	return strconv.Itoa(jobID), nil
+}
+
 func (r *mutationResolver) SubmitStashBoxSceneDraft(ctx context.Context, input StashBoxDraftSubmissionInput) (*string, error) {
 	boxes := config.GetInstance().GetStashBoxes()