From e6d9ed47eee38d812cc9f5651d05872ecbdfc8ac Mon Sep 17 00:00:00 2001
From: Max Holland <max@livepeer.org>
Date: Fri, 10 Nov 2023 15:49:11 +0000
Subject: [PATCH] Enable thumbs vtt for clips and recordings (#225)

---
 task/upload.go | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/task/upload.go b/task/upload.go
index 20a0ccd..fe3c75d 100644
--- a/task/upload.go
+++ b/task/upload.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/url"
+	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -474,6 +475,18 @@ func processCatalystCallback(tctx *TaskContext, callback *clients.CatalystCallba
 		Path: toAssetRelativePath(playbackID, fullPath),
 	})
 
+	// add thumbs vtt output file
+	thumbsLocation := "thumbnails/thumbnails.vtt"
+	_, err = tctx.outputOS.ReadData(tctx, path.Join(playbackID, thumbsLocation))
+	if err != nil {
+		glog.Warningf("Thumbnails VTT not found: taskId=%s err=%q", tctx.Task.ID, err)
+	} else {
+		assetSpec.Files = append(assetSpec.Files, api.AssetFile{
+			Type: "thumbnails_vtt",
+			Path: thumbsLocation,
+		})
+	}
+
 	var output *data.UploadTaskOutput
 
 	if tctx.Task.Params.Upload != nil {
@@ -674,13 +687,13 @@ func isEncryptionEnabled(params api.UploadTaskParams) bool {
 func uploadTaskOutputLocations(tctx *TaskContext) ([]OutputName, []clients.OutputLocation, error) {
 	playbackId := tctx.OutputAsset.PlaybackID
 	outURL := tctx.OutputOSObj.URL
-	var mp4 string
+	var mp4, thumbsEnabled string
 	if tctx.OutputAsset.Source.Type == "recording" {
 		mp4 = OUTPUT_ENABLED
+		thumbsEnabled = OUTPUT_ENABLED
 	} else {
 		mp4 = OUTPUT_ONLY_SHORT
 	}
-	thumbsEnabled := ""
 	if tctx.Task.Params.Upload.Thumbnails {
 		thumbsEnabled = OUTPUT_ENABLED
 	}
@@ -736,8 +749,9 @@ func clipTaskOutputLocations(tctx *TaskContext) ([]OutputName, []clients.OutputL
 	outputNames, outputLocations, err := outputLocations(
 		outURL,
 		outputs{
-			hls: out(OUTPUT_ENABLED, playbackId),
-			mp4: out(OUTPUT_ENABLED, playbackId),
+			hls:        out(OUTPUT_ENABLED, playbackId),
+			mp4:        out(OUTPUT_ENABLED, playbackId),
+			thumbnails: out(OUTPUT_ENABLED, playbackId),
 		},
 		false,
 	)