Merge lp:~nataliabidart/ubuntuone-control-panel/improve-share-name into lp:ubuntuone-control-panel

[Natalia Bidart]

- Share names are now improved (LP: #716431).

[Martin Albisetti (beuno)]

86 + NAME_NOT_SET = _('[unknown user name]')

I would capitalise that to "Unknown user name", and maybe drop the brackets.

Branch looks good :)

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve (fieldtest natty)

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~nataliabidart/ubuntuone-control-panel/share-subs has not yet been merged into lp:ubuntuone-control-panel.

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-02-10 18:49:00 +0000
+++ ubuntuone/controlpanel/backend.py	2011-02-10 18:49:00 +0000
@@ -67,6 +67,7 @@
     ROOT_TYPE = u'ROOT'
     FOLDER_TYPE = u'UDF'
     SHARE_TYPE = u'SHARE'
+    NAME_NOT_SET = u'ENAMENOTSET'
 
     def __init__(self):
         """Initialize the webclient."""
@@ -340,6 +341,8 @@
 
         account = yield self.account_info()
         root_dir = yield dbus_client.get_root_dir()
+        shares_dir = yield dbus_client.get_shares_dir()
+        shares_dir_link = yield dbus_client.get_shares_dir_link()
         folders = yield dbus_client.get_folders()
         shares = yield dbus_client.get_shares()
 
@@ -360,10 +363,15 @@
             if not bool(share['accepted']):
                 continue
 
+            nicer_path = share[u'path'].replace(shares_dir, shares_dir_link)
+            share[u'path'] = nicer_path
+
             username = share['other_visible_name']
-            key = (username if username else share['other_username'],
-                   share['free_bytes'])
-            shares_result[key].append(share)
+            if not username:
+                username = u'%s (%s)' % (share['other_username'],
+                                         self.NAME_NOT_SET)
+
+            shares_result[username].append(share)
 
         for folder in folders:
             folder[u'type'] = self.FOLDER_TYPE
@@ -374,8 +382,8 @@
 
         result = [(u'', unicode(free_bytes), [root_volume] + folders)]
 
-        for (other_username, free_bytes), shares in shares_result.iteritems():
-            result.append((other_username, free_bytes, shares))
+        for other_username, shares in shares_result.iteritems():
+            result.append((other_username, shares[0][u'free_bytes'], shares))
 
         returnValue(result)
 

=== modified file 'ubuntuone/controlpanel/dbus_client.py'
--- ubuntuone/controlpanel/dbus_client.py	2011-02-10 18:49:00 +0000
+++ ubuntuone/controlpanel/dbus_client.py	2011-02-10 18:49:00 +0000
@@ -221,6 +221,22 @@
     return d
 
 
+def get_shares_dir():
+    """Retrieve the shares information from syncdaemon."""
+    d = defer.Deferred()
+    proxy = get_syncdaemon_proxy("/", sd_dbus_iface.DBUS_IFACE_SYNC_NAME)
+    proxy.get_sharesdir(reply_handler=d.callback, error_handler=d.errback)
+    return d
+
+
+def get_shares_dir_link():
+    """Retrieve the shares information from syncdaemon."""
+    d = defer.Deferred()
+    proxy = get_syncdaemon_proxy("/", sd_dbus_iface.DBUS_IFACE_SYNC_NAME)
+    proxy.get_sharesdir_link(reply_handler=d.callback, error_handler=d.errback)
+    return d
+
+
 def get_folders():
     """Retrieve the folders information from syncdaemon."""
     d = defer.Deferred()

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-02-10 18:49:00 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-02-10 18:49:00 +0000
@@ -431,6 +431,7 @@
                  '<span foreground="grey">%s</span>'
     ROOT = '%s - <span foreground="%s" font_size="small">%s</span>'
     NO_VOLUMES = _('No folders to show.')
+    NAME_NOT_SET = _('[unknown user name]')
 
     def __init__(self, main_window=None):
         UbuntuOneBin.__init__(self)
@@ -467,6 +468,9 @@
         empty_row = ('', False, '', False, False, gtk.ICON_SIZE_MENU, None)
 
         for name, free_bytes, volumes in info:
+            if backend.ControlBackend.NAME_NOT_SET in name:
+                name = self.NAME_NOT_SET
+
             if name:
                 name = name + "'s"
                 icon_name = self.SHARE_ICON_NAME
