Improvents to boomer mode

Author: warmans

cmd/bot/bot.go

@@ -17,6 +17,7 @@ import (
 	"log/slog"
 	"os"
 	"os/signal"
+	"path"
 )
 
 func NewBotCommand(logger *slog.Logger) *cobra.Command {
@@ -102,12 +103,17 @@ func NewBotCommand(logger *slog.Logger) *cobra.Command {
 				return fmt.Errorf("failed to create docs repo: %w", err)
 			}
 
+			overlayCache, err := mediacache.NewOverlayCache(path.Join(mediaPath, "overlay"), logger)
+			if err != nil {
+				return fmt.Errorf("failed to create overlay cache")
+			}
+
 			logger.Info("Starting bot...")
 			bot, err := discord.NewBot(
 				logger,
 				session,
 				searcher,
-				render.NewExecRenderer(mediaCache, mediaPath, logger),
+				render.NewExecRenderer(mediaCache, mediaPath, logger, overlayCache),
 				botUsername,
 				store.NewSRTStore(conn.Db),
 				docsRepo,

pkg/discord/bot.go

@@ -566,8 +566,8 @@ func (b *Bot) createPreview(
 		OriginalPosition: util.ToPtr(mediaID.FormatPositionRange()),
 		Settings: Settings{
 			// defaults
-			OutputFormat: OutputWebp,
-			BoomerMode:   false,
+			OutputFormat:      OutputWebp,
+			BoomerModeNumGifs: 5,
 		},
 	}
 
@@ -1045,9 +1045,9 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 			Emoji: &discordgo.ComponentEmoji{
 				Name: "🎨",
 			},
-			Style:    successBtnIfTrue(state.Settings.BoomerMode),
+			Style:    successBtnIfTrue(state.Settings.Mode == BoomerMode),
 			Disabled: false,
-			CustomID: ToggleBoomerMode().CustomID(),
+			CustomID: StateSetMode(BoomerMode).CustomID(),
 		},
 	}
 
@@ -1067,6 +1067,48 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 		})
 	}
 
