Simplify logic for adding watches

app.go

@@ -427,7 +427,7 @@ func (app *app) loop() {
 				}
 			}
 
-			app.addWatchPaths()
+			app.watchDir(d)
 
 			app.ui.draw(app.nav)
 		case r := <-app.nav.regChan:
@@ -633,33 +633,17 @@ func (app *app) runShell(s string, args []string, prefix string) {
 	}
 }
 
-func (app *app) addWatchPaths() {
-	if !gOpts.watch || len(app.nav.dirs) == 0 {
+func (app *app) watchDir(dir *dir) {
+	if !gOpts.watch {
 		return
 	}
 
-	paths := make(map[string]bool)
+	app.watch.add(dir.path)
 
-	// ensure dircounts are updated in current/parent windows
-	for _, dir := range app.nav.dirs {
-		paths[dir.path] = true
-		for _, file := range dir.allFiles {
-			if file.IsDir() {
-				paths[file.path] = true
-			}
+	// ensure dircounts are updated for child directories
+	for _, file := range dir.allFiles {
+		if file.IsDir() {
+			app.watch.add(file.path)
 		}
 	}
-
-	// ensure dircounts are updated in preview window
-	if curr, err := app.nav.currFile(); err == nil {
-		if dir, ok := app.nav.dirCache[curr.path]; ok {
-			for _, file := range dir.allFiles {
-				if file.IsDir() {
-					paths[file.path] = true
-				}
-			}
-		}
-	}
-
-	app.watch.add(paths)
 }

eval.go

@@ -195,7 +195,9 @@ func (e *setExpr) eval(app *app, args []string) {
 		if err == nil {
 			if gOpts.watch {
 				app.watch.start()
-				app.addWatchPaths()
+				for _, dir := range app.nav.dirCache {
+					app.watchDir(dir)
+				}
 			} else {
 				app.watch.stop()
 			}
@@ -582,7 +584,6 @@ func preChdir(app *app) {
 
 func onChdir(app *app) {
 	app.nav.addJumpList()
-	app.addWatchPaths()
 	if cmd, ok := gOpts.cmds["on-cd"]; ok {
 		cmd.eval(app, nil)
 	}

watch.go

@@ -64,14 +64,12 @@ func (watch *watch) stop() {
 	watch.events = nil
 }
 
-func (watch *watch) add(paths map[string]bool) {
+func (watch *watch) add(path string) {
 	if watch.watcher == nil {
 		return
 	}
 
-	for path := range paths {
-		watch.watcher.Add(path)
-	}
+	watch.watcher.Add(path)
 }
 
 func (watch *watch) loop() {