@@ -486,15 +490,19 @@
             volumes.sort(key=operator.itemgetter('path'))
             for volume in volumes:
                 sensitive = True
-                path = self._process_path(volume['path'])
-                is_root = volume['type'] == backend.ControlBackend.ROOT_TYPE
+                path = self._process_path(volume[u'path'])
+
+                is_root = volume[u'type'] == backend.ControlBackend.ROOT_TYPE
+                is_share = volume[u'type'] == backend.ControlBackend.SHARE_TYPE
 
                 if is_root:
                     sensitive = False
                     path = self.ROOT % (path, ORANGE, self.ALWAYS_SUBSCRIBED)
+                elif is_share:
+                    path = volume[u'name']
 
-                row = (path, bool(volume['subscribed']), icon_name, True,
-                       sensitive, gtk.ICON_SIZE_MENU, volume['volume_id'])
+                row = (path, bool(volume[u'subscribed']), icon_name, True,
+                       sensitive, gtk.ICON_SIZE_MENU, volume[u'volume_id'])
 
                 if is_root:  # root should go first!
                     self.volumes_store.prepend(treeiter, row)

=== modified file 'ubuntuone/controlpanel/gtk/tests/__init__.py'
--- ubuntuone/controlpanel/gtk/tests/__init__.py	2011-01-24 22:14:53 +0000
+++ ubuntuone/controlpanel/gtk/tests/__init__.py	2011-02-10 18:49:00 +0000
@@ -45,11 +45,11 @@
 ]
 
 FAKE_SHARES_INFO = [
-    {u'volume_id': u'1234',
+    {u'volume_id': u'1234', u'name': u'do',
      u'path': u'/home/tester/.local/share/ubuntuone/shares/do from Other User',
      u'subscribed': u'', u'type': u'SHARE'},
 
-    {u'volume_id': u'5678',
+    {u'volume_id': u'5678', u'name': u're',
      u'path': u'/home/tester/.local/share/ubuntuone/shares/re from Other User',
      u'subscribed': u'True', u'type': u'SHARE'},
 ]

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-02-10 18:49:00 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-02-10 18:49:00 +0000
@@ -869,6 +869,8 @@
                     sensitive = False
                     path = self.ui.ROOT % (path, gui.ORANGE,
                                            self.ui.ALWAYS_SUBSCRIBED)
+                elif volume['type'] == 'SHARE':
+                    path = volume['name']
 
                 self.assertEqual(row[0], path)
                 self.assertEqual(row[1], bool(volume['subscribed']))

=== modified file 'ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py'
--- ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py	2011-02-10 18:49:00 +0000
+++ ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py	2011-02-10 18:49:00 +0000
@@ -701,6 +701,8 @@
     """A mock object that mimicks syncdaemon."""
 
     ROOT_DIR = u'/yadda/yoda/Test me'
+    SHARES_DIR = u'/yadda/yoda/.hidden/ugly/dir/name/shares'
+    SHARES_DIR_LINK = u'/yadda/yoda/Test me/Shared With Me'
 
     @dbus.service.method(sd_dbus_iface.DBUS_IFACE_SYNC_NAME,
                          in_signature='', out_signature='s')
@@ -708,6 +710,18 @@
         """Return the root dir/mount point."""
         return self.ROOT_DIR
 
+    @dbus.service.method(sd_dbus_iface.DBUS_IFACE_SYNC_NAME,
+                         in_signature='', out_signature='s')
+    def get_sharesdir(self):
+        """Return the shares dir/mount point."""
+        return self.SHARES_DIR
+
+    @dbus.service.method(sd_dbus_iface.DBUS_IFACE_SYNC_NAME,
+                         in_signature='', out_signature='s')
+    def get_sharesdir_link(self):
+        """Return the root dir/mount point."""
+        return self.SHARES_DIR_LINK
+
 
 class BasicTestCase(DBusClientTestCase):
     """Test for the basic dbus client methods."""
@@ -723,3 +737,17 @@
         root = yield dbus_client.get_root_dir()
 
         self.assertEqual(MockDBusSyncDaemon.ROOT_DIR, root)
+
+    @inlineCallbacks
+    def test_get_shares_dir(self):
+        """Retrieve current syncdaemon shares dir."""
+        result = yield dbus_client.get_shares_dir()
+
+        self.assertEqual(MockDBusSyncDaemon.SHARES_DIR, result)
+
+    @inlineCallbacks
+    def test_get_shares_dir_link(self):
+        """Retrieve current syncdaemon shares dir."""
+        result = yield dbus_client.get_shares_dir_link()
+
+        self.assertEqual(MockDBusSyncDaemon.SHARES_DIR_LINK, result)

=== modified file 'ubuntuone/controlpanel/tests/__init__.py'
--- ubuntuone/controlpanel/tests/__init__.py	2011-02-10 18:49:00 +0000
+++ ubuntuone/controlpanel/tests/__init__.py	2011-02-10 18:49:00 +0000
@@ -161,7 +161,9 @@
      u'volume_id': u'1deb2874-3d28-46ae-9999-d5f48de9f460'},
 ]
 
