Merge lp:~chipaca/ubuntuone-client/some-account-tab-fixes into lp:ubuntuone-client

[John Lenton]

This adds the overquota notices and warnings, as well as a couple of ui elements that we missed. Fixes #540360.

This adds the overquota notices and warnings, as well as a couple of ui elements that we missed. Fixes #540360.

[lp:~chipaca/ubuntuone-client/some-account-tab-fixes]

457. By John Lenton on 2010-03-29

merged with trunk r451

458. By John Lenton on 2010-03-29

merged with trunk r452

[Facundo Batista (facundo)]

tests.test_preferences
  PreferencesTests
    test_bw_throttling ... [OK]
    test_list_devices_fills_devices_list_with_fake_result_when_empty ... [OK]
    test_list_devices_shows_devices_list ... [OK]
    test_list_devices_shows_real_devices_list ... [OK]
    test_login_check ... [OK]
    test_no_overquota_notice_on_low_usage ... Traceback (most recent call last):
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/contrib/mocker.py", line 102, in test_method_wrapper
    result = test_method()
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/tests/test_preferences.py", line 232, in test_no_overquota_notice_on_low_usage
    dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 474, in __init__
    self.__construct()
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 759, in __construct
    self.update_quota_display(0, 2)
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 566, in update_quota_display
    self.plan_label.set_label(_("Payed") if is_payed_account else _("Free"))
exceptions.AttributeError: 'UbuntuOneDialog' object has no attribute 'plan_label'
[ERROR]
Traceback (most recent call last):
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 521, in __got_state
    self.status_label.set_text(_("Synchronization complete"))
exceptions.AttributeError: 'UbuntuOneDialog' object has no attribute 'status_label'
[ERROR]
    test_overquota_notice_and_not_upgrade_offer_on_payed_high_usage ... Traceback (most recent call last):
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/contrib/mocker.py", line 102, in test_method_wrapper
    result = test_method()
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/tests/test_preferences.py", line 268, in test_overquota_notice_and_not_upgrade_offer_on_payed_high_usage
    dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 474, in __init__
    self.__construct()
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 759, in __construct
    self.update_quota_display(0, 2)
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 566, in update_quota_display
    self.plan_label.set_label(_("Payed") if is_payed_account else _("Free"))
exceptions.AttributeError: 'UbuntuOneDialog' object has no attribute 'plan_label'
[ERROR]
Traceback (most recent call last):
  File "/home/facundo/canonical/u1-client/review_some-account-tab-fixes/bin/ubuntuone-preferences", line 521, in __got_state
    self.status_label.set_text(_("Synchronization complete"))
exceptions.AttributeError: 'UbuntuOneDialog' object has no a...

review: Needs Fixing

[lp:~chipaca/ubuntuone-client/some-account-tab-fixes]

459. By John Lenton on 2010-03-29

oops, bad merge

460. By John Lenton on 2010-03-29

fixes as per mattgriffin

[Facundo Batista (facundo)]

It's ok now.

review: Approve

[Stuart Langridge (sil)]

"Payed" should be "Paid" in all locations, I think.

review: Needs Fixing

[lp:~chipaca/ubuntuone-client/some-account-tab-fixes]

461. By John Lenton on 2010-03-29

"payed" is not, apparently, English

[Stuart Langridge (sil)]

rock.

review: Approve

[Matt Griffin (mattgriffin)]

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-03-29 21:54:19 +0000
+++ bin/ubuntuone-preferences	2010-03-29 21:59:26 +0000
@@ -462,6 +462,17 @@
         self.__bus = dbus.SessionBus()
         self.keyring = keyring
 
+        # Timeout ID to avoid spamming DBus from spinbutton changes
+        self.__update_id = 0
+
+        # SD Tool object
+        self.sdtool = SyncDaemonTool(self.__bus)
+        self.sdtool.get_status().addCallbacks(self.__got_state,
+                                              self.__sd_error)
+        # Build the dialog
+        self.__construct()
+
+        # hook dbus up
         self.__bus.add_signal_receiver(
             handler_function=self.__got_state,
             signal_name='StatusChanged',
@@ -480,16 +491,6 @@
         except DBusException, e:
             self.__dbus_error(e)
 
-        # Timeout ID to avoid spamming DBus from spinbutton changes
-        self.__update_id = 0
-
-        # Build the dialog
-        self.__construct()
-
-        # SD Tool object
-        self.sdtool = SyncDaemonTool(self.__bus)
-        self.sdtool.get_status().addCallbacks(self.__got_state,
-                                              self.__sd_error)
         logger.debug("starting")
 
     def quit(self):
@@ -559,6 +560,42 @@
                 'percent' : percent })
         self.usage_graph.set_fraction(percent / 100)
 
