refactor: simplify and remove duplicate code

Author: damienbutt

cmd/build.go

@@ -1,7 +1,11 @@
 package cmd
 
 import (
-	"github.com/Norgate-AV/spc/internal/build"
+	"fmt"
+
+	"github.com/Norgate-AV/spc/internal/compiler"
+	"github.com/Norgate-AV/spc/internal/config"
+	"github.com/Norgate-AV/spc/internal/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -14,22 +18,30 @@ var buildCmd = &cobra.Command{
 }
 
 func runBuild(cmd *cobra.Command, args []string) error {
-	service := build.NewBuildService()
-	return service.Build(cmd, args)
+	if len(args) == 0 {
+		return fmt.Errorf("no files specified")
+	}
 
-	// Resolve config
-	// cfg, err := config.Load()
-	// if err != nil {
-	// 	return fmt.Errorf("error loading config: %w", err)
-	// }
+	// Load and validate configuration
+	configLoader := config.NewLoader()
+	cfg, err := configLoader.LoadForBuild(cmd, args)
+	if err != nil {
+		return err
+	}
 
-	// fmt.Printf("%+v\n", cfg)
-	// fmt.Printf("%+v\n", args)
+	// Build compiler command arguments
+	builder := compiler.NewCommandBuilder()
+	cmdArgs, err := builder.BuildCommandArgs(cfg, args)
+	if err != nil {
+		return err
+	}
 
-	// Validate input
-	// if len(args) == 0 {
-	// 	return cmd.Help()
-	// }
+	// Print build info if verbose mode is enabled
+	if cfg.Verbose {
+		series := utils.ParseTarget(cfg.Target)
+		builder.PrintBuildInfo(cfg, series, args, cmdArgs)
+	}
 
-	// return nil
+	// Execute the compiler command
+	return builder.ExecuteCommand(cfg.CompilerPath, cmdArgs)
 }

internal/compiler/compiler.go

@@ -9,6 +9,14 @@ import (
 	"github.com/spf13/viper"
 )
 
+// Default configuration values
+const (
+	DefaultCompilerPath = "C:/Program Files (x86)/Crestron/Simpl/SPlusCC.exe"
+	DefaultTarget       = "234"
+	DefaultSilent       = false
+	DefaultVerbose      = false
+)
+
 // Holds the configuration options for spc
 type Config struct {
 	// Path to the Crestron SIMPL+ compiler
@@ -45,12 +53,12 @@ func Load() (*Config, error) {
 	// Apply defaults if not set
 	if cfg.CompilerPath == "" {
 		if runtime.GOOS != "windows" {
-			cfg.CompilerPath = "C:/Program Files (x86)/Crestron/Simpl/SPlusCC.exe"
+			cfg.CompilerPath = DefaultCompilerPath
 		}
 	}
 
 	if cfg.Target == "" {
-		cfg.Target = "234"
+		cfg.Target = DefaultTarget
 	}
 
 	// Validate required fields

internal/config/config.go

@@ -21,18 +21,18 @@ func TestLoad(t *testing.T) {
 			name: "load with all defaults",
 			setupViper: func() {
 				viper.Reset()
-				viper.SetDefault("compiler_path", "C:/Program Files (x86)/Crestron/Simpl/SPlusCC.exe")
-				viper.SetDefault("target", "234")
-				viper.SetDefault("silent", false)
-				viper.SetDefault("verbose", false)
+				viper.SetDefault("compiler_path", DefaultCompilerPath)
+				viper.SetDefault("target", DefaultTarget)
+				viper.SetDefault("silent", DefaultSilent)
+				viper.SetDefault("verbose", DefaultVerbose)
 			},
 			wantConfig: &Config{
 				CompilerPath: func() string {
-					abs, _ := filepath.Abs("C:/Program Files (x86)/Crestron/Simpl/SPlusCC.exe")
+					abs, _ := filepath.Abs(DefaultCompilerPath)
 					return abs
 				}(),
-				Target:      "234",
-				Silent:      false,
+				Target:      DefaultTarget,
+				Silent:      DefaultSilent,
 				Verbose:     false,
 				UserFolders: nil, // Changed from []string{} to nil
 			},

internal/config/config_test.go

@@ -30,10 +30,10 @@ func (l *Loader) LoadForBuild(cmd *cobra.Command, args []string) (*Config, error
 
 // setupViperDefaults sets up default values for viper
 func (l *Loader) setupViperDefaults() {
-	viper.SetDefault("compiler_path", "C:/Program Files (x86)/Crestron/Simpl/SPlusCC.exe")
-	viper.SetDefault("target", "234")
-	viper.SetDefault("silent", false)
-	viper.SetDefault("verbose", false)
+	viper.SetDefault("compiler_path", DefaultCompilerPath)
+	viper.SetDefault("target", DefaultTarget)
+	viper.SetDefault("silent", DefaultSilent)
+	viper.SetDefault("verbose", DefaultVerbose)
 }
 
 // loadGlobalConfig loads global configuration from APPDATA