Merge lp:~mikemc/ubuntuone-client/fix-daemon-rename-event into lp:ubuntuone-client

[Mike McCracken]

- Generate MODIFY event after CREATE when we see RENAME from system into watched path. (LP: #1052713)

- Generate MODIFY event after CREATE when we see RENAME from system into watched path. (LP: #1052713)

[Manuel de la Peña (mandel)]

Good catch..

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'tests/platform/filesystem_notifications/test_fsevents_daemon.py'
--- tests/platform/filesystem_notifications/test_fsevents_daemon.py	2012-07-23 12:26:42 +0000
+++ tests/platform/filesystem_notifications/test_fsevents_daemon.py	2012-09-18 23:50:38 +0000
@@ -41,6 +41,7 @@
 from ubuntuone.platform.filesystem_notifications.pyinotify_agnostic import (
     IN_CREATE,
     IN_DELETE,
+    IN_MODIFY,
     IN_MOVED_FROM,
     IN_MOVED_TO,
 )
@@ -266,7 +267,7 @@
             self.assertEqual(event_path, pyinotify_event.pathname)
 
     def test_convert_in_pyinotify_event_rename_create(self):
-        """Test the creation of a rename which is a create."""
+        """Test the creation of a rename which is a create/modify pair."""
         source_path = u'/not/watched/path'
         destination_path = u'/watched/path'
         head, _ = os.path.split(destination_path)
@@ -275,12 +276,18 @@
         event.event_type = fseventsd.FSE_RENAME
         event.event_paths.extend([source_path, destination_path])
         converted_events = self.factory.convert_in_pyinotify_event(event)
-        self.assertEqual(1, len(converted_events))
-        pyinotify_event = converted_events[0]
-        self.assertEqual(0, pyinotify_event.wd)
-        self.assertEqual(event.is_directory, pyinotify_event.dir)
-        self.assertEqual(IN_CREATE, pyinotify_event.mask)
-        self.assertEqual(destination_path, pyinotify_event.pathname)
+        self.assertEqual(2, len(converted_events))
+        pyi_create_event = converted_events[0]
+        self.assertEqual(0, pyi_create_event.wd)
+        self.assertEqual(event.is_directory, pyi_create_event.dir)
+        self.assertEqual(IN_CREATE, pyi_create_event.mask)
+        self.assertEqual(destination_path, pyi_create_event.pathname)
+
+        pyi_modify_event = converted_events[1]
+        self.assertEqual(0, pyi_modify_event.wd)
+        self.assertEqual(event.is_directory, pyi_modify_event.dir)
+        self.assertEqual(IN_MODIFY, pyi_modify_event.mask)
+        self.assertEqual(destination_path, pyi_modify_event.pathname)
 
     def test_convert_in_pyinotify_event_rename_delete(self):
         """Test the creation of a rename which is a delete."""

=== modified file 'ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py'
--- ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py	2012-08-28 14:49:39 +0000
+++ ubuntuone/platform/filesystem_notifications/monitor/darwin/fsevents_daemon.py	2012-09-18 23:50:38 +0000
@@ -147,8 +147,12 @@
         self.watched_paths = []
         self.ignored_paths = []
 
+        self.log = logging.getLogger('ubuntuone.SyncDaemon.EventsFactory')
+        self.log.setLevel(TRACE)
+
     def events_dropper(self):
         """Deal with the fact that the daemon dropped events."""
+        self.log.error("Event received with dropped flag set, not handled.")
 
     def path_is_not_interesting(self, path):
         """Return if the factory is interested in the path."""
@@ -160,8 +164,8 @@
 
     def is_create(self, event):
         """Decide if a rename event should be considered a create."""
-        # is a create if the creation path (first path) is either not watched or
-        # in the ignored paths
+        # is a create if the creation path (first path) is either not
+        # watched or in the ignored paths
         source_path = get_syncdaemon_valid_path(event.event_paths[0])
         return self.path_is_not_interesting(source_path)
 
@@ -205,7 +209,7 @@
             'mask': mask,
             'name': tail,
             'cookie': cookie,
-            'src_pathname' : source_tail,
+            'src_pathname': source_tail,
             'path': '.'}
         move_to_event = Event(event_raw_data)
         move_to_event.pathname = destination_path
@@ -216,8 +220,11 @@
         # the rename is a special type of event because it has to be either
         # converted is a pair of events or in a single one (CREATE or DELETE)
         if event.event_type == fseventsd.FSE_RENAME:
+
             is_create = self.is_create(event)
-            if is_create or self.is_delete(event):
+            is_delete = self.is_delete(event)
+
+            if is_create or is_delete:
                 mask = IN_CREATE if is_create else IN_DELETE
                 if event.is_directory:
                     mask |= IN_ISDIR
@@ -236,12 +243,22 @@
                     'mask': mask,
                     'name': tail,
                     'path': '.'}
-                pyinotify_event = Event(event_raw_data)
-                pyinotify_event.pathname = path
-                return [pyinotify_event]
+                orig_event = Event(event_raw_data)
+                orig_event.pathname = path
+                events = [orig_event]
+
+                if is_create:
+                    mod_event = Event(event_raw_data)
+                    mod_event.pathname = path
+                    mod_event.mask = IN_MODIFY
+                    if event.is_directory:
+                        mod_event.mask |= IN_ISDIR
+                    events.append(mod_event)
+
+                return events
             else:
-                # we do have a rename within watched paths lets generate to
-                # fake events
+                # we have a rename within watched paths, so let's
+                # generate two fake events
                 cookie = str(uuid4())
                 return [self.generate_from_event(event, cookie),
                         self.generate_to_event(event, cookie)]
@@ -282,6 +299,7 @@
             # this should not be very common but we have to deal with it
             return self.events_dropper()
         events = self.convert_in_pyinotify_event(event)
+        self.log.debug("process_event : %r => %r" % (event, events))
         for pyinotify_event in events:
             # assert that the path name is valid
             if not any([pyinotify_event.pathname.startswith(path)