-SHARE_PATH = u'/home/tester/.local/share/ubuntuone/shares/%s'
+ROOT_PATH = u'/home/tester/Ubuntu One'
+SHARES_PATH = u'/home/tester/.local/share/ubuntuone/shares'
+SHARES_PATH_LINK = ROOT_PATH + u'/Shared With Me'
 
 SAMPLE_SHARES = [
 
@@ -174,7 +176,7 @@
      u'node_id': u'c483f419-ed28-490a-825d-a8c074e2d795',
      u'other_username': u'otheruser',
      u'other_visible_name': u'Other User',
-     u'path': SHARE_PATH % u're from Other User',
+     u'path': SHARES_PATH + u'/re from Other User',
      u'type': u'Share',
      u'volume_id': u'4a1b263b-a2b3-4f66-9e66-4cd18050810d'},
 
@@ -187,7 +189,7 @@
      u'node_id': u'84544ea4-aefe-4f91-9bb9-ed7b0a805baf',
      u'other_username': u'otheruser',
      u'other_visible_name': u'Other User',
-     u'path': SHARE_PATH % u'do from Other User',
+     u'path': SHARES_PATH + u'/do from Other User',
      u'type': u'Share',
      u'volume_id': u'7d130dfe-98b2-4bd5-8708-9eeba9838ac0'},
 
@@ -200,7 +202,7 @@
      u'node_id': u'ca3a1cec-09d2-485e-9685-1a5180bd6441',
      u'volume_id': u'f1f1741f-ba49-46ef-b682-816c97e6e3d6',
      u'free_bytes': u'2146703403',
-     u'path': SHARE_PATH % u'yadda from ',
+     u'path': SHARES_PATH + u'/yadda from ',
      u'accepted': u'True',
      u'type': u'Share'},
 
@@ -216,7 +218,7 @@
      u'volume_id':
      u'a73f889d-ffd3-4447-b351-f0d8130d1e1a',
      u'free_bytes': u'2146703403',
-     u'path': SHARE_PATH % u'images from ',
+     u'path': SHARES_PATH + u'/images from ',
      u'accepted': u'True',
      u'type': u'Share'},
 
@@ -230,7 +232,7 @@
      u'volume_id':
      u'64b43c96-6c7c-4135-994f-03a1a3774512',
      u'free_bytes': u'108786811673',
-     u'path': SHARE_PATH % u'read-only from A Sharing User',
+     u'path': SHARES_PATH + u'/read-only from A Sharing User',
      u'accepted': u'True',
      u'type': u'Share'},
 
@@ -243,7 +245,7 @@
      u'node_id': u'e95662f7-9979-4745-8c21-8edaf893f143',
      u'volume_id': u'8896e8f8-57a3-4bf9-8558-fc54b7a3a777',
      u'free_bytes': u'108786811673',
-     u'path': SHARE_PATH % u'read-write from A Sharing User',
+     u'path': SHARES_PATH + u'/read-write from A Sharing User',
      u'accepted': u'True',
      u'type': u'Share'},
 
@@ -255,7 +257,7 @@
      u'node_id': u'67b61c92-855c-49d8-8e09-6d201d15c999',
      u'other_username': u'bad guy',
      u'other_visible_name': u'',
-     u'path': u'/home/nessita/.local/share/ubuntuone/shares/unaccepted from ',
+     u'path': SHARES_PATH + u'/unaccepted from ',
      u'subscribed': u'',
      u'type': u'Share',
      u'volume_id': u'19963c95-c684-48db-8668-ebe6d820d5c3'},
