Merge lp:~diegosarmentero/ubuntuone-control-panel/shares into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Show the not accepted shares (LP: #1034542).

[Brian Curtin (brian.curtin)]

review: Approve

[lp:~diegosarmentero/ubuntuone-control-panel/shares]

349. By Diego Sarmentero on 2012-08-20

fixed lint issues

[Roberto Alsina (ralsina)]

Looks god to me, tests pass, did not do a strict code review though

review: Approve

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-08-08 18:36:45 +0000
+++ ubuntuone/controlpanel/backend.py	2012-08-20 18:55:44 +0000
@@ -828,6 +828,13 @@
         returnValue(result)
 
     @log_call(logger.info)
+    @inlineCallbacks
+    def get_shares(self):
+        """Obtain the data to create the sync menu."""
+        result = yield self.sd_client.get_shares()
+        returnValue(result)
+
+    @log_call(logger.info)
     def shutdown(self):
         """Stop this service."""
         # do any other needed cleanup

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-08-16 13:21:56 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-08-20 18:55:44 +0000
@@ -69,6 +69,7 @@
 
 FILE_URI_PREFIX = u'file://'
 
+ACCEPT_SHARES = 'https://one.ubuntu.com/files/shareoffer/%s/'
 CONTACTS_LINK = UBUNTUONE_LINK
 DASHBOARD = UBUNTUONE_LINK + u'dashboard/'
 EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + u'account/'
@@ -220,6 +221,7 @@
 NAME_NOT_SET = _('[unknown user name]')
 NETWORK_OFFLINE = _('An internet connection is required to join or sign '
                     'in to %(app_name)s.')
+NEW_SHARE_BY = _('New Share by %s')
 NO_DEVICES = _('No devices to show.')
 NO_FOLDERS = _('No folders to show.')
 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-08-20 12:52:34 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-08-20 18:55:44 +0000
@@ -26,6 +26,7 @@
 from ubuntuone.controlpanel import backend, cache
 from ubuntuone.controlpanel.logger import setup_logging
 from ubuntuone.controlpanel.gui import (
+    ACCEPT_SHARES,
     DASHBOARD,
     GET_HELP_ONLINE,
     GET_MORE_STORAGE,
@@ -35,6 +36,7 @@
     IN_PROGRESS,
     IN_PROGRESS_FILE,
     LOADING,
+    NEW_SHARE_BY,
     OPEN_UBUNTU_ONE,
     OPEN_UBUNTU_ONE_FOLDER,
     PLEASE_WAIT,
@@ -80,9 +82,26 @@
         text = IN_PROGRESS_FILE % (self._filename, progress)
         self.setText(text)
         self.label.setText(text)
+        self.setText(text)
         self.progress.setValue(progress)
 
 
+class SharesAction(QtGui.QAction):
+
+    """New Shares action."""
+
+    def __init__(self, text, volume_id, parent=None):
+        super(SharesAction, self).__init__(text, parent)
+        self._volume_id = volume_id
+
+        self.triggered.connect(self.accept_share)
+
+    def accept_share(self):
+        """Open the accept shares page."""
+        url = ACCEPT_SHARES % self._volume_id
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(url))
+
+
 class TrayIcon(QtGui.QSystemTrayIcon, cache.Cache):
 
     """System notification icon."""
@@ -96,46 +115,89 @@
         self.recent_transfers = {}
         self.uploading = {}
         self._backend_method = None
-
-        # Items
+        self._previous_shares = None
+        self.close_callback = close_callback
         self.context_menu = QtGui.QMenu()
-
-        self.status = self.context_menu.addAction(LOADING)
-        self.status.setEnabled(False)
-        self.status_action = self.context_menu.addAction(PLEASE_WAIT)
-        self.refresh_status()
-        self.context_menu.addSeparator()
-
-        self.open_u1 = self.context_menu.addAction(OPEN_UBUNTU_ONE)
-        # TODO: Share a file action when the Shares tab is ready in U1-CP
-        self.open_u1_folder = self.context_menu.addAction(
-            OPEN_UBUNTU_ONE_FOLDER)
-        self.go_to_web = self.context_menu.addAction(GO_TO_WEB)
-        self.context_menu.addSeparator()
-
-        # TODO: Shares
-
-        # Transfers
-        self.transfers = TransfersMenu(self)
-        self.context_menu.addMenu(self.transfers)
-
-        self.get_more_storage = self.context_menu.addAction(GET_MORE_STORAGE)
-        self.get_help_online = self.context_menu.addAction(GET_HELP_ONLINE)
-        self.quit = self.context_menu.addAction("Quit")
-
-        self.setContextMenu(self.context_menu)
-
-        # Connect Signals
-        self.status_action.triggered.connect(self.change_status)
-        self.open_u1.triggered.connect(self.restore_window)
-        self.open_u1_folder.triggered.connect(self.open_u1_folder_action)
-        self.get_more_storage.triggered.connect(self.get_more_storage_action)
-        self.go_to_web.triggered.connect(self.go_to_web_action)
-        self.get_help_online.triggered.connect(self.get_help_action)
-        self.quit.triggered.connect(self.stop)
-
-        self.close_callback = close_callback
-        self._get_volumes_info()
+        self.status = None
+        self.quit = None
+        self.get_help_online = None
+        self.open_u1 = None
+        self.status_action = None
+        self.go_to_web = None
+        self.get_more_storage = None
+        self.transfers = None
+        self.open_u1_folder = None
+
+        self.load_menu()
+        # Refresh the Shares every five minutes if needed.
+        self._timer_id = self.startTimer(300000)
+
+    # pylint: disable=C0103
+
+    def timerEvent(self, event):
+        """Update the menu on each iteration."""
+        self.load_menu()
+
+    # pylint: enable=C0103
+
+    @inlineCallbacks
+    def load_menu(self):
+        """Load the content of the menu."""
+        shares_info = yield self.backend.get_shares()
+        shares_info = [share for share in shares_info if not share['accepted']]
+        if shares_info != self._previous_shares:
+            # Items
+            self.context_menu.clear()
+
+            self.status = self.context_menu.addAction(LOADING)
+            self.status.setEnabled(False)
+            self.status_action = self.context_menu.addAction(PLEASE_WAIT)
+            self.refresh_status()
+            self.context_menu.addSeparator()
+
+            self.open_u1 = self.context_menu.addAction(OPEN_UBUNTU_ONE)
+            # TODO: Share a file action when the Shares tab is ready in U1-CP
+            self.open_u1_folder = self.context_menu.addAction(
+                OPEN_UBUNTU_ONE_FOLDER)
+            self.go_to_web = self.context_menu.addAction(GO_TO_WEB)
+            self.context_menu.addSeparator()
+
+            # Shares
+            self._previous_shares = shares_info
+            max_shares = 0
+            for share in self._previous_shares:
+                if max_shares == 3:
+                    break
+                max_shares += 1
+                text = NEW_SHARE_BY % share['other_visible_name']
+                share_action = SharesAction(text, share['volume_id'],
+                    self.context_menu)
+                self.context_menu.addAction(share_action)
+            if self._previous_shares:
+                self.context_menu.addSeparator()
+
+            # Transfers
+            self.transfers = TransfersMenu(self)
+            self.context_menu.addMenu(self.transfers)
+
+            self.get_more_storage = self.context_menu.addAction(
+                GET_MORE_STORAGE)
+            self.get_help_online = self.context_menu.addAction(GET_HELP_ONLINE)
+            self.quit = self.context_menu.addAction("Quit")
+
+            self.setContextMenu(self.context_menu)
+
+            # Connect Signals
+            self.status_action.triggered.connect(self.change_status)
+            self.open_u1.triggered.connect(self.restore_window)
+            self.open_u1_folder.triggered.connect(self.open_u1_folder_action)
+            self.get_more_storage.triggered.connect(
+                self.get_more_storage_action)
+            self.go_to_web.triggered.connect(self.go_to_web_action)
+            self.get_help_online.triggered.connect(self.get_help_action)
+            self.quit.triggered.connect(self.stop)
+
+            self._get_volumes_info()
 
     @inlineCallbacks
     def refresh_status(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-08-16 13:35:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-08-20 18:55:44 +0000
@@ -175,6 +175,10 @@
         data[UPLOADING] = []
         return data
 
+    def get_shares(self):
+        """Fake get_shares."""
+        return []
+
 
 class CrashyBackendException(Exception):
     """A faked backend crash."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-08-20 12:52:34 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-08-20 18:55:44 +0000
@@ -80,6 +80,9 @@
 
     @inlineCallbacks
     def setUp(self):
+        # We need to patch the startTimer first, to avoid the timer
+        # to get started on initialization.
+        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
         self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         yield super(SystrayTestCase, self).setUp()
         self.patch(QtGui, "QDesktopServices", FakeDesktopService)
@@ -339,12 +342,15 @@
 
 class TransfersMenuTestCase(BaseTestCase):
 
-    """Test the notification area icon."""
+    """Test the info to be display in the transfers menu."""
 
     class_ui = systray.TrayIcon
 
     @inlineCallbacks
     def setUp(self):
+        # We need to patch the startTimer first, to avoid the timer
+        # to get started on initialization.
+        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
         self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         yield super(TransfersMenuTestCase, self).setUp()
         self.patch(QtGui, "QDesktopServices", FakeDesktopService)
@@ -537,3 +543,57 @@
         current_actions = self.ui.transfers.actions()
 
         self.assertNotEqual(previous_actions, current_actions)
+
+
+class SharesTestCase(BaseTestCase):
+
+    """Test the info to be displayed in the shares section."""
+
+    class_ui = systray.TrayIcon
+
+    @inlineCallbacks
+    def setUp(self):
+        # We need to patch the startTimer first, to avoid the timer
+        # to get started on initialization.
+        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
+        yield super(SharesTestCase, self).setUp()
+        self.patch(QtGui, "QDesktopServices", FakeDesktopService)
+        self.patch(self.ui.backend, "get_shares", self.fake_get_backend)
+        self._shares_info = []
+
+    def fake_get_backend(self):
+        """Fake get_backend."""
+        return self._shares_info
+
+    def test_shares_refresh_not_reload(self):
+        """Check that we get the new info of shares but not reload the menu."""
+        actions = self.ui.context_menu.actions()
+        self.ui.load_menu()
+        post_actions = self.ui.context_menu.actions()
+        self.assertEqual(actions, post_actions)
+
+    def test_shares_refresh_reload(self):
+        """Check that we get the new info of shares but not reload the menu."""
+        actions = self.ui.context_menu.actions()
+        self._shares_info = [
+            {'accepted': False, 'other_visible_name': 'name',
+            'volume_id': 'asd123-asd123-asd123-asd123'}
+        ]
+        self.ui.load_menu()
+        post_actions = self.ui.context_menu.actions()
+        self.assertNotEqual(actions, post_actions)
+
+    def test_share_triggered(self):
+        """Check that we get the new info of shares but not reload the menu."""
+        volume_id = 'asd123-asd123-asd123-asd123'
+        self._shares_info = [
+            {'accepted': False, 'other_visible_name': 'name',
+            'volume_id': volume_id}
+        ]
+        self.ui.load_menu()
+        actions = self.ui.context_menu.actions()
+        share_action = actions[7]
+        share_action.trigger()
+        expected = QtCore.QUrl(systray.ACCEPT_SHARES % volume_id)
+        self.assertEqual(FakeDesktopService.data['url'], expected)