Merge lp:~alecu/ubuntuone-client/fix-activity-journal-names into lp:ubuntuone-client

[Alejandro J. Cura]

Set the freeform .text in Zeitgeist events, including file name. (fixes LP: #735613)

Make the name of the zeitgeist events use a user friendly m.text field, so when the gnome-activity-journal is used to browse the Ubuntu One history, no ubuntuone:uuids are shown there anymore.(fixes LP: #735613)

[Alejandro J. Cura (alecu)]

To test this IRL, make sure you have gnome-activity-journal installed, so all Zeitgeist dependencies are running.

If you've just installed zeitgeist, make sure to restart ubuntuone-syncdaemon.

Try copying files and directories into your UbuntuOne directory, and try uploading files and creating directories in the web UI; wait for them to sync.
Try deleting local and remote files.

Then go to the gnome-activity-journal and you'll see all files and folders there.
Also, try opening ~/.local/share/zeitgeist/activity.sqlite with sqlite3 and run "select * from event_view".

[Eric Casteleijn (thisfred)]

Looks good, tests pass, but I still see uuids in the journal when running:

PYTHONPATH=. bin/ubuntuone-syncdaemon

from this branch. Do I need to do something else?

review: Needs Information

[Eric Casteleijn (thisfred)]

This is what I see in the sqlite db:

3978|1300721509453|7|1|1||ubuntuone:a366382b-10cc-4b77-9261-ccd8c5aa557e|20|2|file:////home/eric/Ubuntu One/emacs-stuff/pylint_etc_wrapper.py|20|pylint_etc_wrapper.py|net|

I'm thinking I need to kill and start something else?

[Eric Casteleijn (thisfred)]

It does show the filename in multiview and thumbview but the timeline view shows uuids. This is not an issue of this branch then, if it is an issue at all.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:ubuntuone-client failed due to conflicts:

text conflict in tests/platform/linux/eventlog/test_zg_listener.py
text conflict in ubuntuone/eventlog/zg_listener.py

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/fix-activity-journal-names into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.16
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize depen...

=== modified file 'tests/platform/linux/eventlog/test_zg_listener.py'
--- tests/platform/linux/eventlog/test_zg_listener.py	2011-03-21 16:41:20 +0000
+++ tests/platform/linux/eventlog/test_zg_listener.py	2011-03-22 20:04:41 +0000
@@ -26,6 +26,7 @@
 import unittest
 import uuid
 
+from os.path import basename
 from twisted.internet import defer
 from zeitgeist.datamodel import Interpretation, Manifestation
 
@@ -194,6 +195,7 @@
 
         self.assertEqual(len(self.listener.zg.events), 1)
         event = self.listener.zg.events[0]
+        foldername = basename(path)
 
         self.assertEqual(event.interpretation,
                           EVENT_INTERPRETATION_U1_FOLDER_SHARED)
@@ -207,6 +209,7 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(folder.origin.endswith(path))
+        self.assertEqual(folder.text, foldername)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_NETWORK)
 
@@ -215,6 +218,7 @@
         self.assertEqual(other_user.interpretation, INTERPRETATION_U1_CONTACT)
         self.assertEqual(other_user.manifestation,
                           MANIFESTATION_U1_CONTACT_DATA_OBJECT)
+        self.assertEqual(other_user.text, fake_username)
 
 
     @defer.inlineCallbacks
@@ -223,7 +227,8 @@
         sample_share_id = "share id"
         sample_node_id = "node id"
         fake_username = "fake user"
-        path = os.path.join(self.vm.root.path, 'shared_path')
+        folder_name = "shared_path"
+        path = os.path.join(self.vm.root.path, folder_name)
         self.main.fs.create(path, "")
         self.main.fs.set_node_id(path, sample_node_id)
         share = Shared(path=path, volume_id=sample_share_id,
@@ -256,6 +261,7 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(folder.origin.endswith(path))
+        self.assertEqual(folder.text, folder_name)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_NETWORK)
 
@@ -264,6 +270,7 @@
         self.assertEqual(other_user.interpretation, INTERPRETATION_U1_CONTACT)
         self.assertEqual(other_user.manifestation,
                           MANIFESTATION_U1_CONTACT_DATA_OBJECT)
+        self.assertEqual(other_user.text, fake_username)
 
     @defer.inlineCallbacks
     def test_share_accepted_is_logged(self):
@@ -271,9 +278,10 @@
         # initialize the the root
         self.vm._got_root('root_uuid')
         fake_username = "fake user"
-        path = os.path.join(self.vm.root.path, 'shared_path')
+        folder_name = "shared_path"
+        path = os.path.join(self.vm.root.path, folder_name)
         self.main.fs.create(path, "")
-        share_path = os.path.join(self.shares_dir, 'fake_share')
+        share_path = os.path.join(self.shares_dir, folder_name)
         share = Share(path=share_path, volume_id='volume_id', node_id="node_id",
                       other_username=fake_username)
         yield self.vm.add_share(share)
@@ -293,6 +301,7 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(folder.origin.endswith(share_path))
+        self.assertEqual(folder.text, folder_name)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_NETWORK)
 
