adapter/darwin: apple really likes duplicating events, fix the seen created path set removal logic in the create+rename case

Author: Will

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.14.4
+
+- Fixed a rare misreporting error in the darwin/fsevents adapter where a rename event very quickly after a creation event on the same path could cause the creation event to be duplicated alongside the rename event.
+
 ## 0.14.3
 
 - Fixed duplicate creation events being reported on Linux in the inotify adapter when the event matched both the special directory creation path and the non-pending parse result path.

devel/include/detail/wtr/watcher/adapter/darwin/watch.hpp

@@ -135,20 +135,21 @@ inline auto event_recv_one(ContextData& ctx, char const* path, unsigned flags)
         rename events, see this directory's
         notes (in the `notes.md` file).
     */
-    auto at = ctx.seen_created_paths->find(path);
-    if (at != ctx.seen_created_paths->end())
-      ctx.seen_created_paths->erase(at);
     auto lr_path = *ctx.last_rename_path;
     auto differs = ! lr_path.empty() && lr_path != path;
     auto missing = access(lr_path.c_str(), F_OK) == -1;
-    if (differs && missing)
+    if (differs && missing) {
       ctx.callback({
         {lr_path, ety::rename, pt},
         {   path, ety::rename, pt}
-      }),
-        ctx.last_rename_path->clear();
-    else
+      });
+      ctx.last_rename_path->clear();
+    } else {
       *ctx.last_rename_path = path;
+      auto at = ctx.seen_created_paths->find(path);
+      if (at != ctx.seen_created_paths->end())
+        ctx.seen_created_paths->erase(at);
+    }
   }
 }
 

include/wtr/watcher.hpp

@@ -615,20 +615,21 @@ inline auto event_recv_one(ContextData& ctx, char const* path, unsigned flags)
         rename events, see this directory's
         notes (in the `notes.md` file).
     */
-    auto at = ctx.seen_created_paths->find(path);
-    if (at != ctx.seen_created_paths->end())
-      ctx.seen_created_paths->erase(at);
     auto lr_path = *ctx.last_rename_path;
     auto differs = ! lr_path.empty() && lr_path != path;
     auto missing = access(lr_path.c_str(), F_OK) == -1;
-    if (differs && missing)
+    if (differs && missing) {
       ctx.callback({
         {lr_path, ety::rename, pt},
         {   path, ety::rename, pt}
-      }),
-        ctx.last_rename_path->clear();
-    else
+      });
+      ctx.last_rename_path->clear();
+    } else {
       *ctx.last_rename_path = path;
+      auto at = ctx.seen_created_paths->find(path);
+      if (at != ctx.seen_created_paths->end())
+        ctx.seen_created_paths->erase(at);
+    }
   }
 }