[fix] config の output_base_dir が適用されるように修正

shinosaki · Feb 15, 2025 · fa750c3 · fa750c3
1 parent 32b3d38
commit fa750c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/cli/alert.go b/cli/alert.go
@@ -34,7 +34,7 @@ func Alert() *cobra.Command {
 			if programs, err := alert.FetchRecentPrograms(true, client); err != nil {
 				return err
 			} else {
-				alert.Alert(sc, programs, config.Following.Users["nico"], config.Paths.FFmpeg)
+				alert.Alert(sc, programs, config)
 			}
 
 			// Check programs loop
@@ -51,7 +51,7 @@ func Alert() *cobra.Command {
 					if programs, err := alert.FetchRecentPrograms(false, client); err != nil {
 						return err
 					} else {
-						alert.Alert(sc, programs, config.Following.Users["nico"], config.Paths.FFmpeg)
+						alert.Alert(sc, programs, config)
 					}
 				}
 			}

diff --git a/internal/alert/alert.go b/internal/alert/alert.go
@@ -9,16 +9,21 @@ import (
 	"time"
 
 	"github.com/shinosaki/namagent/internal/alert/types"
+	"github.com/shinosaki/namagent/internal/config"
 	"github.com/shinosaki/namagent/internal/recorder"
 	"github.com/shinosaki/namagent/utils"
 )
 
 func Alert(
 	sc *utils.SignalContext,
 	programs []types.RecentProgram,
-	followingUsers []string,
-	ffmpegPath string,
+	config config.Config,
 ) {
+	var (
+		ffmpegPath     = config.Paths.FFmpeg
+		followingUsers = config.Following.Users["nico"]
+	)
+
 	for _, program := range programs {
 		if slices.Contains(followingUsers, program.ProgramProvider.Id) {
 			// show information
@@ -41,6 +46,7 @@ func Alert(
 
 				outputPath, err := filepath.Abs(
 					filepath.Join(
+						config.Paths.OutputBaseDir,
 						program.ProgramProvider.Id,
 						fmt.Sprintf("%s-%s-%s-%s.%s",
 							time.Now().Format("20060102"),