@@ -301,15 +310,17 @@
         self.assertEqual(other_user.interpretation, INTERPRETATION_U1_CONTACT)
         self.assertEqual(other_user.manifestation,
                           MANIFESTATION_U1_CONTACT_DATA_OBJECT)
+        self.assertEqual(other_user.text, fake_username)
 
 
     @defer.inlineCallbacks
     def test_share_unaccepted_is_logged(self):
         """Test that an unaccepted share event is logged."""
         fake_username = "fake user"
+        folder_name = u"share"
         d = defer.Deferred()
 
-        share_path = os.path.join(self.main.shares_dir, 'share')
+        share_path = os.path.join(self.main.shares_dir, folder_name)
         holder = NotifyShareHolder.from_params(uuid.uuid4(),
                                                      uuid.uuid4(),
                                                      u'fake_share',
@@ -337,6 +348,7 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(folder.origin.endswith(share_path))
+        self.assertEqual(folder.text, folder_name)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_NETWORK)
 
@@ -345,6 +357,7 @@
         self.assertEqual(other_user.interpretation, INTERPRETATION_U1_CONTACT)
         self.assertEqual(other_user.manifestation,
                           MANIFESTATION_U1_CONTACT_DATA_OBJECT)
+        self.assertEqual(other_user.text, fake_username)
 
 
 class ZeitgeistUDFsTestCase(ZeitgeistListenerTestCase):
@@ -375,7 +388,8 @@
     @defer.inlineCallbacks
     def test_udf_create_is_logged(self):
         """Test for Folders.create."""
-        path = os.path.join(self.home_dir, u'ñoño'.encode('utf-8'))
+        folder_name = u'ñoño'.encode('utf-8')
+        path = os.path.join(self.home_dir, folder_name)
         id = uuid.uuid4()
         node_id = uuid.uuid4()
 
@@ -413,6 +427,7 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(folder.origin.endswith(path))
+        self.assertEqual(folder.text, folder_name)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_NETWORK)
 
@@ -421,7 +436,8 @@
         """Test for Folders.delete."""
         id = uuid.uuid4()
         node_id = uuid.uuid4()
-        path = os.path.join(self.home_dir, u'ñoño'.encode('utf-8'))
+        folder_name = u'ñoño'.encode('utf-8')
+        path = os.path.join(self.home_dir, folder_name)
 
         d = defer.Deferred()
         self.listener.zg.deferreds.append(d)
@@ -472,13 +488,15 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.DELETED_RESOURCE)
         self.assertTrue(folder.origin.endswith(path))
+        self.assertEqual(folder.text, folder_name)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_DELETED)
 
     @defer.inlineCallbacks
     def test_udf_subscribe_is_logged(self):
         """Test for Folders.subscribe."""
-        suggested_path = u'~/ñoño'
+        folder_name = u"ñoño"
+        suggested_path = u'~/' + folder_name
         udf = self._create_udf(uuid.uuid4(), 'node_id', suggested_path,
                                subscribed=False)
         yield self.main.vm.add_udf(udf)
@@ -502,6 +520,7 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.FILE_DATA_OBJECT)
         self.assertTrue(folder.origin.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(folder.text, folder_name)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_LOCAL)
 
@@ -511,6 +530,7 @@
         suggested_path = u'~/ñoño'
         udf = self._create_udf(uuid.uuid4(), 'node_id', suggested_path,
                                subscribed=True)
