Linux - fix to see create of file after rename

diff --git a/fsnotify.go b/fsnotify.go
index 079869993ecd7626d52df38af18382148e20ad11..8e37833124a45d1ed1384ee882332c8f87320d8f 100644 (file)
--- a/fsnotify.go
+++ b/fsnotify.go
@@ -30,7 +30,7 @@ func (w *Watcher) purgeEvents() {
                }
 
                if (fsnFlags&FSN_RENAME == FSN_RENAME) && ev.IsRename() {
-                       w.RemoveWatch(ev.Name)
+                       //w.RemoveWatch(ev.Name)
                        sendEvent = true
                }
 

diff --git a/fsnotify_linux.go b/fsnotify_linux.go
index a0d10b99ffe455253048ef67e323c75aeda5215f..73c9a3c80720e57a12488983ef01756d2832a888 100644 (file)
--- a/fsnotify_linux.go
+++ b/fsnotify_linux.go
@@ -36,7 +36,9 @@ func (e *FileEvent) IsModify() bool {
 }
 
 // IsRename reports whether the FileEvent was triggerd by a change name
-func (e *FileEvent) IsRename() bool { return (e.mask & IN_MOVE_SELF) == IN_MOVE_SELF }
+func (e *FileEvent) IsRename() bool {
+       return ((e.mask&IN_MOVE_SELF) == IN_MOVE_SELF || (e.mask&IN_MOVED_FROM) == IN_MOVED_FROM)
+}
 
 type watch struct {
        wd    uint32 // Watch descriptor (as returned by the inotify_add_watch() syscall)
@@ -247,7 +249,7 @@ const (
        IN_MOVE_SELF     uint32 = syscall.IN_MOVE_SELF
        IN_OPEN          uint32 = syscall.IN_OPEN
 
-       OS_AGNOSTIC_EVENTS = IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF
+       OS_AGNOSTIC_EVENTS = IN_MOVED_FROM | IN_CREATE | IN_ATTRIB | IN_MODIFY | IN_MOVE_SELF | IN_DELETE | IN_DELETE_SELF
 
        // Special events
        IN_ISDIR      uint32 = syscall.IN_ISDIR