18 Commits

Author SHA1 Message Date
c94a7ae8ab Remove log?
Why was log here??
2025-10-01 13:21:15 +02:00
ca57ee728e Add build script 2025-10-01 13:21:08 +02:00
b53628e698 Hallucinate a fix to recurse using doublestar 2025-07-10 20:50:37 +02:00
3f7fd36f84 Fix files being linked as folders 2025-04-15 20:28:49 +02:00
8da1f023a7 Add simple release script 2025-04-13 19:53:30 +02:00
33b3a3d2b6 Improve globbing to better handle both patterns and non patterns 2025-04-13 19:47:52 +02:00
78536c3e19 Implement doublestar wildcards 2025-04-13 19:28:57 +02:00
3a5a333c62 Add LogSuccess 2025-03-11 21:37:55 +01:00
5a2520e3b1 Fix deleting by not deleting at all 2025-03-10 19:08:07 +01:00
12d71dba1c Fix flag inheritance for wildcard links 2025-03-10 19:02:44 +01:00
d94f8db27a Stop logging W as an L 2025-03-10 18:58:34 +01:00
913a279011 Redo old format
Why did I even remove it?
2025-03-10 18:55:25 +01:00
af956110be Implement undoing 2025-03-10 18:53:41 +01:00
8c5d783d2c More betterify logging 2025-03-10 18:49:50 +01:00
6359705714 Fix up logging a little 2025-03-10 18:36:11 +01:00
62bfb91246 Implement wildcards 2025-03-10 18:17:37 +01:00
083d42a9dd No longer support old format 2025-03-10 18:10:59 +01:00
71ea17122c Clean house 2025-03-10 18:08:23 +01:00
11 changed files with 428 additions and 220 deletions

3
.gitignore vendored
View File

@@ -1,3 +1,6 @@
*.exe
*.exe
cln
cln.log
.qodo
*.log

16
.vscode/launch.json vendored Normal file
View File

@@ -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"
}
]
}

2
build.sh Normal file
View File

@@ -0,0 +1,2 @@
GOOS=windows GOARCH=amd64 go build -o cln.exe .
GOOS=linux GOARCH=amd64 go build -o cln .

2
go.mod
View File

@@ -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

2
go.sum
View File

@@ -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=

View File