+	boomerButtons := []discordgo.MessageComponent{}
+	if state.Settings.Mode == BoomerMode {
+		lessValue := util.IfElse(state.Settings.BoomerModeNumGifs == 1, 1, state.Settings.BoomerModeNumGifs-1)
+		moreValue := util.IfElse(state.Settings.BoomerModeNumGifs < 20, state.Settings.BoomerModeNumGifs+1, 20)
+		captionButtons = append(captionButtons, discordgo.Button{
+			Label: "One Gif",
+			Emoji: &discordgo.ComponentEmoji{
+				Name: "1️⃣",
+			},
+			Style:    discordgo.SecondaryButton,
+			Disabled: false,
+			CustomID: SetBoomerModeNumGifs(1).CustomID(),
+		})
+		captionButtons = append(captionButtons, discordgo.Button{
+			Label: fmt.Sprintf("Less Gifs (%d)", lessValue),
+			Emoji: &discordgo.ComponentEmoji{
+				Name: "➖",
+			},
+			Style:    discordgo.SecondaryButton,
+			Disabled: false,
+			CustomID: SetBoomerModeNumGifs(lessValue).CustomID(),
+		})
+		captionButtons = append(captionButtons, discordgo.Button{
+			Label: fmt.Sprintf("More Gifs (%d)", moreValue),
+			Emoji: &discordgo.ComponentEmoji{
+				Name: "➕",
+			},
+			Style:    discordgo.SecondaryButton,
+			Disabled: false,
+			CustomID: SetBoomerModeNumGifs(moreValue).CustomID(),
+		})
+		captionButtons = append(captionButtons, discordgo.Button{
+			Label: "10 Gifs",
+			Emoji: &discordgo.ComponentEmoji{
+				Name: "🔟",
+			},
+			Style:    discordgo.SecondaryButton,
+			Disabled: false,
+			CustomID: SetBoomerModeNumGifs(10).CustomID(),
+		})
+	}
+
 	postActions := []discordgo.MessageComponent{discordgo.Button{
 		Label: "Post",
 		Emoji: &discordgo.ComponentEmoji{
@@ -1136,6 +1178,9 @@ func (b *Bot) createButtons(dialog []model2.Dialog, state *PreviewState) ([]disc
 	if len(formatButtons) > 0 {
 		actions = append(actions, discordgo.ActionsRow{Components: formatButtons})
 	}
+	if len(boomerButtons) > 0 {
+		actions = append(actions, discordgo.ActionsRow{Components: boomerButtons})
+	}
 	actions = append(actions, discordgo.ActionsRow{Components: postActions})
 
 	return actions, nil
@@ -1519,7 +1564,7 @@ func (b *Bot) renderFile(state *PreviewState, dialog []model2.Dialog) (*discordg
 		render.WithCustomText(state.Settings.OverrideSubs),
 		render.WithStartTimestamp(startTimestamp),
 		render.WithEndTimestamp(endTimestamp),
-		render.WithGifOverlays(state.Settings.BoomerMode),
+		render.WithGifOverlays(util.IfElse(state.Settings.Mode == BoomerMode, state.Settings.BoomerModeNumGifs, 0)),
 	}
 	if state.Settings.Mode == CaptionMode {
 		options = append(options,

pkg/discord/state.go

@@ -22,7 +22,7 @@ const StateUpdateSetShift = StateUpdateType("set_shift")
 const StateUpdateMode = StateUpdateType("set_mode")
 const StateUpdateOutputFormat = StateUpdateType("set_output_format")
 const StateTogglePreview = StateUpdateType("toggle_preview")
-const StateToggleBoomerMode = StateUpdateType("toggle_boomer_mode")
+const StateSetBoomerModeNumGifs = StateUpdateType("set_boomer_mode_num_gifs")
 
 type Mode string
 
@@ -31,6 +31,7 @@ const (
 	StickerMode Mode = "sticker"
 	CaptionMode Mode = "caption"
 	VideoMode   Mode = "video"
+	BoomerMode  Mode = "boomer"
 )
 
 type OutputFileType string
@@ -52,7 +53,7 @@ type Settings struct {
 	SubsEnabled         bool           `json:"d,omitempty"`
 	OutputFormat        OutputFileType `json:"o,omitempty"`
 	DisablePreviewImage bool           `json:"n,omitempty"`
-	BoomerMode          bool           `json:"bm,omitempty"`
+	BoomerModeNumGifs   int            `json:"bm,omitempty"`
 }
 
 // rawSettings is just Settings with simple types used for encoding/decoding
@@ -66,7 +67,7 @@ type rawSettings struct {
 	SubsEnabled    bool           `json:"d,omitempty"`
 	OutputFormat   OutputFileType `json:"o,omitempty"`
 	DisablePreview bool           `json:"n,omitempty"`
-	BoomerMode     bool           `json:"bm,omitempty"`
+	BoomerMode     int            `json:"bm,omitempty"`
 }
 
 func (c *Settings) UnmarshalJSON(bytes []byte) error {
@@ -94,7 +95,7 @@ func (c *Settings) UnmarshalJSON(bytes []byte) error {
 	c.SubsEnabled = raw.SubsEnabled
 	c.OutputFormat = raw.OutputFormat
 	c.DisablePreviewImage = raw.DisablePreview
-	c.BoomerMode = raw.BoomerMode
+	c.BoomerModeNumGifs = raw.BoomerMode
 
 	return nil
 }
@@ -110,7 +111,7 @@ func (c *Settings) MarshalJSON() ([]byte, error) {
 		SubsEnabled:    c.SubsEnabled,
 		OutputFormat:   c.OutputFormat,
 		DisablePreview: c.DisablePreviewImage,
-		BoomerMode:     c.BoomerMode,
+		BoomerMode:     c.BoomerModeNumGifs,
 	})
 }
 
@@ -264,20 +265,26 @@ func (c *PreviewState) ApplyUpdate(upd StateUpdate) error {
 		c.Settings.Shift = time.Duration(floatVal)
 	case StateUpdateMode:
 		if strVal, ok := upd.Value.(string); !ok {
-			return fmt.Errorf("%s was not expected type (wanted Mode got %T)", upd.Type, upd.Value)
+			return fmt.Errorf("%s was not expected type (wanted string got %T)", upd.Type, upd.Value)
 		} else {
 			c.Settings.Mode = Mode(strVal)
 		}
 	case StateUpdateOutputFormat:
 		if strVal, ok := upd.Value.(string); !ok {
-			return fmt.Errorf("%s was not expected type (wanted Mode got %T)", upd.Type, upd.Value)
+			return fmt.Errorf("%s was not expected type (wanted string got %T)", upd.Type, upd.Value)
 		} else {
 			c.Settings.OutputFormat = OutputFileType(strVal)
 		}
 	case StateTogglePreview:
 		c.Settings.DisablePreviewImage = !c.Settings.DisablePreviewImage
-	case StateToggleBoomerMode:
-		c.Settings.BoomerMode = !c.Settings.BoomerMode
+	case StateSetBoomerModeNumGifs:
+		if intVal, ok := upd.Value.(float64); !ok {
+			c.Settings.BoomerModeNumGifs = 0
+			return fmt.Errorf("%s was not expected type (wanted float64 got %T)", upd.Type, upd.Value)
+		} else {
+			c.Settings.BoomerModeNumGifs = int(intVal)
+		}
+
 	}
 
 	return nil
@@ -346,8 +353,8 @@ func TogglePreview() StateUpdate {
 	return newStateUpdate(StateTogglePreview, nil)
 }
 
-func ToggleBoomerMode() StateUpdate {
-	return newStateUpdate(StateToggleBoomerMode, nil)
+func SetBoomerModeNumGifs(num int) StateUpdate {
+	return newStateUpdate(StateSetBoomerModeNumGifs, num)
 }
 
 func StateSetOutputFormat(format OutputFileType) StateUpdate {

pkg/mediacache/overlays.go

@@ -0,0 +1,37 @@
+package mediacache
+
+import (
+	"log/slog"
+	"math/rand/v2"
+	"os"
+	"path"
+	"strings"
+)
+
+func NewOverlayCache(overlayDir string, logger *slog.Logger) (*OverlayCache, error) {
+	entries, err := os.ReadDir(overlayDir)
+	if err != nil {
+		return nil, err
+	}
+	cache := &OverlayCache{overlays: make([]string, 0)}
+	for _, v := range entries {
+		if v.IsDir() || !strings.HasSuffix(v.Name(), ".gif") {
+			continue
+		}
+		cache.overlays = append(cache.overlays, path.Base(v.Name()))
+		logger.Info("discovered overlay", slog.String("name", path.Base(v.Name())))
+	}
+	return cache, nil
+}
+
+type OverlayCache struct {
+	overlays []string
+}
+
+func (o *OverlayCache) Random(num int) []string {
+	random := []string{}
+	for i := 0; i < num; i++ {
+		random = append(random, o.overlays[rand.IntN(len(o.overlays)-1)])
+	}
+	return random
+}

pkg/render/exec.go

@@ -8,6 +8,7 @@ import (
 	"github.com/warmans/tvgif/pkg/discord/media"
 	"github.com/warmans/tvgif/pkg/mediacache"
 	model2 "github.com/warmans/tvgif/pkg/model"
+	"github.com/warmans/tvgif/pkg/util"
 	"io"
 	"log/slog"
 	"math/rand/v2"
@@ -27,14 +28,15 @@ type Renderer interface {
 	) (*discordgo.File, error)
 }
 
-func NewExecRenderer(cache *mediacache.Cache, mediaPath string, logger *slog.Logger) *ExecRenderer {
-	return &ExecRenderer{mediaCache: cache, mediaPath: mediaPath, logger: logger}
+func NewExecRenderer(cache *mediacache.Cache, mediaPath string, logger *slog.Logger, overlayCache *mediacache.OverlayCache) *ExecRenderer {
+	return &ExecRenderer{mediaCache: cache, mediaPath: mediaPath, logger: logger, overlayCache: overlayCache}
 }
 
 type ExecRenderer struct {
-	mediaCache *mediacache.Cache
-	mediaPath  string
-	logger     *slog.Logger
+	mediaCache   *mediacache.Cache
+	mediaPath    string
+	logger       *slog.Logger
+	overlayCache *mediacache.OverlayCache
 }
 
 func (r *ExecRenderer) RenderFile(
@@ -65,7 +67,7 @@ func (r *ExecRenderer) RenderFile(
 			format = "webp"
 		}
 
-		_, err := r.mediaCache.Get(createFileName(customID, extension), buff, opts.disableCaching || opts.overlayGifs, func(writer io.Writer) error {
+		_, err := r.mediaCache.Get(createFileName(customID, extension), buff, opts.disableCaching || opts.overlayGifs > 0, func(writer io.Writer) error {
 			//video input
 			args := [][]string{
 				{
@@ -77,20 +79,19 @@ func (r *ExecRenderer) RenderFile(
 
 			filterPrefix := ""
 			filtersStartAt := "0:v"
-			numGifs := 5
 
 			// e.g. ffmpeg -i sample.mp4 -an -stream_loop -1 -i gif/hearts-1.gif -ignore_loop 0 -i sparkles.gif -ignore_loop 0 -filter_complex "[0][1]overlay=x=W/2-w/2:y=H/2-h/2:shortest=1[out];[out][2]overlay=x=W/2-w/2:y=H/2-h/2:shortest=1" sample_with_gif.gif
-			if opts.overlayGifs {
+			if opts.overlayGifs > 0 {
 				filterPrefix = ""
 
-				for i, gif := range randomOverlays(numGifs) {
+				for i, gif := range r.overlayCache.Random(opts.overlayGifs) {
 
 					randomX := rand.Float64()
 					randomY := rand.Float64()
 
 					filterPrefix += fmt.Sprintf(
 						"[%s][%d]overlay=x=(W*%0.2f):y=(H*%0.2f):shortest=1:[o%d];",
-						ifElse(i == 0, "0", fmt.Sprintf("o%d", i-1)),
+						util.IfElse(i == 0, "0", fmt.Sprintf("o%d", i-1)),
 						i+1,
 						randomX,
 						randomY,
@@ -104,7 +105,7 @@ func (r *ExecRenderer) RenderFile(
 					})
 				}
 
-				filtersStartAt = fmt.Sprintf("o%d", numGifs-1)
+				filtersStartAt = fmt.Sprintf("o%d", opts.overlayGifs-1)
 
 			}
 
@@ -169,40 +170,3 @@ func flattenArgs(args [][]string) []string {
 	}
 	return out
 }
-
-func randomOverlays(num int) []string {
-	gifs := []string{
-		"behappy.gif",
-		"coffee-2.gif",
-		"goodmorning.gif",
-		"kot.gif",
-		"stars-glitter.gif",
-		"bitcoin-crypto.gif",
-		"da-dan.gif",
-		"minions-minion.gif",
-		"transparent-despair.gif",
-		"cat-cat-meme.gif",
-		"glitter-graphics.gif",
-		"hearts-1.gif",
-		"sparkles.gif",
-		"transparent-hearts.gif",
-		"coffee-1.gif",
-		"good-morning.gif",
-		"heine-sparkle.gif",
-		"spinning-skull.gif",
-	}
-
-	random := []string{}
-	for i := 0; i < num; i++ {
-		random = append(random, gifs[rand.IntN(len(gifs)-1)])
-	}
-
-	return random
-}
-
-func ifElse[T comparable](cond bool, a T, b T) T {
-	if cond {
-		return a
-	}
-	return b
-}

pkg/render/ffmpeg.go

@@ -59,7 +59,7 @@ type renderOpts struct {
 	disableSubs     bool
 	specialMode     SpecialMode
 	stickerModeOpts *StickerModeOpts
-	overlayGifs     bool
+	overlayGifs     int
 }
 
 func WithOutputFileType(tp OutputFileType) Option {
@@ -129,9 +129,9 @@ func WithCaptionMode(enable bool) Option {
 	}
 }
 
-func WithGifOverlays(enable bool) Option {
+func WithGifOverlays(num int) Option {
 	return func(opts *renderOpts) {
-		opts.overlayGifs = enable
+		opts.overlayGifs = num
 	}
 }
 

pkg/util/util.go

@@ -126,3 +126,10 @@ func TrimStrings(s []string) []string {
 func CleanDialogLine(s string) string {
 	return strings.TrimSpace(strings.Join(strings.Split(s, "\n"), " "))
 }
+
+func IfElse[T comparable](cond bool, a T, b T) T {
+	if cond {
+		return a
+	}
+	return b
+}