fix: cache files specific to target

Author: damienbutt

.goreleaser.yml

@@ -75,10 +75,10 @@ release:
 scoops:
   - name: spc
     repository:
-      owner: damienbutt
-      name: scoop-bucket
+      owner: Norgate-AV
+      name: scoop-bucket-crestron
       token: "{{ .Env.RELEASE_TOKEN }}"
     directory: bucket
     homepage: https://github.com/Norgate-AV/spc
-    description: "CLI wrapper for the Crestron SIMPL+ Compiler"
+    description: "A better way to compile Crestron SIMPL+ files"
     license: MIT

internal/cache/artifacts.go

@@ -72,8 +72,9 @@ func RestoreArtifacts(cacheDir, destDir string, outputs []string) error {
 //  1. The source file directory for .ush header files
 //  2. The SPlsWork directory for source-specific artifacts
 //
+// Only collects files for the specified target (e.g., if target="34", skips S2_* files)
 // Returns paths relative to the source directory (e.g., "example.ush", "SPlsWork/example.dll")
-func CollectOutputs(sourceFile string) ([]string, error) {
+func CollectOutputs(sourceFile string, target string) ([]string, error) {
 	var outputs []string
 
 	// Extract base name without extension (e.g., "example1" from "example1.usp")
@@ -111,9 +112,9 @@ func CollectOutputs(sourceFile string) ([]string, error) {
 			continue
 		}
 
-		// Check if this file belongs to our source file
-		// Match patterns: {basename}.* or S2_{basename}.*
-		if isOutputFile(name, baseName) {
+		// Check if this file belongs to our source file AND target
+		// Match patterns: {basename}.* or S2_{basename}.* (depending on target)
+		if isOutputFileForTarget(name, baseName, target) {
 			// Store with SPlsWork/ prefix for proper path handling
 			outputs = append(outputs, filepath.Join("SPlsWork", name))
 		}
@@ -221,6 +222,51 @@ func isOutputFile(filename, baseName string) bool {
 	return false
 }
 
+// isOutputFileForTarget checks if a file belongs to the given source AND target
+// For target "34", only matches example1.* (not S2_example1.*)
+// For target "234", matches both example1.* and S2_example1.*
+func isOutputFileForTarget(filename, baseName, target string) bool {
+	fileBase := filename[:len(filename)-len(filepath.Ext(filename))]
+
+	// Direct match: example1.dll, example1.cs, etc.
+	// These are for Series 3 and 4
+	if fileBase == baseName {
+		return true
+	}
+
+	// Target-prefixed match: S2_example1.c, S2_example1.h, S3_example1.*, S4_example1.*
+	if len(fileBase) > 3 && fileBase[0] == 'S' && fileBase[2] == '_' {
+		// Extract the series number
+		seriesChar := fileBase[1]
+
+		// Extract the base name after prefix
+		if fileBase[3:] == baseName {
+			// Check if this series is in the target
+			// For example, if target="34", we want Series 3 and 4, not Series 2
+			switch seriesChar {
+			case '2':
+				return contains(target, '2')
+			case '3':
+				return contains(target, '3')
+			case '4':
+				return contains(target, '4')
+			}
+		}
+	}
+
+	return false
+}
+
+// contains checks if a string contains a specific character
+func contains(s string, ch byte) bool {
+	for i := 0; i < len(s); i++ {
+		if s[i] == ch {
+			return true
+		}
+	}
+	return false
+}
+
 // copyFile copies a file from src to dst
 func copyFile(src, dst string) error {
 	srcFile, err := os.Open(src)

internal/cache/cache.go

@@ -126,7 +126,8 @@ func (c *Cache) Store(sourceFile string, cfg *config.Config, success bool) error
 	}
 
 	// Collect outputs from both source dir and SPlsWork dir
-	outputs, err := CollectOutputs(sourceFile)
+	// Only collect files for the current target (prevents caching leftover files)
+	outputs, err := CollectOutputs(sourceFile, cfg.Target)
 	if err != nil {
 		return fmt.Errorf("failed to collect outputs: %w", err)
 	}

internal/cache/cache_test.go

@@ -113,13 +113,13 @@ func TestCollectOutputs_Filtering(t *testing.T) {
 	err = os.WriteFile(ushFile, []byte("header"), 0o644)
 	require.NoError(t, err)
 
-	// Collect outputs for example1.usp
-	outputs, err := CollectOutputs(sourceFile)
+	// Test 1: Collect outputs for target "234" (all series)
+	outputs, err := CollectOutputs(sourceFile, "234")
 	require.NoError(t, err)
 
 	// Should collect: 1 .ush file + 9 SPlsWork files = 10 total
 	expectedCount := 10
-	assert.Len(t, outputs, expectedCount, "Should collect .ush + SPlsWork files for example1.usp")
+	assert.Len(t, outputs, expectedCount, "Should collect .ush + SPlsWork files for example1.usp with target 234")
 
 	// Verify correct files are included
 	outputMap := make(map[string]bool)
@@ -141,6 +141,30 @@ func TestCollectOutputs_Filtering(t *testing.T) {
 	assert.False(t, outputMap[filepath.Join("SPlsWork", "S2_example2.c")], "Should NOT include S2_example2.c")
 	assert.False(t, outputMap[filepath.Join("SPlsWork", "Version.ini")], "Should NOT include shared library files")
 	assert.False(t, outputMap[filepath.Join("SPlsWork", "ManagedUtilities.dll")], "Should NOT include shared library files")
+
+	// Test 2: Collect outputs for target "34" (no series 2)
+	outputs34, err := CollectOutputs(sourceFile, "34")
+	require.NoError(t, err)
+
+	// Should collect: 1 .ush file + 3 SPlsWork files (no S2_* files) = 4 total
+	expectedCount34 := 4
+	assert.Len(t, outputs34, expectedCount34, "Should collect only Series 3/4 files for target 34")
+
+	outputMap34 := make(map[string]bool)
+	for _, output := range outputs34 {
+		outputMap34[output] = true
+	}
+
+	// Check that Series 3/4 files are included
+	assert.True(t, outputMap34["example1.ush"], "Should include example1.ush")
+	assert.True(t, outputMap34[filepath.Join("SPlsWork", "example1.dll")], "Should include example1.dll")
+	assert.True(t, outputMap34[filepath.Join("SPlsWork", "example1.cs")], "Should include example1.cs")
+	assert.True(t, outputMap34[filepath.Join("SPlsWork", "example1.inf")], "Should include example1.inf")
+
+	// Check that Series 2 files are NOT included
+	assert.False(t, outputMap34[filepath.Join("SPlsWork", "S2_example1.c")], "Should NOT include S2_example1.c for target 34")
+	assert.False(t, outputMap34[filepath.Join("SPlsWork", "S2_example1.h")], "Should NOT include S2_example1.h for target 34")
+	assert.False(t, outputMap34[filepath.Join("SPlsWork", "S2_example1.elf")], "Should NOT include S2_example1.elf for target 34")
 }
 
 func TestCache_StoreAndGet(t *testing.T) {

internal/config/config_test.go

@@ -99,7 +99,7 @@ func TestLoad(t *testing.T) {
 					abs, _ := filepath.Abs("C:/SPlusCC.exe")
 					return abs
 				}(),
-				Target:      "234",
+				Target:      "34",
 				UserFolders: nil,
 			},
 			wantErr: false,

internal/config/loader_test.go

@@ -22,7 +22,7 @@ func TestLoader_SetupViperDefaults(t *testing.T) {
 	loader.setupViperDefaults()
 
 	assert.Equal(t, "C:/Program Files (x86)/Crestron/Simpl/SPlusCC.exe", viper.GetString("compiler_path"))
-	assert.Equal(t, "234", viper.GetString("target"))
+	assert.Equal(t, "34", viper.GetString("target"))
 	assert.Equal(t, false, viper.GetBool("silent"))
 	assert.Equal(t, false, viper.GetBool("verbose"))
 }