Merge pull request #109 from WithoutPants/optional_performer_image

Generate performer checksum from name instead of image. Use default performer image

pkg/api/images.go

@@ -0,0 +1,19 @@
+package api
+
+import (
+	"math/rand"
+
+	"github.com/gobuffalo/packr/v2"
+)
+
+var performerBox *packr.Box
+
+func initialiseImages() {
+	performerBox = packr.New("Performer Box", "../../static/performer")
+}
+
+func getRandomPerformerImage() ([]byte, error) {
+	imageFiles := performerBox.List()
+	index := rand.Intn(len(imageFiles))
+	return performerBox.Find(imageFiles[index])
+}

pkg/api/resolver_mutation_performer.go

@@ -3,16 +3,27 @@ package api
 import (
 	"context"
 	"database/sql"
+	"strconv"
+	"time"
+
 	"github.com/stashapp/stash/pkg/database"
 	"github.com/stashapp/stash/pkg/models"
 	"github.com/stashapp/stash/pkg/utils"
-	"strconv"
-	"time"
 )
 
 func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.PerformerCreateInput) (*models.Performer, error) {
-	// Process the base 64 encoded image string
-	checksum, imageData, err := utils.ProcessBase64Image(input.Image)
+	// generate checksum from performer name rather than image
+	checksum := utils.MD5FromString(*input.Name)
+
+	var imageData []byte
+	var err error
+
+	if input.Image == nil {
+		imageData, err = getRandomPerformerImage()
+	} else {
+		_, imageData, err = utils.ProcessBase64Image(*input.Image)
+	}
+
 	if err != nil {
 		return nil, err
 	}
@@ -101,15 +112,18 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 		UpdatedAt: models.SQLiteTimestamp{Timestamp: time.Now()},
 	}
 	if input.Image != nil {
-		checksum, imageData, err := utils.ProcessBase64Image(*input.Image)
+		_, imageData, err := utils.ProcessBase64Image(*input.Image)
 		if err != nil {
 			return nil, err
 		}
 		updatedPerformer.Image = imageData
-		updatedPerformer.Checksum = checksum
 	}
 	if input.Name != nil {
+		// generate checksum from performer name rather than image
+		checksum := utils.MD5FromString(*input.Name)
+
 		updatedPerformer.Name = sql.NullString{String: *input.Name, Valid: true}
+		updatedPerformer.Checksum = checksum
 	}
 	if input.URL != nil {
 		updatedPerformer.URL = sql.NullString{String: *input.URL, Valid: true}
@@ -188,4 +202,3 @@ func (r *mutationResolver) PerformerDestroy(ctx context.Context, input models.Pe
 	}
 	return true, nil
 }
-

pkg/api/resolver_mutation_studio.go

@@ -12,8 +12,18 @@ import (
 )
 
 func (r *mutationResolver) StudioCreate(ctx context.Context, input models.StudioCreateInput) (*models.Studio, error) {
+	// generate checksum from studio name rather than image
+	checksum := utils.MD5FromString(input.Name)
+
+	var imageData []byte
+	var err error
+
+	if input.Image == nil {
+		input.Image = &models.DefaultStudioImage
+	}
+
 	// Process the base 64 encoded image string
-	checksum, imageData, err := utils.ProcessBase64Image(input.Image)
+	_, imageData, err = utils.ProcessBase64Image(*input.Image)
 	if err != nil {
 		return nil, err
 	}
@@ -56,15 +66,17 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 		UpdatedAt: models.SQLiteTimestamp{Timestamp: time.Now()},
 	}
 	if input.Image != nil {
-		checksum, imageData, err := utils.ProcessBase64Image(*input.Image)
+		_, imageData, err := utils.ProcessBase64Image(*input.Image)
 		if err != nil {
 			return nil, err
 		}
 		updatedStudio.Image = imageData
-		updatedStudio.Checksum = checksum
 	}
 	if input.Name != nil {
+		// generate checksum from studio name rather than image
+		checksum := utils.MD5FromString(*input.Name)
 		updatedStudio.Name = sql.NullString{String: *input.Name, Valid: true}
+		updatedStudio.Checksum = checksum
 	}
 	if input.URL != nil {
 		updatedStudio.URL = sql.NullString{String: *input.URL, Valid: true}

pkg/api/server.go

@@ -66,6 +66,8 @@ func Start() {
 	//legacyUiBox = packr.New("UI Box", "../../ui/v1/dist/stash-frontend")
 	setupUIBox = packr.New("Setup UI Box", "../../ui/setup")
 
+	initialiseImages()
+	
 	r := chi.NewRouter()
 
 	r.Use(authenticateHandler())