Implement undoing

.gitignore

@@ -2,4 +2,3 @@
 *.exe
 cln
 cln.log
-.qodo

go.mod

@@ -3,5 +3,3 @@ module cln
 go 1.21.7
 
 require gopkg.in/yaml.v3 v3.0.1
-
-require github.com/bmatcuk/doublestar/v4 v4.8.1

go.sum

@@ -1,5 +1,3 @@
-github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
-github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

instruction.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
-	"github.com/bmatcuk/doublestar/v4"
 	"gopkg.in/yaml.v3"
 )
 
@@ -57,7 +57,6 @@ func (instruction *LinkInstruction) String() string {
 
 func (instruction *LinkInstruction) Undo() {
 	if !FileExists(instruction.Target) {
-		LogInfo("%s does not exist, skipping", FormatTargetPath(instruction.Target))
 		return
 	}
 
@@ -75,7 +74,6 @@ func (instruction *LinkInstruction) Undo() {
 			LogError("could not remove symlink at %s; err: %v",
 				FormatTargetPath(instruction.Target), err)
 		}
-		LogSuccess("Removed symlink at %s", FormatTargetPath(instruction.Target))
 	} else {
 		LogInfo("%s is not a symlink, skipping", FormatTargetPath(instruction.Target))
 	}
@@ -168,10 +166,7 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
 	}
 
 	if !instruction.Force && AreSame(instruction.Source, instruction.Target) {
-		//status <- fmt.Errorf("source %s and target %s are the same, nothing to do...",
+		status <- fmt.Errorf("source %s and target %s are the same, nothing to do...",
-		//	FormatSourcePath(instruction.Source),
-		//	FormatTargetPath(instruction.Target))
-		LogInfo("Source %s and target %s are the same, nothing to do...",
 			FormatSourcePath(instruction.Source),
 			FormatTargetPath(instruction.Target))
 		return
@@ -256,7 +251,7 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
 			err)
 		return
 	}
-	LogSuccess("Created symlink between %s and %s",
+	LogInfo("Created symlink between %s and %s",
 		FormatSourcePath(instruction.Source),
 		FormatTargetPath(instruction.Target))
 
@@ -282,26 +277,27 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
 		config.Links = instructions
 	}
 
