Merge duplicate code for file watching

Author: Bruce Hill

pkg/cmd/configwatcher.go

@@ -0,0 +1,62 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/urfave/cli/v3"
+)
+
+type configChangedEvent struct{}
+
+func waitTillConfigChanges(ctx context.Context, cmd *cli.Command, cc *apiCommandContext) error {
+	openapiSpecPath := cc.workspaceConfig.OpenAPISpec
+	if cmd.IsSet("openapi-spec") {
+		openapiSpecPath = cmd.String("openapi-spec")
+	}
+	stainlessConfigPath := cc.workspaceConfig.StainlessConfig
+	if cmd.IsSet("stainless-config") {
+		stainlessConfigPath = cmd.String("stainless-config")
+	}
+
+	// Get initial file modification times
+	openapiSpecInfo, err := os.Stat(openapiSpecPath)
+	if err != nil {
+		return fmt.Errorf("failed to get file info for %s: %v", openapiSpecPath, err)
+	}
+	openapiSpecModTime := openapiSpecInfo.ModTime()
+
+	stainlessConfigInfo, err := os.Stat(stainlessConfigPath)
+	if err != nil {
+		return fmt.Errorf("failed to get file info for %s: %v", stainlessConfigPath, err)
+	}
+	stainlessConfigModTime := stainlessConfigInfo.ModTime()
+
+	// Poll for file changes every 250ms
+	ticker := time.NewTicker(250 * time.Millisecond)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ticker.C:
+			// Check OpenAPI spec file
+			if info, err := os.Stat(openapiSpecPath); err == nil {
+				if info.ModTime().After(openapiSpecModTime) {
+					return nil
+				}
+			}
+
+			// Check Stainless config file
+			if info, err := os.Stat(stainlessConfigPath); err == nil {
+				if info.ModTime().After(stainlessConfigModTime) {
+					return nil
+				}
+			}
+
+		case <-ctx.Done():
+			return ctx.Err()
+		}
+	}
+}

pkg/cmd/dev.go

@@ -402,58 +402,6 @@ func runPreview(ctx context.Context, cmd *cli.Command) error {
 	return nil
 }
 
