Merge pull request #326 from neongreen/copilot/finish-folder-sync-implementation

Complete folder sync implementation: exclude patterns and duplicate command fix

Author: neongreen

conf/cmd/apply.go

@@ -161,7 +161,7 @@ func applyFolder(conf *config.Config, configDir, folderName string, dryRun bool)
 
 	// Detect drift
 	confPath := config.FolderCopyPath(configDir, folderName)
-	drifts, err := folders.DetectDrift(folder.SourcePath, confPath)
+	drifts, err := folders.DetectDriftWithExcludes(folder.SourcePath, confPath, folder.Exclude)
 	if err != nil {
 		return fmt.Errorf("failed to detect drift: %w", err)
 	}

conf/cmd/import_folders.go

@@ -25,7 +25,7 @@ func importFolder(conf *config.Config, configDir, folderName string, dryRun bool
 
 	// Detect drift
 	confPath := config.FolderCopyPath(configDir, folderName)
-	drifts, err := folders.DetectDrift(folder.SourcePath, confPath)
+	drifts, err := folders.DetectDriftWithExcludes(folder.SourcePath, confPath, folder.Exclude)
 	if err != nil {
 		return fmt.Errorf("failed to detect drift: %w", err)
 	}

conf/cmd/root.go

@@ -35,7 +35,7 @@ func init() {
 	RootCmd.AddCommand(starshipCmd)
 	RootCmd.AddCommand(shimsCmd)
 	RootCmd.AddCommand(applyCmd)
-	RootCmd.AddCommand(statusCmd)
+	// statusCmd is registered in status.go init()
 	RootCmd.AddCommand(syncCmd)
 	RootCmd.AddCommand(importCmd)
 	RootCmd.AddCommand(completionCmd)

conf/cmd/status.go

@@ -124,7 +124,7 @@ func showFolderStatus(conf *config.Config, configDir, folderName string) error {
 
 	// Detect drift
 	confPath := config.FolderCopyPath(configDir, folderName)
-	drifts, err := folders.DetectDrift(folder.SourcePath, confPath)
+	drifts, err := folders.DetectDriftWithExcludes(folder.SourcePath, confPath, folder.Exclude)
 	if err != nil {
 		return fmt.Errorf("failed to detect drift: %w", err)
 	}

conf/cmd/sync_folders.go

@@ -39,7 +39,7 @@ func syncFolder(conf *config.Config, configDir, folderName string, dryRun bool)
 		}
 	} else {
 		// Detect drift between source and conf copy
-		drifts, err := folders.DetectDrift(sourcePath, confCopyPath)
+		drifts, err := folders.DetectDriftWithExcludes(sourcePath, confCopyPath, folder.Exclude)
 		if err != nil {
 			return fmt.Errorf("failed to detect drift: %w", err)
 		}
@@ -75,7 +75,8 @@ func syncFolder(conf *config.Config, configDir, folderName string, dryRun bool)
 	}
 
 	// Detect drift between conf copy and iCloud
-	icloudDrifts, err := folders.DetectDrift(confCopyPath, icloudFolderPath)
+	// Note: We use the same exclude patterns for iCloud sync to maintain consistency
+	icloudDrifts, err := folders.DetectDriftWithExcludes(confCopyPath, icloudFolderPath, folder.Exclude)
 	if err != nil {
 		return fmt.Errorf("failed to detect iCloud drift: %w", err)
 	}

conf/cmd/track.go

@@ -74,8 +74,8 @@ Examples:
 		fmt.Printf("  Name: %s\n", folderName)
 		fmt.Printf("  Copy to: %s\n", folderCopyPath)
 
-		// Copy folder to conf directory
-		if err := copyDir(expandedSource, folderCopyPath); err != nil {
+		// Copy folder to conf directory, excluding specified patterns
+		if err := copyDir(expandedSource, folderCopyPath, excludePatterns); err != nil {
 			return fmt.Errorf("failed to copy folder: %w", err)
 		}
 		fmt.Printf("  ✓ Copied folder\n")
@@ -111,8 +111,8 @@ Examples:
 	},
 }
 