+        # assumes all paid accounts will have more than 50GB
+        is_paid_account = total >= 50<<30
+        self.plan_label.set_label(_("Paid") if is_paid_account else _("Free"))
+        if is_paid_account:
+            self.upgrade_link.hide()
+
+        if percent >= 100.:
+            self.overquota_img.set_from_icon_name('dialog-warning',
+                                                  gtk.ICON_SIZE_DIALOG)
+            self.overquota.show_all()
+            label = _("You are using all of your Ubuntu One storage.")
+            if is_paid_account:
+                desc = _("Synchronization is now disabled. Remove files from"
+                         " synchronization or upgrade your subscription. Use"
+                         " the Support options if an upgrade is not available.")
+            else:
+                desc = _("Synchronization is now disabled. Remove files from"
+                         " synchronization or upgrade your subscription.")
+        elif percent >= 95.:
+            self.overquota_img.set_from_icon_name('dialog-information',
+                                                  gtk.ICON_SIZE_DIALOG)
+            self.overquota.show_all()
+            label = _("You are near your Ubuntu One storage limit.")
+            if is_paid_account:
+                desc = _("Automatic synchronization will stop when you reach"
+                         " your storage limit.")
+            else:
+                desc = _("Automatic synchronization will stop when you reach"
+                         " your storage limit. Please consider upgrading to"
+                         " avoid a service interruption.")
+        else:
+            self.overquota_img.clear()
+            label = desc = ""
+            self.overquota.hide_all()
+        self.overquota_label.set_markup("%s\n<small>%s</small>" % (label, desc))
+
     def got_quota_info(self, quota):
         """Handle the result from the quota REST call."""
         if quota:
@@ -717,8 +754,6 @@
         hbox.pack_start(self.usage_label, True, True)
         self.usage_label.show()
 
-        self.update_quota_display(0, 2)
-
         self.status_label = gtk.Label("")
         self.status_label.set_alignment(0.0, 0.5)
         rbox.pack_start(self.status_label, False, False)
@@ -736,8 +771,25 @@
         self.notebook.set_tab_label_text(account, _("Account"))
         account.show()
 
+        # overquota notice in account tab
+        self.overquota = gtk.HBox(spacing=6)
+        self.overquota.set_border_width(6)
+        account.pack_start(self.overquota, False, False)
+        self.overquota.show()
+
+        self.overquota_img = gtk.Image()
+        self.overquota.pack_start(self.overquota_img, False, False)
+        self.overquota_img.show()
+
+        self.overquota_label = label = gtk.Label("\n\n")
+        label.set_line_wrap(True)
+        label.set_alignment(0.0, 0.5)
+        self.overquota.pack_start(label, False, False)
+        label.show()
+
+
         # User info in account tab
-        table = gtk.Table(rows=2, columns=2)
+        table = gtk.Table(rows=6, columns=2)
         table.set_row_spacings(6)
         table.set_col_spacings(6)
         account.pack_start(table, False, False)
@@ -767,6 +819,29 @@
         table.attach(self.mail_label, 1, 2, 1, 2)
         self.mail_label.show()
 
+        label = gtk.Label(_("Current plan:"))
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, 2, 3)
+        label.show()
+
+        self.plan_label = gtk.Label("")
+        self.plan_label.set_alignment(0.0, 0.5)
+        table.attach(self.plan_label, 1, 2, 2, 3)
+        self.plan_label.show()
+
+        for n, (url, label) in enumerate([
+                ("http://one.ubuntu.com/support", _("Support options")),
+                ("http://one.ubuntu.com/account", _("Manage account")),
+                ("http://one.ubuntu.com/upgrade",
+                 _("Upgrade your subscription")),
+            ]):
+            link = gtk.LinkButton(url, label)
+            link.set_relief(gtk.RELIEF_NONE)
+            link.set_alignment(0.0, 0.5)
+            table.attach(link, 0, 2, 5-n, 6-n)
+            link.show()
+        self.upgrade_link = link
+
         # Devices tab
         sw = gtk.ScrolledWindow()
         sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