-func waitTillConfigChanges(ctx context.Context, cmd *cli.Command, cc *apiCommandContext) error {
-	openapiSpecPath := cc.workspaceConfig.OpenAPISpec
-	if cmd.IsSet("openapi-spec") {
-		openapiSpecPath = cmd.String("openapi-spec")
-	}
-	stainlessConfigPath := cc.workspaceConfig.StainlessConfig
-	if cmd.IsSet("stainless-config") {
-		stainlessConfigPath = cmd.String("stainless-config")
-	}
-
-	// Get initial file modification times
-	openapiSpecInfo, err := os.Stat(openapiSpecPath)
-	if err != nil {
-		return fmt.Errorf("failed to get file info for %s: %v", openapiSpecPath, err)
-	}
-	openapiSpecModTime := openapiSpecInfo.ModTime()
-
-	stainlessConfigInfo, err := os.Stat(stainlessConfigPath)
-	if err != nil {
-		return fmt.Errorf("failed to get file info for %s: %v", stainlessConfigPath, err)
-	}
-	stainlessConfigModTime := stainlessConfigInfo.ModTime()
-
-	fmt.Println("Waiting for file changes...")
-
-	// Poll for file changes every 250ms
-	ticker := time.NewTicker(250 * time.Millisecond)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			// Check OpenAPI spec file
-			if info, err := os.Stat(openapiSpecPath); err == nil {
-				if info.ModTime().After(openapiSpecModTime) {
-					return nil
-				}
-			}
-
-			// Check Stainless config file
-			if info, err := os.Stat(stainlessConfigPath); err == nil {
-				if info.ModTime().After(stainlessConfigModTime) {
-					return nil
-				}
-			}
-
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-	}
-}
-
 func runDevBuild(ctx context.Context, cc *apiCommandContext, cmd *cli.Command, branch string, languages []stainless.Target) error {
 	// Handle file flags by reading files and mutating JSON body
 	if err := applyFileFlag(cmd, "openapi-spec", "revision.openapi\\.yml.content"); err != nil {

pkg/cmd/lint.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"log"
 	"os"
 	"time"
 
@@ -46,51 +47,22 @@ var helpStyle = lipgloss.NewStyle().
 	Margin(1, 0, 0, 0)
 
 type lintModel struct {
-	spinner      spinner.Model
-	diagnostics  []stainless.BuildDiagnostic
-	error        error
-	watching     bool
-	watchedFiles map[string]time.Time
-	ctx          context.Context
-	cmd          *cli.Command
-	cc           *apiCommandContext
-	stopPolling  chan struct{}
-	help         helpModel
+	spinner     spinner.Model
+	diagnostics []stainless.BuildDiagnostic
+	error       error
+	watching    bool
+	ctx         context.Context
+	cmd         *cli.Command
+	cc          *apiCommandContext
+	stopPolling chan struct{}
+	help        helpModel
 }
 
 type helpModel struct {
 	width  int
 	height int
 }
 
-type fileChangedEvent struct{}
-
-func waitForFileChanges(m lintModel) tea.Cmd {
-	return func() tea.Msg {
-		ticker := time.NewTicker(250 * time.Millisecond)
-		defer ticker.Stop()
-
-		for {
-			select {
-			case <-ticker.C:
-				for file, lastModTime := range m.watchedFiles {
-					stat, err := os.Stat(file)
-					if err != nil {
-						continue
-					}
-
-					if stat.ModTime().After(lastModTime) {
-						m.watchedFiles[file] = stat.ModTime()
-						return fileChangedEvent{}
-					}
-				}
-			case <-m.stopPolling:
-				return nil
-			}
-		}
-	}
-}
-
 func (m lintModel) Init() tea.Cmd {
 	if m.watching {
 		// Clear the screen and move the cursor to the top
@@ -116,11 +88,16 @@ func (m lintModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.cc = msg.cc
 
 		if m.watching {
-			return m, waitForFileChanges(m)
+			return m, func() tea.Msg {
+				if err := waitTillConfigChanges(m.ctx, m.cmd, m.cc); err != nil {
+					log.Fatal(err)
+				}
+				return configChangedEvent{}
+			}
 		}
 		return m, tea.Quit
 
-	case fileChangedEvent:
+	case configChangedEvent:
 		m.diagnostics = nil // Clear diagnostics while linting
 		return m, getDiagnosticsCmd(m.ctx, m.cmd, m.cc)
 
@@ -186,20 +163,13 @@ func runLinter(ctx context.Context, cmd *cli.Command) error {
 	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("208"))
 
 	m := lintModel{
-		spinner:      s,
-		watching:     cmd.Bool("watch"),
-		ctx:          ctx,
-		cmd:          cmd,
-		cc:           cc,
-		watchedFiles: make(map[string]time.Time),
-		stopPolling:  make(chan struct{}),
-		help:         helpModel{},
-	}
-
-	if m.watching {
-		if err := setupFileWatcher(&m, cmd, cc); err != nil {
-			return err
-		}
+		spinner:     s,
+		watching:    cmd.Bool("watch"),
+		ctx:         ctx,
+		cmd:         cmd,
+		cc:          cc,
+		stopPolling: make(chan struct{}),
+		help:        helpModel{},
 	}
 
 	p := tea.NewProgram(m, tea.WithContext(ctx))
@@ -231,32 +201,3 @@ func runLinter(ctx context.Context, cmd *cli.Command) error {
 
 	return nil
 }
-
-func setupFileWatcher(m *lintModel, cmd *cli.Command, cc *apiCommandContext) error {
-	// Watch OpenAPI spec file
-	openapiSpecPath := cc.workspaceConfig.OpenAPISpec
-	if cmd.IsSet("openapi-spec") {
-		openapiSpecPath = cmd.String("openapi-spec")
-	}
-
-	if err := addFileToWatch(m, openapiSpecPath); err != nil {
-		return err
-	}
-
-	// Watch Stainless config file
-	stainlessConfigPath := cc.workspaceConfig.StainlessConfig
-	if cmd.IsSet("stainless-config") {
-		stainlessConfigPath = cmd.String("stainless-config")
-	}
-
-	return addFileToWatch(m, stainlessConfigPath)
-}
-
-func addFileToWatch(m *lintModel, path string) error {
-	stat, err := os.Stat(path)
-	if err != nil {
-		return fmt.Errorf("failed to get file info for %s: %v", path, err)
-	}
-	m.watchedFiles[path] = stat.ModTime()
-	return nil
-}