+        folder_name = basename(udf.path)
         yield self.main.vm.add_udf(udf)
         d = defer.Deferred()
         self._listen_for('VM_UDF_UNSUBSCRIBED', d.callback, 1, collect=True)
@@ -532,6 +552,7 @@
         self.assertEqual(folder.manifestation,
                           Manifestation.DELETED_RESOURCE)
         self.assertTrue(folder.origin.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(folder.text, folder_name)
         self.assertEqual(folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(folder.storage, STORAGE_DELETED)
 
@@ -620,6 +641,7 @@
         self.assertEqual(remote_file.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(remote_file.origin.endswith(filename))
+        self.assertEqual(remote_file.text, filename)
         self.assertEqual(remote_file.mimetype, "audio/mpeg")
         self.assertEqual(remote_file.storage, STORAGE_NETWORK)
 
@@ -655,14 +677,15 @@
                           Manifestation.SCHEDULED_ACTIVITY)
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
-        remote_file = event.subjects[0]
-        self.assertTrue(remote_file.uri.startswith(URI_PROTOCOL_U1))
-        self.assertEqual(remote_file.interpretation, Interpretation.FOLDER)
-        self.assertEqual(remote_file.manifestation,
+        remote_folder = event.subjects[0]
+        self.assertTrue(remote_folder.uri.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(remote_folder.interpretation, Interpretation.FOLDER)
+        self.assertEqual(remote_folder.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
-        self.assertTrue(remote_file.origin.endswith(dirname))
-        self.assertEqual(remote_file.mimetype, DIRECTORY_MIMETYPE)
-        self.assertEqual(remote_file.storage, STORAGE_NETWORK)
+        self.assertTrue(remote_folder.origin.endswith(dirname))
+        self.assertEqual(remote_folder.text, dirname)
+        self.assertEqual(remote_folder.mimetype, DIRECTORY_MIMETYPE)
+        self.assertEqual(remote_folder.storage, STORAGE_NETWORK)
 
     def test_syncdaemon_modifies_on_server_is_logged(self):
         """Files modified by SyncDaemon on the server are logged."""
@@ -702,12 +725,14 @@
         self.assertEqual(remote_file.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(remote_file.origin.endswith(filename))
+        self.assertEqual(remote_file.text, filename)
         self.assertEqual(remote_file.mimetype, "audio/mpeg")
         self.assertEqual(remote_file.storage, STORAGE_NETWORK)
 
     @defer.inlineCallbacks
     def test_syncdaemon_deletes_file_on_server_is_logged(self):
         """Files deleted by SD on the server are logged."""
+        file_name = "filename.mp3"
         d = defer.Deferred()
         listen_for(self.main.event_q, 'AQ_UNLINK_OK', d.callback)
 
@@ -727,18 +752,20 @@
                           Manifestation.SCHEDULED_ACTIVITY)
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
-        remote_folder = event.subjects[0]
-        self.assertTrue(remote_folder.uri.startswith(URI_PROTOCOL_U1))
-        self.assertEqual(remote_folder.interpretation, Interpretation.AUDIO)
-        self.assertEqual(remote_folder.manifestation,
+        remote_file = event.subjects[0]
+        self.assertTrue(remote_file.uri.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(remote_file.interpretation, Interpretation.AUDIO)
+        self.assertEqual(remote_file.manifestation,
                           Manifestation.DELETED_RESOURCE)
-        self.assertTrue(remote_folder.origin.endswith("filename.mp3"))
-        self.assertEqual(remote_folder.mimetype, "audio/mpeg")
-        self.assertEqual(remote_folder.storage, STORAGE_DELETED)
+        self.assertTrue(remote_file.origin.endswith(file_name))
+        self.assertEqual(remote_file.text, file_name)
+        self.assertEqual(remote_file.mimetype, "audio/mpeg")
+        self.assertEqual(remote_file.storage, STORAGE_DELETED)
 
     @defer.inlineCallbacks
     def test_syncdaemon_deletes_dir_on_server_is_logged(self):
-        """Files deleted by SD on the server are logged."""
+        """Directories deleted by SD on the server are logged."""
+        folder_name = "folder name"
         d = defer.Deferred()
         listen_for(self.main.event_q, 'AQ_UNLINK_OK', d.callback)
 
@@ -763,7 +790,8 @@
         self.assertEqual(remote_folder.interpretation, Interpretation.FOLDER)
         self.assertEqual(remote_folder.manifestation,
                           Manifestation.DELETED_RESOURCE)
-        self.assertTrue(remote_folder.origin.endswith("folder name"))
+        self.assertTrue(remote_folder.origin.endswith(folder_name))
+        self.assertEqual(remote_folder.text, folder_name)
         self.assertEqual(remote_folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(remote_folder.storage, STORAGE_DELETED)
 
@@ -823,6 +851,7 @@
     @defer.inlineCallbacks
     def test_syncdaemon_creates_file_locally_is_logged(self):
         """Files created locally by SyncDaemon are logged."""
+        file_name = self.filemp3delta.name.encode('utf8')
         d = defer.Deferred()
         d2 = defer.Deferred()
         listen_for(self.main.event_q, 'SV_FILE_NEW', d.callback)
@@ -835,7 +864,7 @@
 
         # check that the file is created
         node = self.main.fs.get_by_node_id(ROOT, self.filemp3delta.node_id)
-        self.assertEqual(node.path, self.filemp3delta.name.encode('utf8'))
+        self.assertEqual(node.path, file_name)
         self.assertEqual(node.is_dir, False)
         self.assertEqual(node.generation, self.filemp3delta.generation)
 
@@ -859,18 +888,19 @@
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
         local_file = event.subjects[0]
-        self.assertTrue(local_file.uri.endswith(
-                        self.filemp3delta.name.encode('utf8')))
+        self.assertTrue(local_file.uri.endswith(file_name))
         self.assertEqual(local_file.interpretation, Interpretation.AUDIO)
         self.assertEqual(local_file.manifestation,
                           Manifestation.FILE_DATA_OBJECT)
         self.assertTrue(local_file.origin.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(local_file.text, file_name)
         self.assertEqual(local_file.mimetype, "audio/mpeg")
         self.assertEqual(local_file.storage, STORAGE_LOCAL)
 
     @defer.inlineCallbacks
     def test_syncdaemon_creates_dir_locally_is_logged(self):
         """Dirs created locally by SyncDaemon are logged."""
+        folder_name = self.dirdelta.name.encode('utf8')
         d = defer.Deferred()
         listen_for(self.main.event_q, 'SV_DIR_NEW', d.callback)
 
@@ -881,7 +911,7 @@
 
         # check that the dir is created
         node = self.main.fs.get_by_node_id(ROOT, self.dirdelta.node_id)
-        self.assertEqual(node.path, self.dirdelta.name.encode('utf8'))
+        self.assertEqual(node.path, folder_name)
         self.assertEqual(node.is_dir, True)
         self.assertEqual(node.generation, self.dirdelta.generation)
 
@@ -896,19 +926,20 @@
                           Manifestation.WORLD_ACTIVITY)
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
-        local_file = event.subjects[0]
-        self.assertTrue(local_file.uri.endswith(
-                        self.dirdelta.name.encode('utf8')))
-        self.assertEqual(local_file.interpretation, Interpretation.FOLDER)
-        self.assertEqual(local_file.manifestation,
+        local_folder = event.subjects[0]
+        self.assertTrue(local_folder.uri.endswith(folder_name))
+        self.assertEqual(local_folder.interpretation, Interpretation.FOLDER)
+        self.assertEqual(local_folder.manifestation,
                           Manifestation.FILE_DATA_OBJECT)
-        self.assertTrue(local_file.origin.startswith(URI_PROTOCOL_U1))
-        self.assertEqual(local_file.mimetype, DIRECTORY_MIMETYPE)
-        self.assertEqual(local_file.storage, STORAGE_LOCAL)
+        self.assertTrue(local_folder.origin.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(local_folder.text, folder_name)
+        self.assertEqual(local_folder.mimetype, DIRECTORY_MIMETYPE)
+        self.assertEqual(local_folder.storage, STORAGE_LOCAL)
 
     @defer.inlineCallbacks
     def test_syncdaemon_modifies_locally_is_logged(self):
         """Files modified locally by SyncDaemon are logged."""
+        file_name = self.filemp3delta.name.encode('utf8')
         d = defer.Deferred()
         d2 = defer.Deferred()
         listen_for(self.main.event_q, 'SV_FILE_NEW', d.callback)
@@ -921,7 +952,7 @@
 
         # check that the file is modified
         node = self.main.fs.get_by_node_id(ROOT, self.filemp3delta.node_id)
-        self.assertEqual(node.path, self.filemp3delta.name.encode('utf8'))
+        self.assertEqual(node.path, file_name)
         self.assertEqual(node.is_dir, False)
         self.assertEqual(node.generation, self.filemp3delta.generation)
 
@@ -949,18 +980,19 @@
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
         local_file = event.subjects[0]
-        self.assertTrue(local_file.uri.endswith(
-                        self.filemp3delta.name.encode('utf8')))
+        self.assertTrue(local_file.uri.endswith(file_name))
         self.assertEqual(local_file.interpretation, Interpretation.AUDIO)
         self.assertEqual(local_file.manifestation,
                           Manifestation.FILE_DATA_OBJECT)
         self.assertTrue(local_file.origin.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(local_file.text, file_name)
         self.assertEqual(local_file.mimetype, "audio/mpeg")
         self.assertEqual(local_file.storage, STORAGE_LOCAL)
 
     @defer.inlineCallbacks
     def test_syncdaemon_deletes_file_locally_is_logged(self):
         """Files deleted locally by SyncDaemon are logged."""
+        file_name = self.filemp3delta.name.encode("utf-8")
         d = defer.Deferred()
         listen_for(self.main.event_q, 'SV_FILE_DELETED', d.callback)
 
@@ -981,18 +1013,19 @@
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
         local_file = event.subjects[0]
-        self.assertTrue(local_file.uri.endswith(
-                        self.filemp3delta.name.encode('utf8')))
+        self.assertTrue(local_file.uri.endswith(file_name))
         self.assertEqual(local_file.interpretation, Interpretation.AUDIO)
         self.assertEqual(local_file.manifestation,
                           Manifestation.DELETED_RESOURCE)
         self.assertTrue(local_file.origin.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(local_file.text, file_name)
         self.assertEqual(local_file.mimetype, "audio/mpeg")
         self.assertEqual(local_file.storage, STORAGE_DELETED)
 
     @defer.inlineCallbacks
     def test_syncdaemon_deletes_dir_locally_is_logged(self):
         """Dirs deleted locally by SyncDaemon are logged."""
+        folder_name = "folder name"
         d = defer.Deferred()
         listen_for(self.main.event_q, 'SV_FILE_DELETED', d.callback)
 
@@ -1013,21 +1046,23 @@
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
         local_folder = event.subjects[0]
-        self.assertTrue(local_folder.uri.endswith("folder name"))
+        self.assertTrue(local_folder.uri.endswith(folder_name))
         self.assertEqual(local_folder.interpretation, Interpretation.FOLDER)
         self.assertEqual(local_folder.manifestation,
                           Manifestation.DELETED_RESOURCE)
         self.assertTrue(local_folder.origin.startswith(URI_PROTOCOL_U1))
+        self.assertEqual(local_folder.text, folder_name)
         self.assertEqual(local_folder.mimetype, DIRECTORY_MIMETYPE)
         self.assertEqual(local_folder.storage, STORAGE_DELETED)
 
     @defer.inlineCallbacks
     def test_file_sync_conflict_is_logged(self):
         """Files renamed because of conflict are logged."""
+        file_name = "sample.mp3"
         d = defer.Deferred()
         listen_for(self.main.event_q, 'FSM_FILE_CONFLICT', d.callback)
 
-        testfile = os.path.join(self.main.vm.root.path, 'sample.mp3')
+        testfile = os.path.join(self.main.vm.root.path, file_name)
         mdid = self.main.fs.create(testfile, "")
         self.main.fs.set_node_id(testfile, "uuid")
         with open(testfile, "w") as fh:
@@ -1053,16 +1088,19 @@
         self.assertEqual(local_file.manifestation,
                           Manifestation.FILE_DATA_OBJECT)
         self.assertTrue(local_file.origin.endswith(testfile))
+        self.assertEqual(local_file.text,
+                         file_name + self.main.fs.CONFLICT_SUFFIX)
         self.assertEqual(local_file.mimetype, "audio/mpeg")
         self.assertEqual(local_file.storage, STORAGE_LOCAL)
 
     @defer.inlineCallbacks
     def test_dir_sync_conflict_is_logged(self):
         """Dirs renamed because of conflict are logged."""
+        folder_name = "sampledir"
         d = defer.Deferred()
         listen_for(self.main.event_q, 'FSM_DIR_CONFLICT', d.callback)
 
-        testdir = os.path.join(self.main.vm.root.path, 'sampledir')
+        testdir = os.path.join(self.main.vm.root.path, folder_name)
         mdid = self.main.fs.create(testdir, "", is_dir=True)
         self.main.fs.set_node_id(testdir, "uuid")
         os.mkdir(testdir)
@@ -1080,15 +1118,17 @@
                           Manifestation.WORLD_ACTIVITY)
         self.assertEqual(event.actor, ACTOR_UBUNTUONE)
 
-        local_file = event.subjects[0]
+        local_folder = event.subjects[0]
         new_name = testdir + self.main.fs.CONFLICT_SUFFIX
-        self.assertTrue(local_file.uri.endswith(new_name))
-        self.assertEqual(local_file.interpretation, Interpretation.FOLDER)
-        self.assertEqual(local_file.manifestation,
+        self.assertTrue(local_folder.uri.endswith(new_name))
+        self.assertEqual(local_folder.interpretation, Interpretation.FOLDER)
+        self.assertEqual(local_folder.manifestation,
                           Manifestation.FILE_DATA_OBJECT)
-        self.assertTrue(local_file.origin.endswith(testdir))
-        self.assertEqual(local_file.mimetype, DIRECTORY_MIMETYPE)
-        self.assertEqual(local_file.storage, STORAGE_LOCAL)
+        self.assertTrue(local_folder.origin.endswith(testdir))
+        self.assertEqual(local_folder.text,
+                         folder_name + self.main.fs.CONFLICT_SUFFIX)
+        self.assertEqual(local_folder.mimetype, DIRECTORY_MIMETYPE)
+        self.assertEqual(local_folder.storage, STORAGE_LOCAL)
 
 class ZeitgeistPublicFilesTestCase(ZeitgeistListenerTestCase):
     """Public files events are logged into Zeitgeist."""
@@ -1130,6 +1170,7 @@
         self.assertEqual(public_file.manifestation,
                           Manifestation.REMOTE_DATA_OBJECT)
         self.assertTrue(public_file.origin.endswith(node_id))
+        self.assertEqual(public_file.text, public_url)
         self.assertEqual(public_file.mimetype, "audio/mpeg")
         self.assertEqual(public_file.storage, STORAGE_NETWORK)
 
@@ -1170,6 +1211,7 @@
         self.assertEqual(public_file.manifestation,
                           Manifestation.DELETED_RESOURCE)
         self.assertTrue(public_file.origin.endswith(node_id))
+        self.assertEqual(public_file.text, public_url)
         self.assertEqual(public_file.mimetype, "audio/mpeg")
         self.assertEqual(public_file.storage, STORAGE_DELETED)
 

=== modified file 'ubuntuone/eventlog/zg_listener.py'
--- ubuntuone/eventlog/zg_listener.py	2011-03-21 16:41:20 +0000
+++ ubuntuone/eventlog/zg_listener.py	2011-03-22 20:04:41 +0000
@@ -19,6 +19,8 @@
 
 import mimetypes
 
+from os.path import basename
+
 from zeitgeist.datamodel import Event, Interpretation, Manifestation, Subject
 from zeitgeist.mimetypes import get_interpretation_for_mimetype
 
@@ -74,12 +76,14 @@
     def log_folder_shared(self, share, share_id):
         """Log the 'directory shared' event."""
         fullpath = share.path
+        folder_name = basename(fullpath)
 
         folder = Subject.new_for_values(
             uri=URI_PROTOCOL_U1 + str(share.node_id),
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin="file:///" + fullpath,
+            text=folder_name,
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_NETWORK)
 
@@ -87,6 +91,7 @@
         other_user = Subject.new_for_values(
             uri="mailto:" + other_username,
             interpretation=INTERPRETATION_U1_CONTACT,
+            text=other_username,
             manifestation=MANIFESTATION_U1_CONTACT_DATA_OBJECT)
 
         event = Event.new_for_values(
@@ -104,6 +109,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin="file:///" + share.path,
+            text=basename(share.path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_NETWORK)
 
@@ -111,6 +117,7 @@
         other_user = Subject.new_for_values(
             uri="mailto:" + other_username,
             interpretation=INTERPRETATION_U1_CONTACT,
+            text=other_username,
             manifestation=MANIFESTATION_U1_CONTACT_DATA_OBJECT)
 
         event = Event.new_for_values(
@@ -130,6 +137,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin="file:///" + share.path,
+            text=basename(share.path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_NETWORK)
 
@@ -137,6 +145,7 @@
         other_user = Subject.new_for_values(
             uri="mailto:" + other_username,
             interpretation=INTERPRETATION_U1_CONTACT,
+            text=other_username,
             manifestation=MANIFESTATION_U1_CONTACT_DATA_OBJECT)
 
         event = Event.new_for_values(
@@ -154,6 +163,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin="file:///" + share.path,
+            text=basename(share.path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_NETWORK)
 
@@ -161,6 +171,7 @@
         other_user = Subject.new_for_values(
             uri="mailto:" + other_username,
             interpretation=INTERPRETATION_U1_CONTACT,
+            text=other_username,
             manifestation=MANIFESTATION_U1_CONTACT_DATA_OBJECT)
 
         event = Event.new_for_values(
@@ -178,6 +189,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.DELETED_RESOURCE,
             origin="file:///" + volume.path,
+            text=basename(volume.path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_DELETED)
 
@@ -203,6 +215,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin="file:///" + udf.path,
+            text=basename(udf.path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_NETWORK)
 
@@ -222,6 +235,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.FILE_DATA_OBJECT,
             origin=URI_PROTOCOL_U1 + str(udf.node_id),
+            text=basename(udf.path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_LOCAL)
 
@@ -241,6 +255,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.DELETED_RESOURCE,
             origin=URI_PROTOCOL_U1 + str(udf.node_id),
+            text=basename(udf.path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_DELETED)
 
@@ -286,6 +301,7 @@
             interpretation=interp,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin="file:///" + path,
+            text=basename(path),
             mimetype=mime,
             storage=STORAGE_NETWORK)
 
@@ -308,6 +324,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin="file:///" + path,
+            text=basename(path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_NETWORK)
 
@@ -342,6 +359,7 @@
             interpretation=interp,
             manifestation=Manifestation.FILE_DATA_OBJECT,
             origin=URI_PROTOCOL_U1 + str(node_id),
+            text=basename(path),
             mimetype=mime,
             storage=STORAGE_LOCAL)
 
@@ -364,6 +382,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.FILE_DATA_OBJECT,
             origin=URI_PROTOCOL_U1 + str(node_id),
+            text=basename(path),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_LOCAL)
 
@@ -388,6 +407,7 @@
             interpretation=interp,
             manifestation=Manifestation.DELETED_RESOURCE,
             origin=URI_PROTOCOL_U1 + str(node_id),
+            text=basename(old_path),
             mimetype=mime,
             storage=STORAGE_DELETED)
 
@@ -413,6 +433,7 @@
             interpretation=interp,
             manifestation=Manifestation.DELETED_RESOURCE,
             origin="file:///" + old_path,
+            text=basename(old_path),
             mimetype=mime,
             storage=STORAGE_DELETED)
 
@@ -433,6 +454,7 @@
             interpretation=interp,
             manifestation=Manifestation.FILE_DATA_OBJECT,
             origin="file:///" + old_name,
+            text=basename(new_name),
             mimetype=mime,
             storage=STORAGE_LOCAL)
 
@@ -451,6 +473,7 @@
             interpretation=Interpretation.FOLDER,
             manifestation=Manifestation.FILE_DATA_OBJECT,
             origin="file:///" + old_name,
+            text=basename(new_name),
             mimetype=DIRECTORY_MIMETYPE,
             storage=STORAGE_LOCAL)
 
@@ -482,6 +505,7 @@
             interpretation=interp,
             manifestation=Manifestation.REMOTE_DATA_OBJECT,
             origin=origin,
+            text=public_url,
             mimetype=mime,
             storage=STORAGE_NETWORK)
 
@@ -504,6 +528,7 @@
             uri=public_url,
             interpretation=interp,
             manifestation=Manifestation.DELETED_RESOURCE,
+            text=public_url,
             origin=origin,
             mimetype=mime,
             storage=STORAGE_DELETED)