From fe2839e3fcbca46d9e1c7490069c1e2ba83734f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?=
 <david.majdandzic@hotmail.com>
Date: Mon, 1 Jul 2024 19:02:00 +0200
Subject: [PATCH] Hopefully fix race conditions and add debug flag

---
 main.go | 19 +++++++++++++++----
 util.go | 22 ++++++++++++----------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/main.go b/main.go
index 8032e14..bb9c712 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"flag"
+	"io"
 	"log"
 	"os"
 	"regexp"
@@ -32,14 +33,24 @@ var FileRegex, _ = regexp.Compile(`^sync$`)
 var programName = os.Args[0]
 
 func main() {
-	// Format:
-	// source,target,force?
-	log.SetFlags(log.Lmicroseconds)
-
 	recurse := flag.String("r", "", "recurse into directories")
 	file := flag.String("f", "", "file to read instructions from")
+	debug := flag.Bool("d", false, "debug")
 	flag.Parse()
 
+	if *debug {
+		log.SetFlags(log.Lmicroseconds | log.Lshortfile)
+		logFile, err := os.Create("main.log")
+		if err != nil {
+			log.Printf("Error creating log file: %v", err)
+			os.Exit(1)
+		}
+		logger := io.MultiWriter(os.Stdout, logFile)
+		log.SetOutput(logger)
+	} else {
+		log.SetFlags(log.Lmicroseconds)
+	}
+
 	log.Printf("Recurse: %s", *recurse)
 	log.Printf("File: %s", *file)
 
diff --git a/util.go b/util.go
index 96c5360..f8c74a8 100644
--- a/util.go
+++ b/util.go
@@ -72,20 +72,21 @@ func GetSyncFilesRecursively(input string, output chan string, status chan error
 	var foldersProcessed int32
 	progressTicker := time.NewTicker(200 * time.Millisecond)
 	defer progressTicker.Stop()
+
+	var wg sync.WaitGroup
+	var initial sync.Once
+	wg.Add(1)
+	directories := make(chan string, 100000)
+	workerPool := make(chan struct{}, 10000)
+	directories <- input
+
 	go func() {
 		for {
-			fmt.Printf("\rFiles processed: %d; Folders processed: %d;", filesProcessed, foldersProcessed)
+			fmt.Printf("\rFiles processed: %d; Folders processed: %d; Workers: %d; Directory Stack Size: %d;", filesProcessed, foldersProcessed, len(workerPool), len(directories))
 			<-progressTicker.C
 		}
 	}()
 
-	var wg sync.WaitGroup
-	wg.Add(1)
-	var initial sync.Once
-	directories := make(chan string, 10000)
-	workerPool := make(chan struct{}, 10000)
-	directories <- input
-
 	log.Printf("%+v", len(workerPool))
 	go func() {
 		for directory := range directories {
@@ -96,7 +97,6 @@ func GetSyncFilesRecursively(input string, output chan string, status chan error
 				defer wg.Done()
 				defer func() { <-workerPool }()
 
-				// log.Printf("Reading directory %s", directory)
 				files, err := os.ReadDir(directory)
 				if err != nil {
 					log.Printf("Error reading directory %s: %+v", directory, err)
@@ -117,8 +117,10 @@ func GetSyncFilesRecursively(input string, output chan string, status chan error
 					}
 				}
 				// log.Printf("Done reading directory %s", directory)
-			
+
 				initial.Do(func() {
+					// Parallelism is very difficult...
+					time.Sleep(250 * time.Millisecond)
 					wg.Done()
 				})
 			}(directory)