Fix files being linked as folders

Why did I even remove it?

.gitignore

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

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Ereshor Workspace",
+			"type": "go",
+			"request": "launch",
+			"mode": "auto",
+			"program": "${workspaceFolder}",
+			"cwd": "C:\\Users\\Administrator\\Seafile\\Games-Ereshor"
+		}
+	]
+}

go.mod

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

logger.go

@@ -14,6 +14,7 @@ const (
 	TargetPrefix    = "TARGET"
 	PathPrefix      = "PATH"
 	ImportantPrefix = "IMPORTANT"
+	SuccessPrefix   = "DONE"
 )
 
 // LogInfo logs an informational message
@@ -22,6 +23,12 @@ 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,12 +62,15 @@ func main() {
 		LogInfo("Reading from command line arguments")
 		go ReadFromArgs(instructions, status)
 
-	case IsPipeInput():
-		LogInfo("Reading from stdin pipe")
-		go ReadFromStdin(instructions, status)
+	// case IsPipeInput():
+	// 	LogInfo("Reading from stdin pipe")
+	// 	go ReadFromStdin(instructions, status)
 
 	default:
-		if _, err := os.Stat("sync.yaml"); err == nil {
+		if _, err := os.Stat("sync"); 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 {
@@ -224,6 +227,28 @@ 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

@@ -0,0 +1,48 @@
+#!/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,2 +1,6 @@
-- source: \*
-  target: test/
+- source: A/**/*
+  target: B
+- source: A/go.mod
+  target: B/go.mod
+- source: A
+  target: B/foo