Support file deletion again

ammario · ammario · commit 3a72228c316a · 2020-04-24T15:46:21.000-05:00
diff --git a/internal/sync/eventcache.go b/internal/sync/eventcache.go
@@ -14,7 +14,7 @@ type timedEvent struct {
 }
 
 type eventCache map[string]timedEvent
-
+DirectoryEventDirectoryEventDirectoryEventsss
 func (cache eventCache) Add(ev timedEvent) {
 	log := flog.New()
 	log.Prefix = ev.Path() + ": "
@@ -35,34 +35,33 @@ func (cache eventCache) Add(ev timedEvent) {
 	cache[ev.Path()] = ev
 }
 
-// DirectoryEvents returns the list of events that pertain to directories.
-// The set of returns events is disjoint with FileEvents.
-func (cache eventCache) DirectoryEvents() []timedEvent {
+// SequentialEvents returns the list of events that pertain to directories.
+// The set of returned events is disjoint with ConcurrentEvents.
+func (cache eventCache) SequentialEvents() []timedEvent {
 	var r []timedEvent
 	for _, ev := range cache {
 		info, err := os.Stat(ev.Path())
-		if err != nil {
-			continue
-		}
-		if !info.IsDir() {
+		if err == nil && !info.IsDir() {
 			continue
 		}
+		// Include files that have deleted here.
+		// It's unclear whether they're files or folders.
 		r = append(r, ev)
 
 	}
 	return r
 }
 
-// FileEvents returns the list of events that pertain to files.
-// The set of returns events is disjoint with DirectoryEvents.
-func (cache eventCache) FileEvents() []timedEvent {
+// ConcurrentEvents returns the list of events that are safe to process after SequentialEvents.
+// The set of returned events is disjoint with SequentialEvents.
+func (cache eventCache) ConcurrentEvents() []timedEvent {
 	var r []timedEvent
 	for _, ev := range cache {
 		info, err := os.Stat(ev.Path())
 		if err != nil {
 			continue
 		}
-		if info.IsDir() {
+		if  info.IsDir() {
 			continue
 		}
 		r = append(r, ev)
diff --git a/internal/sync/sync.go b/internal/sync/sync.go
@@ -188,12 +188,12 @@ func (s Sync) workEventGroup(evs []timedEvent) {
 	// and then a file is moved to it. AFAIK this dependecy only exists with Directories.
 	// So, we sequentially process the list of directory Renames and Creates, and then concurrently
 	// perform all Writes.
-	for _, ev := range cache.DirectoryEvents() {
+	for _, ev := range cache.SequentialEvents() {
 		s.work(ev)
 	}
 
 	var wg sync.WaitGroup
-	for _, ev := range cache.FileEvents() {
+	for _, ev := range cache.ConcurrentEvents() {
 		setConsoleTitle(fmtUpdateTitle(ev.Path()))
 
 		wg.Add(1)