-	expanded := []LinkInstruction{}
+	toRemove := []int{}
-	for _, link := range config.Links {
+	for i, link := range config.Links {
-		LogSource("Expanding pattern source %s in YAML file %s", link.Source, filename)
+		if strings.Contains(link.Source, "*") {
-		newlinks, err := ExpandPattern(link.Source, workdir, link.Target)
+			LogSource("Expanding wildcard source %s in YAML file %s", link.Source, filename)
-		if err != nil {
+			newlinks, err := ExpandWildcard(link.Source, workdir, link.Target)
-			return nil, fmt.Errorf("error expanding pattern: %w", err)
+			if err != nil {
+				return nil, fmt.Errorf("error expanding wildcard: %w", err)
+			}
+			LogInfo("Expanded wildcard source %s in YAML file %s to %d links",
+				FormatSourcePath(link.Source), FormatSourcePath(filename), len(newlinks))
+			config.Links = append(config.Links, newlinks...)
+			toRemove = append(toRemove, i)
 		}
-		// "Clone" the original link instruction for each expanded link
-		for i := range newlinks {
-			newlinks[i].Delete = link.Delete
-			newlinks[i].Hard = link.Hard
-			newlinks[i].Force = link.Force
-		}
-		LogInfo("Expanded pattern %s in YAML file %s to %d links",
-			FormatSourcePath(link.Source), FormatSourcePath(filename), len(newlinks))
-		expanded = append(expanded, newlinks...)
 	}
 
-	for i := range expanded {
+	for i := len(toRemove) - 1; i >= 0; i-- {
-		link := &expanded[i]
+		config.Links = slices.Delete(config.Links, toRemove[i], 1)
+	}
+
+	for i := range config.Links {
+		link := &config.Links[i]
 
 		link.Tidy()
 		link.Source, _ = ConvertHome(link.Source)
@@ -310,69 +306,32 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
 		link.Target = NormalizePath(link.Target, workdir)
 
 		// If Delete is true, Force must also be true
-		if link.Delete {
+		if config.Links[i].Delete {
-			link.Force = true
+			config.Links[i].Force = true
 		}
 	}
 
-	return expanded, nil
+	return config.Links, nil
 }
 
-func ExpandPattern(source, workdir, target string) (links []LinkInstruction, err error) {
+func ExpandWildcard(source, workdir, target string) (links []LinkInstruction, err error) {
-	static, pattern := doublestar.SplitPattern(source)
+	dir := filepath.Dir(source)
-	if static == "" {
+	pattern := filepath.Base(source)
-		static = workdir
-	}
-	LogInfo("Static part: %s", static)
-	LogInfo("Pattern part: %s", pattern)
 
-	files, err := doublestar.Glob(os.DirFS(static), pattern)
+	files, err := filepath.Glob(filepath.Join(workdir, dir, pattern))
 	if err != nil {
-		return nil, fmt.Errorf("error expanding pattern: %w", err)
+		return nil, fmt.Errorf("error expanding wildcard: %w", err)
-	}
-
-	targetIsFile := false
-	if info, err := os.Stat(target); err == nil && !info.IsDir() {
-		targetIsFile = true
 	}
 
 	for _, file := range files {
-		if info, err := os.Stat(file); err == nil && info.IsDir() {
+		link := LinkInstruction{
-			// We don't care about matched directories
+			Source: file,
-			// We want files within them
+			Target: filepath.Join(target, filepath.Base(file)),
-			if len(files) == 1 {
-				// Special case: if there is only one file, and it's a directory
-				// This should only ever happen if our source is a path (and not a glob!)
-				// And our target is a path, a directory
-				// ...but it will also happen if the source IS a glob and it happens to match ONE directory
-				// I think that should happen rarely enough to not be an issue...
-				links = append(links, LinkInstruction{
-					Source: filepath.Join(static, file),
-					Target: target,
-				})
-				continue
-			}
-			LogInfo("Skipping directory %s", file)
-			continue
 		}
-
+		links = append(links, link)
-		var targetPath string
-		if targetIsFile && len(files) == 1 {
-			// Special case: target is a file, and glob matches exactly one file.
-			// Use target directly (don't append filename).
-			targetPath = target
-		} else {
-			// Default: append filename to target dir.
-			targetPath = filepath.Join(target, file)
-		}
-
-		links = append(links, LinkInstruction{
-			Source: filepath.Join(static, file),
-			Target: targetPath,
-		})
 	}
 
-	LogInfo("Expanded pattern %s to %d links", FormatSourcePath(source), len(links))
+	LogInfo("Expanded wildcard source %s to %d links", FormatSourcePath(source), len(links))
 	return
 }
 

logger.go

@@ -14,7 +14,6 @@ const (
 	TargetPrefix    = "TARGET"
 	PathPrefix      = "PATH"
 	ImportantPrefix = "IMPORTANT"
-	SuccessPrefix   = "DONE"
 )
 
 // LogInfo logs an informational message
@@ -23,12 +22,6 @@ func LogInfo(format string, args ...interface{}) {
 	log.Printf("%s[%s]%s %s", BGreen, InfoPrefix, Reset, message)
 }
 
-// LogSuccess logs a success message
-func LogSuccess(format string, args ...interface{}) {
-	message := fmt.Sprintf(format, args...)
-	log.Printf("%s%s[%s]%s %s", BBlue, On_Blue, SuccessPrefix, Reset, message)
-}
-
 // LogSource logs a message about a source file/path with proper coloring
 func LogSource(format string, args ...interface{}) {
 	message := fmt.Sprintf(format, args...)

main.go

@@ -62,15 +62,12 @@ func main() {
 		LogInfo("Reading from command line arguments")
 		go ReadFromArgs(instructions, status)
 
-	// case IsPipeInput():
+	case IsPipeInput():
-	// 	LogInfo("Reading from stdin pipe")
+		LogInfo("Reading from stdin pipe")
-	// 	go ReadFromStdin(instructions, status)
+		go ReadFromStdin(instructions, status)
 
 	default:
-		if _, err := os.Stat("sync"); err == nil {
+		if _, err := os.Stat("sync.yaml"); err == nil {
-			LogInfo("Using default sync file")
-			go ReadFromFile("sync", instructions, status, true)
-		} else if _, err := os.Stat("sync.yaml"); err == nil {
 			LogInfo("Using default sync.yaml file")
 			go ReadFromFile("sync.yaml", instructions, status, true)
 		} else if _, err := os.Stat("sync.yml"); err == nil {
@@ -227,28 +224,6 @@ func ReadFromFile(input string, output chan *LinkInstruction, status chan error,
 		}
 		return
 	}
-
-	// Handle CSV format (legacy)
-	file, err := os.Open(input)
-	if err != nil {
-		log.Fatalf("Failed to open file %s%s%s: %s%+v%s",
-			SourceColor, input, DefaultColor, ErrorColor, err, DefaultColor)
-		return
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-		instruction, err := ParseInstruction(line, filepath.Dir(input))
-		if err != nil {
-			log.Printf("Error parsing line: %s'%s'%s, error: %s%+v%s",
-				SourceColor, line, DefaultColor, ErrorColor, err, DefaultColor)
-			continue
-		}
-		log.Printf("Read instruction: %s", instruction.String())
-		output <- &instruction
-	}
 }
 
 func ReadFromArgs(output chan *LinkInstruction, status chan error) {

release.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-echo "Figuring out the tag..."
-TAG=$(git describe --tags --exact-match 2>/dev/null || echo "")
-if [ -z "$TAG" ]; then
-  # Get the latest tag
-  LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
-  # Increment the patch version
-  IFS='.' read -r -a VERSION_PARTS <<< "$LATEST_TAG"
-  VERSION_PARTS[2]=$((VERSION_PARTS[2]+1))
-  TAG="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}"
-  # Create a new tag
-  git tag $TAG
-  git push origin $TAG
-fi
-echo "Tag: $TAG"
-
-echo "Building the thing..."
-go build .
-go install .
-
-echo "Creating a release..."
-TOKEN="$GITEA_API_KEY"
-GITEA="https://git.site.quack-lab.dev"
-REPO="dave/synclib"
-# Create a release
-RELEASE_RESPONSE=$(curl -s -X POST \
-  -H "Authorization: token $TOKEN" \
-  -H "Accept: application/json" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "tag_name": "'"$TAG"'",
-    "name": "'"$TAG"'",
-    "draft": false,
-    "prerelease": false
-  }' \
-  $GITEA/api/v1/repos/$REPO/releases)
-
-# Extract the release ID
-echo $RELEASE_RESPONSE
-RELEASE_ID=$(echo $RELEASE_RESPONSE | awk -F'"id":' '{print $2+0; exit}')
-echo "Release ID: $RELEASE_ID"
-
-echo "Uploading the things..."
-curl -X POST \
-  -H "Authorization: token $TOKEN" \
-  -F "attachment=@cln.exe" \
-  "$GITEA/api/v1/repos/$REPO/releases/${RELEASE_ID}/assets?name=cln.exe"

sync.yaml

@@ -1,6 +1,2 @@
-- source: A/**/*
+- source: \*
-  target: B
+  target: test/
-- source: A/go.mod
-  target: B/go.mod
-- source: A
-  target: B/foo