@@ -2,11 +2,11 @@ package main
import (
"fmt"
"log"
"os"
"path/filepath"
"strings"
"github.com/bmatcuk/doublestar/v4"
"gopkg.in/yaml.v3"
)
@@ -49,12 +49,38 @@ func (instruction *LinkInstruction) String() string {
flagsStr = " [" + strings.Join(flags, ", ") + "]"
}
return fmt.Sprintf("%s%s%s → %s%s%s%s",
SourceColor, instruction.Source, DefaultColor,
TargetColor, instruction.Target, DefaultColor,
return fmt.Sprintf("%s%s%s",
FormatSourcePath(instruction.Source),
FormatTargetPath(instruction.Target),
flagsStr)
}
func (instruction *LinkInstruction) Undo() {
if !FileExists(instruction.Target) {
LogInfo("%s does not exist, skipping", FormatTargetPath(instruction.Target))
return
}
isSymlink, err := IsSymlink(instruction.Target)
if err != nil {
LogError("could not determine whether %s is a sym link or not, stopping; err: %v",
FormatTargetPath(instruction.Target), err)
return
}
if isSymlink {
LogInfo("Removing symlink at %s", FormatTargetPath(instruction.Target))
err = os.Remove(instruction.Target)
if err != nil {
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))
}
}
func ParseInstruction(line, workdir string) (LinkInstruction, error) {
line = strings.TrimSpace(line)
if strings.HasPrefix(line, "#") {
@@ -131,13 +157,23 @@ func isTrue(value string) bool {
func (instruction *LinkInstruction) RunAsync(status chan (error)) {
defer close(status)
if undo {
instruction.Undo()
return
}
if !FileExists(instruction.Source) {
status <- fmt.Errorf("instruction source %s%s%s does not exist", SourceColor, instruction.Source, DefaultColor)
status <- fmt.Errorf("instruction source %s does not exist", FormatSourcePath(instruction.Source))
return
}
if !instruction.Force && AreSame(instruction.Source, instruction.Target) {
status <- fmt.Errorf("source %s%s%s and target %s%s%s are the same, %snothing to do...%s", SourceColor, instruction.Source, DefaultColor, TargetColor, instruction.Target, DefaultColor, PathColor, DefaultColor)
//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
}
@@ -145,47 +181,54 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
if instruction.Force {
isSymlink, err := IsSymlink(instruction.Target)
if err != nil {
status <- fmt.Errorf("could not determine whether %s%s%s is a sym link or not, stopping; err: %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
status <- fmt.Errorf("could not determine whether %s is a sym link or not, stopping; err: %v",
FormatTargetPath(instruction.Target), err)
return
}
if instruction.Hard {
info, err := os.Stat(instruction.Target)
if err != nil {
status <- fmt.Errorf("could not stat %s%s%s, stopping; err: %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
status <- fmt.Errorf("could not stat %s, stopping; err: %v",
FormatTargetPath(instruction.Target), err)
return
}
if info.Mode().IsRegular() && info.Name() == filepath.Base(instruction.Source) {
log.Printf("Overwriting existing file %s%s%s", TargetColor, instruction.Target, DefaultColor)
LogTarget("Overwriting existing file %s", instruction.Target)
err := os.Remove(instruction.Target)
if err != nil {
status <- fmt.Errorf("could not remove existing file %s%s%s; err: %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
status <- fmt.Errorf("could not remove existing file %s; err: %v",
FormatTargetPath(instruction.Target), err)
return
}
}
}
if isSymlink {
log.Printf("Removing symlink at %s%s%s", TargetColor, instruction.Target, DefaultColor)
LogTarget("Removing symlink at %s", instruction.Target)
err = os.Remove(instruction.Target)
if err != nil {
status <- fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
status <- fmt.Errorf("failed deleting %s due to %v",
FormatTargetPath(instruction.Target), err)
return
}
} else {
if !instruction.Delete {
status <- fmt.Errorf("refusing to delte actual (non symlink) file %s%s%s", TargetColor, instruction.Target, DefaultColor)
status <- fmt.Errorf("refusing to delte actual (non symlink) file %s",
FormatTargetPath(instruction.Target))
return
}
log.Printf("%sDeleting (!!!)%s %s%s%s", ImportantColor, DefaultColor, TargetColor, instruction.Target, DefaultColor)
LogImportant("Deleting (!!!) %s", instruction.Target)
err = os.RemoveAll(instruction.Target)
if err != nil {
status <- fmt.Errorf("failed deleting %s%s%s due to %s%+v%s", TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
status <- fmt.Errorf("failed deleting %s due to %v",
FormatTargetPath(instruction.Target), err)
return
}
}
} else {
status <- fmt.Errorf("target %s%s%s exists - handle manually or set the 'forced' flag (3rd field)", TargetColor, instruction.Target, DefaultColor)
status <- fmt.Errorf("target %s exists - handle manually or set the 'forced' flag (3rd field)",
FormatTargetPath(instruction.Target))
return
}
}
@@ -194,7 +237,8 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
if _, err := os.Stat(targetDir); os.IsNotExist(err) {
err = os.MkdirAll(targetDir, 0755)
if err != nil {
status <- fmt.Errorf("failed creating directory %s%s%s due to %s%+v%s", TargetColor, targetDir, DefaultColor, ErrorColor, err, DefaultColor)
status <- fmt.Errorf("failed creating directory %s due to %v",
FormatTargetPath(targetDir), err)
return
}
}
@@ -206,10 +250,15 @@ func (instruction *LinkInstruction) RunAsync(status chan (error)) {
err = os.Symlink(instruction.Source, instruction.Target)
}
if err != nil {
status <- fmt.Errorf("failed creating symlink between %s%s%s and %s%s%s with error %s%+v%s", SourceColor, instruction.Source, DefaultColor, TargetColor, instruction.Target, DefaultColor, ErrorColor, err, DefaultColor)
status <- fmt.Errorf("failed creating symlink between %s and %s with error %v",
FormatSourcePath(instruction.Source),
FormatTargetPath(instruction.Target),
err)
return
}
log.Printf("Created symlink between %s%s%s and %s%s%s", SourceColor, instruction.Source, DefaultColor, TargetColor, instruction.Target, DefaultColor)
LogSuccess("Created symlink between %s and %s",
FormatSourcePath(instruction.Source),
FormatTargetPath(instruction.Target))
status <- nil
}
@@ -233,20 +282,98 @@ func ParseYAMLFile(filename, workdir string) ([]LinkInstruction, error) {
config.Links = instructions
}
for i := range config.Links {
config.Links[i].Tidy()
config.Links[i].Source, _ = ConvertHome(config.Links[i].Source)
config.Links[i].Target, _ = ConvertHome(config.Links[i].Target)
config.Links[i].Source = NormalizePath(config.Links[i].Source, workdir)
config.Links[i].Target = NormalizePath(config.Links[i].Target, workdir)
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 := range expanded {
link := &expanded[i]
link.Tidy()
link.Source, _ = ConvertHome(link.Source)
link.Target, _ = ConvertHome(link.Target)
link.Source = NormalizePath(link.Source, workdir)
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 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 := doublestar.Glob(os.DirFS(static), pattern)
if err != nil {
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 {
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
}
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 pattern %s to %d links", FormatSourcePath(source), len(links))
return
}
func IsYAMLFile(filename string) bool {

99
logger.go Normal file
View File

@@ -0,0 +1,99 @@
package main
import (
"fmt"
"log"
)
// Message type prefixes
const (
InfoPrefix = "INFO"
ErrorPrefix = "ERROR"
WarningPrefix = "WARN"
SourcePrefix = "SOURCE"
TargetPrefix = "TARGET"
PathPrefix = "PATH"
ImportantPrefix = "IMPORTANT"
SuccessPrefix = "DONE"
)
// LogInfo logs an informational message
func LogInfo(format string, args ...interface{}) {
message := fmt.Sprintf(format, args...)
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...)
log.Printf("%s[%s]%s %s%s%s", BPurple, SourcePrefix, Reset, SourceColor, message, Reset)
}
// LogTarget logs a message about a target file/path with proper coloring
func LogTarget(format string, args ...interface{}) {
message := fmt.Sprintf(format, args...)
log.Printf("%s[%s]%s %s%s%s", BYellow, TargetPrefix, Reset, TargetColor, message, Reset)
}
// LogPath logs a message about a path with proper coloring
func LogPath(format string, args ...interface{}) {
message := fmt.Sprintf(format, args...)
log.Printf("%s[%s]%s %s%s%s", BGreen, PathPrefix, Reset, PathColor, message, Reset)
}
// LogImportant logs a message that needs attention with proper coloring
func LogImportant(format string, args ...interface{}) {
message := fmt.Sprintf(format, args...)
log.Printf("%s[%s]%s %s%s%s", BRed, ImportantPrefix, Reset, ImportantColor, message, Reset)
}
// LogError logs an error message with proper coloring that won't be cut off
func LogError(format string, args ...interface{}) {
// Format the message first with normal text (no red coloring)
message := fmt.Sprintf(format, args...)
// The Error prefix itself is bold red on a light background for maximum visibility
prefix := fmt.Sprintf("%s%s[%s]%s ", BRed, On_White, ErrorPrefix, Reset)
// The message is in default color (no red), only the [ERROR] prefix is colored
log.Printf("%s%s", prefix, message)
}
// FormatSourcePath returns a source path with proper coloring
func FormatSourcePath(path string) string {
return fmt.Sprintf("%s%s%s", SourceColor, path, Reset)
}
// FormatTargetPath returns a target path with proper coloring
func FormatTargetPath(path string) string {
return fmt.Sprintf("%s%s%s", TargetColor, path, Reset)
}
// FormatPathValue returns a path with proper coloring
func FormatPathValue(path string) string {
return fmt.Sprintf("%s%s%s", PathColor, path, Reset)
}
// FormatErrorValue returns an error value without any additional formatting
// Since error messages are no longer red, we don't need special formatting
func FormatErrorValue(err error) string {
if err == nil {
return ""
}
// Just return the error string with no color formatting
return fmt.Sprintf("%v", err)
}
// FormatErrorMessage formats an error message with no additional color formatting,
// while preserving the special formatting of embedded source/target/path elements.
func FormatErrorMessage(format string, args ...interface{}) string {
// This just formats the message with no additional color formatting
// The path formatting will still be preserved
return fmt.Sprintf(format, args...)
}

159
main.go
View File

@@ -7,7 +7,6 @@ import (
"log"
"os"
"path/filepath"
"regexp"
"sync"
"sync/atomic"
)
@@ -15,26 +14,27 @@ import (
const deliminer = ","
const SourceColor = Purple
const TargetColor = Yellow
const ErrorColor = URed
const ErrorColor = Red
const ImportantColor = BRed
const DefaultColor = White
const DefaultColor = Reset
const PathColor = Green
var DirRegex, _ = regexp.Compile(`^(.+?)[/\\]sync(?:\.ya?ml)?$`)
var FileRegex, _ = regexp.Compile(`^sync(?:\.ya?ml)?$`)
var programName = os.Args[0]
var undo = false
func main() {
recurse := flag.String("r", "", "recurse into directories")
file := flag.String("f", "", "file to read instructions from")
debug := flag.Bool("d", false, "debug")
undoF := flag.Bool("u", false, "undo")
flag.Parse()
undo = *undoF
if *debug {
log.SetFlags(log.Lmicroseconds | log.Lshortfile)
logFile, err := os.Create("main.log")
logFile, err := os.Create(programName + ".log")
if err != nil {
log.Printf("Error creating log file: %v", err)
LogError("Error creating log file: %v", err)
os.Exit(1)
}
logger := io.MultiWriter(os.Stdout, logFile)
@@ -49,39 +49,39 @@ func main() {
// Check input sources in priority order
switch {
case *recurse != "":
log.Printf("Recurse: %s", *recurse)
LogInfo("Recurse: %s", *recurse)
go ReadFromFilesRecursively(*recurse, instructions, status)
case *file != "":
log.Printf("File: %s", *file)
LogInfo("File: %s", *file)
go ReadFromFile(*file, instructions, status, true)
case len(flag.Args()) > 0:
log.Printf("Reading from command line arguments")
LogInfo("Reading from command line arguments")
go ReadFromArgs(instructions, status)
case IsPipeInput():
log.Printf("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"); err == nil {
log.Printf("Using default sync file")
LogInfo("Using default sync file")
go ReadFromFile("sync", instructions, status, true)
} else if _, err := os.Stat("sync.yaml"); err == nil {
log.Printf("Using default sync.yaml file")
LogInfo("Using default sync.yaml file")
go ReadFromFile("sync.yaml", instructions, status, true)
} else if _, err := os.Stat("sync.yml"); err == nil {
log.Printf("Using default sync.yml file")
LogInfo("Using default sync.yml file")
go ReadFromFile("sync.yml", instructions, status, true)
} else {
log.Printf("No input provided")
log.Printf("Provide input as: ")
log.Printf("Arguments - %s <source>,<target>,<force?>", programName)
log.Printf("File - %s -f <file>", programName)
log.Printf("YAML File - %s -f <file.yaml>", programName)
log.Printf("Folder (finding sync files in folder recursively) - %s -r <folder>", programName)
log.Printf("stdin - (cat <file> | %s)", programName)
LogInfo("No input provided")
LogInfo("Provide input as: ")
LogInfo("Arguments - %s <source>,<target>,<force?>", programName)
LogInfo("File - %s -f <file>", programName)
LogInfo("YAML File - %s -f <file.yaml>", programName)
LogInfo("Folder (finding sync files in folder recursively) - %s -r <folder>", programName)
LogInfo("stdin - (cat <file> | %s)", programName)
os.Exit(1)
}
}
@@ -93,36 +93,36 @@ func main() {
break
}
if err != nil {
log.Println(err)
LogError("%v", err)
}
}
}()
var instructionsDone int32
var instructionsDone int32 = 0
var wg sync.WaitGroup
for {
instruction, ok := <-instructions
if !ok {
log.Printf("No more instructions to process")
LogInfo("No more instructions to process")
break
}
log.Printf("Processing: %s", instruction.String())
LogInfo("Processing: %s", instruction.String())
status := make(chan error)
go instruction.RunAsync(status)
wg.Add(1)
err := <-status
if err != nil {
log.Printf("Failed parsing instruction %s%s%s due to %s%+v%s", SourceColor, instruction.String(), DefaultColor, ErrorColor, err, DefaultColor)
LogError("Failed processing instruction: %v", err)
}
atomic.AddInt32(&instructionsDone, 1)
wg.Done()
}
wg.Wait()
log.Println("All done")
if instructionsDone == 0 {
log.Printf("No instructions were processed")
LogInfo("No instructions were processed")
os.Exit(1)
}
LogInfo("All done")
}
func IsPipeInput() bool {
@@ -139,55 +139,54 @@ func ReadFromFilesRecursively(input string, output chan *LinkInstruction, status
workdir, _ := os.Getwd()
input = NormalizePath(input, workdir)
log.Printf("Reading input from files recursively starting in %s%s%s", PathColor, input, DefaultColor)
LogInfo("Reading input from files recursively starting in %s", FormatPathValue(input))
files := make(chan string, 128)
recurseStatus := make(chan error)
go GetSyncFilesRecursively(input, files, recurseStatus)
go func() {
for {
err, ok := <-recurseStatus
if !ok {
break
}
if err != nil {
log.Printf("Failed to get sync files recursively: %s%+v%s", ErrorColor, err, DefaultColor)
status <- err
}
}
}()
fileStatus := make(chan error)
go GetSyncFilesRecursively(input, files, fileStatus)
var wg sync.WaitGroup
// Collect all files first
var syncFiles []string
for {
file, ok := <-files
if !ok {
log.Printf("No more files to process")
break
}
wg.Add(1)
go func() {
defer wg.Done()
log.Println(file)
file = NormalizePath(file, workdir)
log.Printf("Processing file: %s%s%s", PathColor, file, DefaultColor)
// This "has" to be done because instructions are resolved in relation to cwd
fileDir := DirRegex.FindStringSubmatch(file)
if fileDir == nil {
log.Printf("Failed to extract directory from %s%s%s", SourceColor, file, DefaultColor)
return
}
log.Printf("Changing directory to %s%s%s (for %s%s%s)", PathColor, fileDir[1], DefaultColor, PathColor, file, DefaultColor)
err := os.Chdir(fileDir[1])
if err != nil {
log.Printf("Failed to change directory to %s%s%s: %s%+v%s", SourceColor, fileDir[1], DefaultColor, ErrorColor, err, DefaultColor)
return
}
ReadFromFile(file, output, status, false)
}()
syncFiles = append(syncFiles, file)
}
// Check for errors from file search
for {
err, ok := <-fileStatus
if !ok {
break
}
if err != nil {
LogError("Failed to get sync files recursively: %v", err)
status <- err
}
}
// Process each file
for _, file := range syncFiles {
file = NormalizePath(file, workdir)
LogInfo("Processing file: %s", FormatPathValue(file))
// Change to the directory containing the sync file
fileDir := filepath.Dir(file)
originalDir, _ := os.Getwd()
err := os.Chdir(fileDir)
if err != nil {
LogError("Failed to change directory to %s: %v", FormatSourcePath(fileDir), err)
continue
}
// Read and process the file
ReadFromFile(file, output, status, false)
// Return to original directory
os.Chdir(originalDir)
}
wg.Wait()
}
func ReadFromFile(input string, output chan *LinkInstruction, status chan error, doclose bool) {
@@ -197,22 +196,22 @@ func ReadFromFile(input string, output chan *LinkInstruction, status chan error,
}
input = NormalizePath(input, filepath.Dir(input))
log.Printf("Reading input from file: %s%s%s", PathColor, input, DefaultColor)
LogInfo("Reading input from file: %s", FormatPathValue(input))
// Check if this is a YAML file
if IsYAMLFile(input) {
log.Printf("Parsing as YAML file")
LogInfo("Parsing as YAML file")
instructions, err := ParseYAMLFile(input, filepath.Dir(input))
if err != nil {
log.Printf("Failed to parse YAML file %s%s%s: %s%+v%s",
SourceColor, input, DefaultColor, ErrorColor, err, DefaultColor)
LogError("Failed to parse YAML file %s: %v",
FormatSourcePath(input), err)
status <- err
return
}
for _, instruction := range instructions {
instr := instruction // Create a copy to avoid reference issues
log.Printf("Read YAML instruction: %s", instr.String())
LogInfo("Read YAML instruction: %s", instr.String())
output <- &instr
}
return
@@ -246,11 +245,11 @@ func ReadFromArgs(output chan *LinkInstruction, status chan error) {
defer close(status)
workdir, _ := os.Getwd()
log.Printf("Reading input from args")
LogInfo("Reading input from args")
for _, arg := range flag.Args() {
instruction, err := ParseInstruction(arg, workdir)
if err != nil {
log.Printf("Error parsing arg: %s'%s'%s, error: %s%+v%s", SourceColor, arg, DefaultColor, ErrorColor, err, DefaultColor)
LogError("Error parsing arg '%s': %v", arg, err)
continue
}
output <- &instruction
@@ -262,20 +261,20 @@ func ReadFromStdin(output chan *LinkInstruction, status chan error) {
defer close(status)
workdir, _ := os.Getwd()
log.Printf("Reading input from stdin")
LogInfo("Reading input from stdin")
scanner := bufio.NewScanner(os.Stdin)
for scanner.Scan() {
line := scanner.Text()
instruction, err := ParseInstruction(line, workdir)
if err != nil {
log.Printf("Error parsing line: %s'%s'%s, error: %s%+v%s", SourceColor, line, DefaultColor, ErrorColor, err, DefaultColor)
LogError("Error parsing line '%s': %v", line, err)
continue
}
output <- &instruction
}
if err := scanner.Err(); err != nil {
log.Fatalf("Error reading from stdin: %s%+v%s", ErrorColor, err, DefaultColor)
LogError("Error reading from stdin: %v", err)
status <- err
return
}

48
release.sh Normal file
View File

@@ -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..."
sh build.sh
sh install.sh
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"

View File

@@ -1,10 +1,6 @@
- source: main.go
target: test/main.go
- source: README.md
target: test/README.md
- source: sync.yaml
target: test/sync.yaml
- source: A/**/*
target: B
- source: A/go.mod
target: B/go.mod
- source: A
target: B/foo

118
util.go
View File

@@ -2,13 +2,11 @@ package main
import (
"fmt"
"log"
"os"
"path/filepath"
"strings"
"sync"
"sync/atomic"
"time"
"github.com/bmatcuk/doublestar/v4"
)
func IsSymlink(path string) (bool, error) {
@@ -33,12 +31,12 @@ func NormalizePath(input, workdir string) string {
input = strings.ReplaceAll(input, "\"", "")
if !filepath.IsAbs(input) {
log.Printf("Input '%s' is not absolute, prepending work dir '%s'", input, workdir)
LogInfo("Input '%s' is not absolute, prepending work dir '%s'", input, workdir)
var err error
input = filepath.Join(workdir, input)
input, err = filepath.Abs(input)
if err != nil {
log.Printf("Failed to get absolute path for %s%s%s: %s%+v%s", SourceColor, input, DefaultColor, ErrorColor, err, DefaultColor)
LogError("Failed to get absolute path for %s: %v", FormatSourcePath(input), err)
return input
}
}
@@ -77,108 +75,24 @@ func GetSyncFilesRecursively(input string, output chan string, status chan error
defer close(output)
defer close(status)
var filesProcessed int32
var foldersProcessed int32
var activeWorkers int32
workdir, _ := os.Getwd()
input = NormalizePath(input, workdir)
LogInfo("Searching for sync files recursively starting in %s", FormatPathValue(input))
progressTicker := time.NewTicker(200 * time.Millisecond)
defer progressTicker.Stop()
done := make(chan struct{})
defer close(done)
directories := make(chan string, 100000)
workerPool := make(chan struct{}, 4000)
directories <- input
go func() {
for {
select {
case <-progressTicker.C:
dirCount := len(directories)
workers := atomic.LoadInt32(&activeWorkers)
fmt.Printf("\rFiles processed: %d; Folders processed: %d; Active workers: %d; Directory queue: %d",
atomic.LoadInt32(&filesProcessed),
atomic.LoadInt32(&foldersProcessed),
workers,
dirCount)
case <-done:
// Final progress update
fmt.Printf("\rFiles processed: %d; Folders processed: %d; Completed successfully\n",
atomic.LoadInt32(&filesProcessed),
atomic.LoadInt32(&foldersProcessed))
return
}
}
}()
allDone := make(chan struct{})
go func() {
var wg sync.WaitGroup
go func() {
for {
if atomic.LoadInt32(&activeWorkers) == 0 && len(directories) == 0 {
time.Sleep(10 * time.Millisecond)
if atomic.LoadInt32(&activeWorkers) == 0 && len(directories) == 0 {
close(allDone)
return
}
}
time.Sleep(50 * time.Millisecond)
}
}()
for {
select {
case directory, ok := <-directories:
if !ok {
wg.Wait()
return
}
atomic.AddInt32(&activeWorkers, 1)
go func(dir string) {
workerPool <- struct{}{}
atomic.AddInt32(&foldersProcessed, 1)
processDirectory(dir, directories, output, &filesProcessed)
<-workerPool
atomic.AddInt32(&activeWorkers, -1)
}(directory)
}
}
}()
<-allDone
log.Printf("Files processed: %d; Folders processed: %d",
atomic.LoadInt32(&filesProcessed),
atomic.LoadInt32(&foldersProcessed))
}
func processDirectory(directory string, directories chan<- string, output chan<- string, filesProcessed *int32) {
files, err := os.ReadDir(directory)
// Use doublestar to find all sync.yml and sync.yaml files recursively
pattern := "**/sync.y*ml"
files, err := doublestar.Glob(os.DirFS(input), pattern)
if err != nil {
log.Printf("Error reading directory %s: %+v", directory, err)
LogError("Failed to search for pattern %s: %v", pattern, err)
status <- err
return
}
for _, file := range files {
if file.IsDir() {
directories <- filepath.Join(directory, file.Name())
} else {
if FileRegex.MatchString(file.Name()) || IsYAMLSyncFile(file.Name()) {
output <- filepath.Join(directory, file.Name())
}
atomic.AddInt32(filesProcessed, 1)
}
fullPath := filepath.Join(input, file)
LogInfo("Found sync file: %s", FormatPathValue(fullPath))
output <- fullPath
}
}
func IsYAMLSyncFile(filename string) bool {
return filename == "sync.yaml" || filename == "sync.yml"
LogInfo("Completed recursive search for sync files")
}