Recursive only if not rename

Author: jakubno

backend_inotify.go

@@ -510,35 +510,36 @@ func (w *inotify) handleEvent(inEvent *unix.InotifyEvent, buf *[65536]byte, offs
 						w.watches.wd[k] = ww
 					}
 				}
-			}
-			// Register a newly created dir tree
-			// This is for "mkdir -p one/two/three".
-			// Usually all those directories will be created before we can set up
-			// watchers on the subdirectories, so only "one" would be sent
-			// as a Create event and not "one/two" and "one/two/three"
-			// (inotifywait -r has the same problem).
-			err = filepath.WalkDir(ev.Name, func(curDir string, d fs.DirEntry, err error) error {
-				if err != nil {
-					return err
-				}
+			} else {
+				// Register a newly created dir tree
+				// This is for "mkdir -p one/two/three".
+				// Usually all those directories will be created before we can set up
+				// watchers on the subdirectories, so only "one" would be sent
+				// as a Create event and not "one/two" and "one/two/three"
+				// (inotifywait -r has the same problem).
+				err = filepath.WalkDir(ev.Name, func(curDir string, d fs.DirEntry, err error) error {
+					if err != nil {
+						return err
+					}
 
-				if ev.Name != curDir {
-					// Send artificial create event.
-					// We don't know what has really happened.
+					if ev.Name != curDir {
+						// Send artificial create event.
+						// We don't know what has really happened.
 
-					// Send the previous event first to maintain proper ordering, then create a new event for the current directory
-					// The function expects to return only one event, so we need to send the previous event first and then create a new one
-					w.sendEvent(ev)
-					ev = w.newEvent(curDir, unix.IN_CREATE, 0)
-				}
+						// Send the previous event first to maintain proper ordering, then create a new event for the current directory
+						// The function expects to return only one event, so we need to send the previous event first and then create a new one
+						w.sendEvent(ev)
+						ev = w.newEvent(curDir, unix.IN_CREATE, 0)
+					}
 
-				if d.IsDir() {
-					return w.register(curDir, watch.flags, flagRecurse)
+					if d.IsDir() {
+						return w.register(curDir, watch.flags, flagRecurse)
+					}
+					return nil
+				})
+				if !w.sendError(err) {
+					return Event{}, false
 				}
-				return nil
-			})
-			if !w.sendError(err) {
-				return Event{}, false
 			}
 		}
 	}