@@ -832,6 +907,8 @@
         alignment.add(self.music_check)
         self.music_check.show()
 
+        # get the quota
+        self.update_quota_display(0, 2)
 
 class UbuntuoneLoginHandler(object):
     """Class to handle registration/login, in case we aren't already."""

=== modified file 'tests/test_preferences.py'
--- tests/test_preferences.py	2010-03-25 18:30:27 +0000
+++ tests/test_preferences.py	2010-03-29 21:59:26 +0000
@@ -225,6 +225,95 @@
         self.assertEqual(dialog.usage_graph.get_fraction(), 0.5)
         dialog.destroy()
 
+    def test_no_overquota_notice_on_low_usage(self):
+        """Test that the quota notice is not visible if usage is low."""
+        self.content = {"total":2048, "used":1024}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # the label should just be the blank '\n'
+        self.assertEqual(dialog.overquota_label.get_text(), '\n')
+        # and the icon should be blank, too
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0], None)
+        dialog.destroy()
+
+    def test_overquota_notice_and_upgrade_offer_on_free_high_usage(self):
+        """Test that the quota notice is visible if usage is 95%.
+
+        Also make sure the label mentions upgrading.
+        """
+        self.content = {"total": 100, "used": 95}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that we mention upgrading
+        self.assertTrue('upgrad' in dialog.overquota_label.get_text().lower())
+        # and check that the icon used is just informational
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-information')
+        dialog.destroy()
+
+    def test_overquota_notice_and_not_upgrade_offer_on_paid_high_usage(self):
+        """Test that the quota notice is visible if usage is 95%.
+
+        Also make sure the label does not mention upgrading.
+        """
+        self.content = {"total": 50<<30, "used": 49<<30}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that we mention upgrading
+        self.assertTrue('upgrad' not in
+                        dialog.overquota_label.get_text().lower())
+        # and check that the icon used is just informational
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-information')
+        dialog.destroy()
+
+    def test_overquota_warning_and_upgrade_offer_there_on_free_over_quota(self):
+        """Test that the quota notice is visible if usage is 100%.
+
+        Also make sure the label mentions upgrading.
+        """
+        self.content = {"total": 100, "used": 100}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that we mention upgrading
+        self.assertTrue('upgrad' in dialog.overquota_label.get_text().lower())
+        # and check that the icon used is a warning
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-warning')
+        dialog.destroy()
+
+    def test_overquota_warning_there_on_paid_over_quota(self):
+        """Test that the quota notice is visible if usage is 100%."""
+        self.content = {"total": 50<<30, "used": 50<<30}
+        self.mocker.replay()
+        dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
+        self.assertTrue(dialog is not None)
+        dialog.request_quota_info()
+        # don't check the exact text, as it will probably
+        # change. Check we're setting some amount of text,
+        self.assertTrue(len(dialog.overquota_label.get_text()) > 100)
+        # and check that the icon used is a warning
+        self.assertEqual(dialog.overquota_img.get_icon_name()[0],
+                         'dialog-warning')
+        dialog.destroy()
+
     def test_request_account_info(self):
         """Test that we can request the account info properly."""
         self.content = {"username": "ubuntuone", "nickname": "Ubuntu One",
@@ -233,8 +322,19 @@
         dialog = self.u1prefs.UbuntuOneDialog(keyring=self.keyring)
         self.assertTrue(dialog is not None)
         dialog.request_account_info()
+        self.content = {"total":2048, "used":1024}
+        dialog.request_quota_info()
         self.assertEqual(dialog.name_label.get_text(), 'Ubuntu One')
         self.assertEqual(dialog.mail_label.get_text(), '[e-mail]')
+        # ensure the plan label says "Free" and the upgrade button is there
+        self.assertEqual(dialog.plan_label.get_text(), 'Free')
+        self.assertTrue(dialog.upgrade_link.get_visible())
+        # whoops, the user upgraded
+        self.content = {"total": 50<<30, "used":1024}
+        dialog.request_quota_info()
+        # ensure the plan label says "Paid" and the upgrade button is not there
+        self.assertEqual(dialog.plan_label.get_text(), 'Paid')
+        self.assertFalse(dialog.upgrade_link.get_visible())
         dialog.destroy()
 
     def test_toggle_bookmarks(self):