@@ -270,7 +272,7 @@
      u'node_id': u'31e47530-9448-4f03-b4dc-4154fdf35225',
      u'other_username': u'otheruser',
      u'other_visible_name': u'Other User',
-     u'path': u'/home/tester/Ubuntu One/bar',
+     u'path': ROOT_PATH + u'/bar',
      u'type': u'Shared',
      u'volume_id': u'79584900-517f-4dff-b2f3-20e8c1e79365'},
 ]

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-02-10 18:49:00 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2011-02-10 18:49:00 +0000
@@ -44,6 +44,7 @@
     EXPECTED_ACCOUNT_INFO,
     EXPECTED_ACCOUNT_INFO_WITH_CURRENT_PLAN,
     EXPECTED_DEVICES_INFO,
+    ROOT_PATH,
     SAMPLE_ACCOUNT_NO_CURRENT_PLAN,
     SAMPLE_ACCOUNT_WITH_CURRENT_PLAN,
     SAMPLE_DEVICES_JSON,
@@ -51,6 +52,8 @@
     SAMPLE_QUOTA_JSON,
     SAMPLE_SHARED,
     SAMPLE_SHARES,
+    SHARES_PATH,
+    SHARES_PATH_LINK,
     TOKEN,
 )
 from ubuntuone.controlpanel.webclient import WebClientError
@@ -90,7 +93,6 @@
     subscribed_folders = []
     subscribed_shares = []
     actions = []
-    root_dir = u'/home/tester/Something/Pepe Mosquito'
 
     def get_credentials(self):
         """Return the mock credentials."""
@@ -148,7 +150,15 @@
 
     def get_root_dir(self):
         """Grab the root dir."""
-        return self.root_dir
+        return ROOT_PATH
+
+    def get_shares_dir(self):
+        """Grab the shares dir."""
+        return SHARES_PATH
+
+    def get_shares_dir_link(self):
+        """Grab the shares dir."""
+        return SHARES_PATH_LINK
 
     def get_folders(self):
         """Grab list of folders."""
@@ -395,8 +405,7 @@
         free_bytes = int(result['quota_total']) - int(result['quota_used'])
 
         # get root dir info
-        root_dir = MockDBusClient.root_dir
-        root_volume = {u'volume_id': u'', u'path': root_dir,
+        root_volume = {u'volume_id': u'', u'path': ROOT_PATH,
                        u'subscribed': 'True', u'type': self.be.ROOT_TYPE}
 
         # get shares and group by sharing user
@@ -406,20 +415,28 @@
             if not bool(share['accepted']):
                 continue
 
+            share = share.copy()
+
+            nicer_path = share[u'path'].replace(SHARES_PATH, SHARES_PATH_LINK)
+            share[u'path'] = nicer_path
+            share[u'type'] = self.be.SHARE_TYPE
+
             username = share['other_visible_name']
-            key = (username if username else share['other_username'],
-                   share['free_bytes'])
-            share[u'type'] = self.be.SHARE_TYPE
-            shares[key].append(share)
+            if not username:
+                username = share['other_username'] + \
+                           ' (%s)' % self.be.NAME_NOT_SET
+
+            shares[username].append(share)
 
         folders = []
         for folder in SAMPLE_FOLDERS:
+            folder = folder.copy()
             folder[u'type'] = self.be.FOLDER_TYPE
             folders.append(folder)
 
         expected = [(u'', unicode(free_bytes), [root_volume] + folders)]
-        for (other_user, free_bytes), data in shares.iteritems():
-            expected.append((other_user, free_bytes, data))
+        for other_user, data in shares.iteritems():
+            expected.append((other_user, data[0][u'free_bytes'], data))
 
         result = yield self.be.volumes_info()
         self.assertEqual(result, expected)
@@ -434,8 +451,7 @@
     def test_volumes_are_cached(self):
         """The volume list is cached."""
         # get root dir info
-        root_dir = MockDBusClient.root_dir
-        root_volume = {u'volume_id': u'', u'path': root_dir,
+        root_volume = {u'volume_id': u'', u'path': ROOT_PATH,
                        u'subscribed': 'True', u'type': self.be.ROOT_TYPE}
         expected = {u'': root_volume}
         for volume in SAMPLE_SHARES + SAMPLE_FOLDERS: