Merge lp:~nataliabidart/magicicada-gui/symlinks-metadata into lp:magicicada-gui

[Natalia Bidart]

Support NOT_SYNCHED_PATH as metadata value. Support symlinks when asking for metadata to underlying layers (LP: #612191).

Support NOT_SYNCHED_PATH as metadata value. Support symlinks when asking for metadata to underlying layers.

[Facundo Batista (facundo)]

Like it!

review: Approve

=== modified file 'magicicada/__init__.py'
--- magicicada/__init__.py	2010-08-13 18:34:05 +0000
+++ magicicada/__init__.py	2010-08-22 22:18:44 +0000
@@ -38,7 +38,7 @@
 from twisted.internet import gtk2reactor  # for gtk-2.0
 gtk2reactor.install()
 
-from magicicada import syncdaemon, logger as logger_helper
+from magicicada import syncdaemon, dbusiface, logger as logger_helper
 from magicicada.helpers import humanize_bytes, get_data_file, get_builder, \
     log, NO_OP
 
@@ -172,6 +172,7 @@
                             flags=gtk.DIALOG_NO_SEPARATOR,
                             buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
         dialog.set_size_request(600, 300)
+        dialog.set_border_width(10)
         # gtk.WIN_POS_CENTER makes dialogs overlap
         dialog.set_position(gtk.WIN_POS_MOUSE)
         dialog.set_icon(self._icon)
@@ -474,14 +475,18 @@
     @log(logger)
     def on_metadata_ready(self, path, metadata):
         """Lower layer has the requested metadata for 'path'."""
-        logger.debug('on_metadata_ready: path: %r', path)
         if path not in self.metadata_dialogs:
+            logger.info('on_metadata_ready: path %r not in stored paths!')
             return
 
         dialog = self.metadata_dialogs[path]
         dialog.spinner.hide()
         dialog.view.show()
-        text = '\n'.join('%s: %s' % i for i in metadata.iteritems())
+        if metadata == dbusiface.NOT_SYNCHED_PATH:
+            # Metadata path doesn't exsit for syncdaemon
+            text = dbusiface.NOT_SYNCHED_PATH
+        else:
+            text = '\n'.join('%s: %s' % i for i in metadata.iteritems())
         dialog.view.get_buffer().set_text(text)
 
     # custom

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-08-07 15:49:21 +0000
+++ magicicada/syncdaemon.py	2010-08-22 22:18:44 +0000
@@ -19,6 +19,7 @@
 """The backend that communicates Magicicada with the SyncDaemon."""
 
 import logging
+import os
 
 from twisted.internet import defer, reactor
 
@@ -293,5 +294,5 @@
         if self.on_metadata_ready_callback is None:
             raise ValueError("Missing the mandatory cback for get_metadata.")
 
-        d = self.dbus.get_metadata(path)
+        d = self.dbus.get_metadata(os.path.realpath(path))
         d.addCallback(lambda resp: self.on_metadata_ready_callback(path, resp))

=== modified file 'magicicada/tests/test_magicicada.py'
--- magicicada/tests/test_magicicada.py	2010-08-16 20:45:51 +0000
+++ magicicada/tests/test_magicicada.py	2010-08-22 22:18:44 +0000
@@ -33,7 +33,8 @@
 
 from magicicada import MagicicadaUI, CONTENT_QUEUE, META_QUEUE, \
                        UBUNTU_ONE_ROOT, syncdaemon
-from magicicada.dbusiface import QueueData, FolderData, ShareData
+from magicicada.dbusiface import QueueData, FolderData, ShareData, \
+                                 NOT_SYNCHED_PATH
 from magicicada.helpers import NO_OP, humanize_bytes, get_data_file
 from magicicada.tests.helpers import MementoHandler
 
@@ -1259,7 +1260,8 @@
         self.assertTrue(buff is not None,
                         'buffer for metadata_view must not be None.')
 
-        expected = '\n'.join('%s: %s' % i for i in expected.iteritems())
+        if isinstance(expected, dict):
+            expected = '\n'.join('%s: %s' % i for i in expected.iteritems())
         actual = buff.get_text(*buff.get_bounds())
         msg = 'buffer content must be %s (got %s instead).'
         self.assertEqual(actual, expected, msg % (expected, actual))
@@ -1425,6 +1427,14 @@
 
         self.assert_buffer_content(path, self.metadata)
 
+    def test_on_metadata_ready_if_invalid_path(self):
+        """Callback on_metadata_ready handles NOT_SYNCHED_PATH."""
+        path = 'bla'
+        self.ui.metadata_dialogs = {path: self.ui._new_metadata_dialog(path)}
+        self.ui.on_metadata_ready(path, NOT_SYNCHED_PATH)
+
+        self.assert_buffer_content(path, NOT_SYNCHED_PATH)
+
     def test_on_metadata_ready_doesnt_update_if_last_path_doesnt_match(self):
         """Callback on_metadata_ready updates the metadata_view."""
         self.patch(self.ui, '_new_metadata_dialog', self._set_called)

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-08-01 15:10:53 +0000
+++ magicicada/tests/test_syncdaemon.py	2010-08-22 22:18:44 +0000
@@ -19,6 +19,7 @@
 """Tests for the SyncDaemon communication backend."""
 
 import logging
+import os
 import unittest
 
 from magicicada.syncdaemon import SyncDaemon, State
@@ -826,6 +827,7 @@
 
     def test_get_metadata_ok(self):
         """Get the metadata for given path."""
+        self.patch(os.path, 'realpath', lambda p: p)
         called = []
         self.sd.dbus.get_metadata = lambda p: defer.succeed('foo')
         self.sd.on_metadata_ready_callback = lambda *a: called.extend(a)
@@ -834,6 +836,7 @@
 
     def test_get_metadata_double(self):
         """Get the metadata twice."""
+        self.patch(os.path, 'realpath', lambda p: p)
         called = []
         fake_md = {'path1': 'foo', 'path2': 'bar'}
         self.sd.dbus.get_metadata = lambda p: defer.succeed(fake_md[p])
@@ -843,6 +846,17 @@
         self.assertEqual(called[0], ('path1', 'foo'))
         self.assertEqual(called[1], ('path2', 'bar'))
 
+    def test_get_metadata_uses_realpath(self):
+        """Ask for metadata using the realpath (LP: #612191)."""
+        self.patch(os.path, 'realpath', lambda p: '/a/realpath')
+        called = []
+        self.sd.dbus.get_metadata = lambda p: defer.succeed(p)
+        self.sd.on_metadata_ready_callback = lambda *a: called.extend(a)
+
+        self.sd.get_metadata('/a/symlink/path')
+
+        self.assertEqual(called, ['/a/symlink/path', '/a/realpath'])
+
 
 class FoldersTests(BaseTest):
     """Folders checking."""