-// copyDir recursively copies a directory
-func copyDir(src, dst string) error {
+// copyDir recursively copies a directory, skipping files that match exclude patterns
+func copyDir(src, dst string, excludePatterns []string) error {
 	// Get source directory info
 	srcInfo, err := os.Stat(src)
 	if err != nil {
@@ -131,12 +131,17 @@ func copyDir(src, dst string) error {
 	}
 
 	for _, entry := range entries {
+		// Check if entry should be excluded
+		if shouldExclude(entry.Name(), excludePatterns) {
+			continue
+		}
+
 		srcPath := filepath.Join(src, entry.Name())
 		dstPath := filepath.Join(dst, entry.Name())
 
 		if entry.IsDir() {
 			// Recursively copy subdirectory
-			if err := copyDir(srcPath, dstPath); err != nil {
+			if err := copyDir(srcPath, dstPath, excludePatterns); err != nil {
 				return err
 			}
 		} else {
@@ -150,6 +155,18 @@ func copyDir(src, dst string) error {
 	return nil
 }
 
+// shouldExclude checks if a filename matches any of the exclude patterns.
+// Invalid patterns are silently ignored (treated as non-matching).
+func shouldExclude(filename string, patterns []string) bool {
+	for _, pattern := range patterns {
+		// Error from filepath.Match indicates invalid pattern syntax - we skip such patterns
+		if matched, err := filepath.Match(pattern, filename); err == nil && matched {
+			return true
+		}
+	}
+	return false
+}
+
 // copyFile copies a single file, preserving permissions
 func copyFile(src, dst string) error {
 	// Open source file

conf/pkg/folders/drift.go

@@ -13,25 +13,33 @@ import (
 type FileStatus string
 
 const (
-	StatusInSync   FileStatus = "IN_SYNC"   // File content matches
-	StatusModified FileStatus = "MODIFIED"  // File exists in both, content differs
-	StatusAdded    FileStatus = "ADDED"     // File in source, not in conf copy
-	StatusDeleted  FileStatus = "DELETED"   // File in conf copy, not in source
+	StatusInSync   FileStatus = "IN_SYNC"  // File content matches
+	StatusModified FileStatus = "MODIFIED" // File exists in both, content differs
+	StatusAdded    FileStatus = "ADDED"    // File in source, not in conf copy
+	StatusDeleted  FileStatus = "DELETED"  // File in conf copy, not in source
 )
 
 // FileDrift represents a difference between source and conf copy
 type FileDrift struct {
-	RelPath      string     // Relative path from folder root
-	Status       FileStatus
-	SourceHash   string // SHA256 hash of source file (if exists)
-	ConfHash     string // SHA256 hash of conf file (if exists)
-	SourceMtime  int64  // Modification time of source file
-	ConfMtime    int64  // Modification time of conf file
-	IsDir        bool   // Whether this is a directory
+	RelPath     string // Relative path from folder root
+	Status      FileStatus
+	SourceHash  string // SHA256 hash of source file (if exists)
+	ConfHash    string // SHA256 hash of conf file (if exists)
+	SourceMtime int64  // Modification time of source file
+	ConfMtime   int64  // Modification time of conf file
+	IsDir       bool   // Whether this is a directory
 }
 
-// DetectDrift compares source folder with conf copy and returns all differences
+// DetectDrift compares source folder with conf copy and returns all differences.
+// This is a convenience wrapper that calls DetectDriftWithExcludes with no excludes.
 func DetectDrift(sourcePath, confPath string) ([]FileDrift, error) {
+	return DetectDriftWithExcludes(sourcePath, confPath, nil)
+}
+
+// DetectDriftWithExcludes compares source folder with conf copy and returns all differences,
+// excluding files that match any of the provided patterns.
+// Patterns support shell-style wildcards (*, ?) via filepath.Match.
+func DetectDriftWithExcludes(sourcePath, confPath string, excludePatterns []string) ([]FileDrift, error) {
 	var drifts []FileDrift
 
 	// Build maps of all files in source and conf
@@ -51,6 +59,13 @@ func DetectDrift(sourcePath, confPath string) ([]FileDrift, error) {
 		if relPath == "." {
 			return nil
 		}
+		// Skip excluded files
+		if shouldExclude(relPath, info.Name(), excludePatterns) {
+			if info.IsDir() {
+				return filepath.SkipDir
+			}
+			return nil
+		}
 		sourceFiles[relPath] = info
 		return nil
 	}); err != nil {
@@ -70,6 +85,13 @@ func DetectDrift(sourcePath, confPath string) ([]FileDrift, error) {
 		if relPath == "." {
 			return nil
 		}
+		// Skip excluded files
+		if shouldExclude(relPath, info.Name(), excludePatterns) {
+			if info.IsDir() {
+				return filepath.SkipDir
+			}
+			return nil
+		}
 		confFiles[relPath] = info
 		return nil
 	}); err != nil {
@@ -196,5 +218,28 @@ func FormatDriftSummary(drifts []FileDrift) string {
 		parts = append(parts, fmt.Sprintf("%d deleted", count))
 	}
 
-	return fmt.Sprintf("%d files with drift (%s)", len(drifts), strings.Join(parts, ", "))
+	fileWord := "files"
+	if len(drifts) == 1 {
+		fileWord = "file"
+	}
+	return fmt.Sprintf("%d %s with drift (%s)", len(drifts), fileWord, strings.Join(parts, ", "))
+}
+
+// shouldExclude returns true if a file path matches any of the exclude patterns.
+// Patterns are matched against both the full relative path and the base filename.
+// Supports shell-style wildcards (* and ?) via filepath.Match.
+// Invalid patterns are silently ignored (treated as non-matching).
+func shouldExclude(relPath, baseName string, excludePatterns []string) bool {
+	for _, pattern := range excludePatterns {
+		// Match against base filename (e.g., "*.tmp" matches "foo.tmp")
+		// Error from filepath.Match indicates invalid pattern syntax - we skip such patterns
+		if matched, err := filepath.Match(pattern, baseName); err == nil && matched {
+			return true
+		}
+		// Match against full relative path (e.g., "subdir/*.log")
+		if matched, err := filepath.Match(pattern, relPath); err == nil && matched {
+			return true
+		}
+	}
+	return false
 }