Merge pull request #188 from bcc-code/fix/thumbnail-generation

Fix thumbnail generation
bcc-code · Mar 15, 2024 · aebdb3a · aebdb3a
2 parents 29aa275 + 209cd55
commit aebdb3a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/activities/vidispine/files.go b/activities/vidispine/files.go
@@ -79,6 +79,8 @@ func CreatePlaceholderActivity(ctx context.Context, params CreatePlaceholderPara
 
 type CreateThumbnailsParams struct {
 	AssetID string
+	Width   int
+	Height  int
 }
 
 type JobResult struct {
@@ -96,7 +98,12 @@ func CreateThumbnailsActivity(ctx context.Context, params CreateThumbnailsParams
 
 	vsClient := GetClient()
 
-	res, err := vsClient.CreateThumbnails(params.AssetID)
+	if params.Width == 0 {
+		params.Width = 320
+		params.Height = 180
+	}
+
+	res, err := vsClient.CreateThumbnails(params.AssetID, params.Width, params.Height)
 	return &JobResult{
 		JobID: res,
 	}, err

diff --git a/services/vidispine/service.go b/services/vidispine/service.go
@@ -17,7 +17,7 @@ type Client interface {
 	SetItemMetadataField(itemVXID, group, field, value string) error
 	AddToItemMetadataField(itemID, group, key, value string) error
 	CreatePlaceholder(ingestType vsapi.PlaceholderType, title string) (string, error)
-	CreateThumbnails(assetID string) (string, error)
+	CreateThumbnails(assetID string, width, height int) (string, error)
 	GetJob(jobID string) (*vsapi.JobDocument, error)
 	AddFileToPlaceholder(itemID, fileID, tag string, fileState vsapi.FileState) (string, error)
 	GetResolutions(itemVXID string) ([]vsapi.Resolution, error)

diff --git a/services/vidispine/vsapi/placeholder.go b/services/vidispine/vsapi/placeholder.go
@@ -2,6 +2,7 @@ package vsapi
 
 import (
 	"bytes"
+	"fmt"
 	"net/url"
 )
 
@@ -90,12 +91,12 @@ func (c *Client) AddFileToPlaceholder(itemID, fileID, tag string, fileState File
 	return result.Result().(*JobDocument).JobID, nil
 }
 
-func (c *Client) CreateThumbnails(itemID string) (string, error) {
+func (c *Client) CreateThumbnails(itemID string, width, height int) (string, error) {
 	result, err := c.restyClient.R().
 		SetHeader("content-type", "application/xml").
 		SetHeader("accept", "application/json").
 		SetResult(&JobDocument{}).
-		Post("/item/" + url.PathEscape(itemID) + "/thumbnail?createThumbnails=true")
+		Post(fmt.Sprintf("/item/%s/thumbnail?createThumbnails=true&thumbnailWidth=%d&thumbnailHeight=%d", url.PathEscape(itemID), width, height))
 
 	if err != nil {
 		return "", err