Merge lp:~diegosarmentero/ubuntuone-client/ubuntuone-client-syncc into lp:ubuntuone-client

[Diego Sarmentero]

- Adding SyncMenu to u1-client (LP: #1042343).

[Diego Sarmentero (diegosarmentero)]

You can test this branch in Q like this:

sudo apt-get build-dep indicator-sync
bzr branch lp:indicator-sync
cd indicator-sync
./autogen.sh; make

check out the README file inside the example folder, and follow those instructions, but instead executing the C example, run u1-client from this branch.

[Diego Sarmentero (diegosarmentero)]

It's necessary also to install:
sudo apt-get install gir1.2-syncmenu-0.1

[Diego Sarmentero (diegosarmentero)]

Some Screenshots:
http://ubuntuone.com/5EYSnfLwzLAqgHKfHh8Wsk
http://ubuntuone.com/3qhKohLn2n1MOeu1ReXwaE
http://ubuntuone.com/4f1MSB2gFJlj2BQW2UKdy6
http://ubuntuone.com/6r5Owdg7KDeL4gLDmjDR0a

[Roberto Alsina (ralsina)]

Looks good to me. Could not run it because Q is not cooperating today.

review: Approve

[Alejandro J. Cura (alecu)]

The code on this branch looks fine, but testing this branch IRL shows a very noticeable regression:
Syndaemon running from trunk uses 0% cpu while idle. This branch uses 1% cpu on my machine (+1% cpu for the sync indicator processes), due to the constant updating of the menu.

I think we should both reduce the time between updates for this branch, and create a new bug, and try to come up with a less resource intensive approach, like having the status aggregator code calling some callback in this module whenever there's transfer progress (and even so, no more often than every two or three seconds).

---

Small issue: all occurrences similar to:

213 + def fake_open(url):
214 + data.append(url)
215 +
216 + self.patch(linux.webbrowser, "open", fake_open)

Can be replaced with just this line:

213 + self.patch(linux.webbrowser, "open", data.append)

review: Needs Information

[Alejandro J. Cura (alecu)]

After discussing on IRC, we decided to land this branch as is and work on a fix for the cpu issue in a different branch.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-client/ubuntuone-client-syncc 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.69
checking for automake >= 1.10...
  testing automake-1.12... not found.
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
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... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking how to create a ustar tar archive... gnutar
checking whether make supports nested variables... 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... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking how to print strings... printf
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 whe...

[lp:~diegosarmentero/ubuntuone-client/ubuntuone-client-syncc]

1360. By Diego Sarmentero on 2012-09-19

Making the syncmenu integration not be required on linux

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-08-16 13:44:20 +0000
+++ po/POTFILES.in	2012-09-19 17:25:32 +0000
@@ -1,6 +1,7 @@
 ubuntuone/clientdefs.py.in
 ubuntuone/status/aggregator.py
 ubuntuone/platform/credentials/__init__.py
+ubuntuone/platform/sync_menu/linux.py
 data/emblem-ubuntuone-downloading.icon.in
 data/emblem-ubuntuone-unsynchronized.icon.in
 data/emblem-ubuntuone-uploading.icon.in

=== added directory 'tests/platform/sync_menu'
=== added file 'tests/platform/sync_menu/__init__.py'
--- tests/platform/sync_menu/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/platform/sync_menu/__init__.py	2012-09-19 17:25:32 +0000
@@ -0,0 +1,27 @@
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""SyncMenu test code."""

=== added file 'tests/platform/sync_menu/test_linux.py'
--- tests/platform/sync_menu/test_linux.py	1970-01-01 00:00:00 +0000
+++ tests/platform/sync_menu/test_linux.py	2012-09-19 17:25:32 +0000
@@ -0,0 +1,316 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Test the Sync Menu."""
+
+from twisted.internet import defer
+from twisted.trial.unittest import TestCase
+
+from ubuntuone.platform import sync_menu
+from ubuntuone.platform.sync_menu import linux
+
+
+def fake_call_later(*args):
+    """Fake reactor.callLater."""
+
+
+class FakeStatusFrontend(object):
+    """Fake StatusFrontend."""
+
+    def __init__(self):
+        self.recent_transfers_data = []
+        self.uploading_data = []
+
+    def recent_transfers(self):
+        """Return the fake recent transfers files."""
+        return self.recent_transfers_data
+
+    def files_uploading(self):
+        """Return the fake files being upload."""
+        return self.uploading_data
+
+
+class FakeStatusListener(object):
+    """Fake StatusListener."""
+
+    def __init__(self):
+        self.status_frontend = FakeStatusFrontend()
+
+
+class FakeMain(object):
+    """Fake Main."""
+
+    def __init__(self):
+        self.status_listener = FakeStatusListener()
+
+
+class FakeSyncMenuApp(object):
+    """Fake SyncMenu."""
+
+    data = {}
+
+    @classmethod
+    def new(cls, *args):
+        return FakeSyncMenuApp()
+
+    @classmethod
+    def clean(cls):
+        """Clear the values stored in data."""
+
+    def set_menu(self, server):
+        """Set the menu for SyncMenu App."""
+        self.data['server'] = server
+
+    def connect(self, signal, callback):
+        """Fake connect."""
+        self.data['connect'] = (signal, callback)
+
+
+class SyncMenuTestCase(TestCase):
+    """Test the SyncMenu."""
+
+    skip = None if linux.use_syncmenu else "SyncMenu not installed."
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SyncMenuTestCase, self).setUp()
+        self.patch(linux.SyncMenu, "App", FakeSyncMenuApp)
+        FakeSyncMenuApp.clean()
+        self.main = FakeMain()
+        self.status_frontend = self.main.status_listener.status_frontend
+        self._paused = False
+        self.patch(sync_menu.UbuntuOneSyncMenu, "change_sync_status",
+            self._change_sync_status)
+        self.sync_menu = sync_menu.UbuntuOneSyncMenu(self.main)
+
+    def _change_sync_status(self, *args):
+        """Fake change_sync_status."""
+        if self._paused:
+            self._paused = False
+        else:
+            self._paused = True
+
+    def test_init(self):
+        """Check that the menu is properly initialized."""
+        self.assertIsInstance(FakeSyncMenuApp.data['server'],
+            linux.Dbusmenu.Server)
+        self.assertEqual(self.sync_menu.open_u1.get_parent(),
+            self.sync_menu.root_menu)
+        self.assertEqual(self.sync_menu.go_to_web.get_parent(),
+            self.sync_menu.root_menu)
+        self.assertEqual(self.sync_menu.more_storage.get_parent(),
+            self.sync_menu.root_menu)
+        self.assertEqual(self.sync_menu.get_help.get_parent(),
+            self.sync_menu.root_menu)
+        self.assertEqual(self.sync_menu.transfers.get_parent(),
+            self.sync_menu.root_menu)
+
+        self.assertEqual(self.sync_menu.open_u1.property_get(
+            linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.OPEN_U1)
+        self.assertEqual(self.sync_menu.go_to_web.property_get(
+            linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.GO_TO_WEB)
+        self.assertEqual(self.sync_menu.transfers.property_get(
+            linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.TRANSFERS)
+        self.assertEqual(self.sync_menu.more_storage.property_get(
+            linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.MORE_STORAGE)
+        self.assertEqual(self.sync_menu.get_help.property_get(
+            linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.GET_HELP)
+
+        self.assertEqual(self.sync_menu.app.data['connect'],
+            ("notify::paused", self.sync_menu.change_sync_status))
+        self.sync_menu.app.data['connect'][1]()
+        self.assertTrue(self._paused)
+        self.sync_menu.app.data['connect'][1]()
+        self.assertFalse(self._paused)
+
+    def test_open_u1(self):
+        """Check that the proper action is executed."""
+        data = []
+
+        self.patch(linux.glib, "spawn_command_line_async", data.append)
+        self.sync_menu.open_control_panel()
+        self.assertEqual(data, ['ubuntuone-installer'])
+
+    def test_go_to_web(self):
+        """Check that the proper action is executed."""
+        data = []
+
+        self.patch(linux.webbrowser, "open", data.append)
+        self.sync_menu.open_go_to_web()
+        self.assertEqual(data, [linux.DASHBOARD])
+
+    def test_get_help(self):
+        """Check that the proper action is executed."""
+        data = []
+
+        self.patch(linux.webbrowser, "open", data.append)
+        self.sync_menu.open_web_help()
+        self.assertEqual(data, [linux.HELP_LINK])
+
+    def test_more_storage(self):
+        """Check that the proper action is executed."""
+        data = []
+
+        self.patch(linux.webbrowser, "open", data.append)
+        self.sync_menu.open_get_more_storage()
+        self.assertEqual(data, [linux.GET_STORAGE_LINK])
+
+    def test_empty_transfers(self):
+        """Check that the Transfers menu is empty."""
+        self.assertEqual(self.sync_menu.transfers.get_children(), [])
+
+    def test_only_recent(self):
+        """Check that only recent transfers items are loaded."""
+        data = ['file1', 'file2', 'file3']
+        self.status_frontend.recent_transfers_data = data
+        self.sync_menu.transfers.update_progress()
+        children = self.sync_menu.transfers.get_children()
+        self.assertEqual(len(children), 3)
+        data.reverse()
+        for itemM, itemD in zip(children, data):
+            self.assertEqual(itemM.property_get(
+                linux.Dbusmenu.MENUITEM_PROP_LABEL), itemD)
+
+    def test_only_progress(self):
+        """Check that only progress items are loaded."""
+        data = [
+            ('file1', 3000, 400),
+            ('file2', 2000, 100),
+            ('file3', 5000, 4600)]
+        uploading_data = {}
+        for filename, size, written in data:
+            uploading_data[filename] = (size, written)
+        self.status_frontend.uploading_data = data
+        self.sync_menu.transfers.update_progress()
+        children = self.sync_menu.transfers.get_children()
+        self.assertEqual(len(children), 3)
+        data.reverse()
+        for item in children:
+            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
+            self.assertIn(text, uploading_data)
+            size, written = uploading_data[text]
+            percentage = written * 100 / size
+            self.assertEqual(item.property_get_int(
+                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
+                percentage)
+
+    def test_full_transfers(self):
+        """Check that the transfers menu contains the maximum transfers."""
+        # The api of recent transfers always returns a maximum of 5 items
+        data_recent = ['file1', 'file2', 'file3', 'file4', 'file5']
+        self.status_frontend.recent_transfers_data = \
+            data_recent
+        self.sync_menu.transfers.update_progress()
+        children = self.sync_menu.transfers.get_children()
+        self.assertEqual(len(children), 5)
+        data_recent.reverse()
+        for itemM, itemD in zip(children, data_recent):
+            self.assertEqual(itemM.property_get(
+                linux.Dbusmenu.MENUITEM_PROP_LABEL), itemD)
+
+        data_current = [
+            ('file0', 1200, 600),
+            ('file1', 3000, 400),
+            ('file2', 2000, 100),
+            ('file3', 2500, 150),
+            ('file4', 1000, 600),
+            ('file5', 5000, 4600)]
+        uploading_data = {}
+        for filename, size, written in data_current:
+            uploading_data[filename] = (size, written)
+        self.status_frontend.uploading_data = data_current
+        self.sync_menu.transfers.update_progress()
+        children = self.sync_menu.transfers.get_children()
+        # The menu should only show 5 current transfers.
+        self.assertEqual(len(children), 10)
+        data_current.reverse()
+        for item in children[5:]:
+            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
+            self.assertIn(text, uploading_data)
+            size, written = uploading_data[text]
+            percentage = written * 100 / size
+            self.assertEqual(item.property_get_int(
+                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
+                percentage)
+
+    def test_update_transfers(self):
+        """Check that everything is ok when updating the transfers value."""
+        data_current = [
+            ('file0', 1200, 600),
+            ('file1', 3000, 400),
+            ('file4', 1000, 600),
+            ('file5', 5000, 4600)]
+        uploading_data = {}
+        for filename, size, written in data_current:
+            uploading_data[filename] = (size, written)
+        self.status_frontend.uploading_data = data_current
+        self.sync_menu.transfers.update_progress()
+        children = self.sync_menu.transfers.get_children()
+        # The menu should only show 5 current transfers.
+        self.assertEqual(len(children), 4)
+        data_current.reverse()
+        for item in children:
+            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
+            self.assertIn(text, uploading_data)
+            size, written = uploading_data[text]
+            percentage = written * 100 / size
+            self.assertEqual(item.property_get_int(
+                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
+                percentage)
+
+        data_recent = ['file5']
+        self.status_frontend.recent_transfers_data = data_recent
+        self.sync_menu.transfers.update_progress()
+        children = self.sync_menu.transfers.get_children()
+        self.assertEqual(len(children), 5)
+        data_recent.reverse()
+        for itemM, itemD in zip(children, data_recent):
+            self.assertEqual(itemM.property_get(
+                linux.Dbusmenu.MENUITEM_PROP_LABEL), itemD)
+
+        data_current = [
+            ('file0', 1200, 700),
+            ('file1', 3000, 600),
+            ('file4', 1000, 800)]
+        uploading_data = {}
+        for filename, size, written in data_current:
+            uploading_data[filename] = (size, written)
+        self.status_frontend.uploading_data = data_current
+        self.sync_menu.transfers.update_progress()
+        children = self.sync_menu.transfers.get_children()
+        # The menu should only show 5 current transfers.
+        self.assertEqual(len(children), 4)
+        data_current.reverse()
+        for item in children[5:]:
+            text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
+            self.assertIn(text, uploading_data)
+            size, written = uploading_data[text]
+            percentage = written * 100 / size
+            self.assertEqual(item.property_get_int(
+                linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE),
+                percentage)

=== modified file 'tests/syncdaemon/test_main.py'
--- tests/syncdaemon/test_main.py	2012-06-21 18:58:50 +0000
+++ tests/syncdaemon/test_main.py	2012-09-19 17:25:32 +0000
@@ -70,6 +70,19 @@
         return defer.succeed(None)
 
 
+class FakedSyncMenu(object):
+    """Do nothing."""
+
+    def __init__(self, *args, **kwargs):
+        self.arguments = (args, kwargs)
+
+    def update_progress(self):
+        """Do nothing."""
+
+    def start_timer(self):
+        """Do nothing."""
+
+
 class MainTests(BaseTwistedTestCase):
     """ Basic tests to check main.Main """
 
@@ -87,6 +100,7 @@
         self.patch(main_mod.event_logging, "get_listener", lambda *a: None)
         # no status listener by default
         self.patch(main_mod.status_listener, "get_listener", lambda *a: None)
+        self.patch(main_mod.sync_menu, "UbuntuOneSyncMenu", FakedSyncMenu)
 
         self.handler = MementoHandler()
         self.handler.setLevel(logging.DEBUG)

=== added directory 'ubuntuone/platform/sync_menu'
=== added file 'ubuntuone/platform/sync_menu/__init__.py'
--- ubuntuone/platform/sync_menu/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/sync_menu/__init__.py	2012-09-19 17:25:32 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Use SyncMenu lib to integrate U1 with the Systray Sync Icon."""
+
+import sys
+
+
+if sys.platform in ("win32", "darwin"):
+    from ubuntuone.platform.sync_menu import common
+    source = common
+else:
+    from ubuntuone.platform.sync_menu import linux
+    source = linux
+
+UbuntuOneSyncMenu = source.UbuntuOneSyncMenu

=== added file 'ubuntuone/platform/sync_menu/common.py'
--- ubuntuone/platform/sync_menu/common.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/sync_menu/common.py	2012-09-19 17:25:32 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Use SyncMenu lib to integrate U1 with the Systray Sync Icon."""
+
+
+class UbuntuOneSyncMenu(object):
+    """Integrate U1 with the Ubuntu Sync Menu."""
+
+    def __init__(self, *args):
+        self.transfers = DummyTransfersMenu()
+
+
+class DummyTransfersMenu(object):
+    """Dummy Transfers Menu."""
+
+    def start_timer(self):
+        """Empty start timer, this is not needed on windows."""

=== added file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2012-09-19 17:25:32 +0000
@@ -0,0 +1,230 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Use SyncMenu lib to integrate U1 with the Systray Sync Icon."""
+
+import gettext
+import sys
+import webbrowser
+
+glib = None
+try:
+    if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
+        import glib as GLib
+        glib = GLib
+    else:
+        from gi.repository import GLib
+        glib = GLib
+except ImportError:
+    pass
+try:
+    from gi.repository import (
+        Dbusmenu,
+        SyncMenu,
+    )
+    use_syncmenu = True
+except:
+    use_syncmenu = False
+from twisted.internet import reactor
+
+from ubuntuone.clientdefs import GETTEXT_PACKAGE
+
+
+Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
+
+OPEN_U1 = Q_("Open Ubuntu One")
+GO_TO_WEB = Q_("Go to the Ubuntu One Website")
+TRANSFERS = Q_("Current and Recent Transfers")
+MORE_STORAGE = Q_("Get More Space")
+GET_HELP = Q_("Get Help on the Web")
+
+UBUNTUONE_LINK = u'https://one.ubuntu.com/'
+DASHBOARD = UBUNTUONE_LINK + u'dashboard/'
+HELP_LINK = UBUNTUONE_LINK + u'support/'
+GET_STORAGE_LINK = UBUNTUONE_LINK + u'services/#storage_panel'
+
+
+class UbuntuOneSyncMenuLinux(object):
+    """Integrate U1 with the Ubuntu Sync Menu."""
+
+    def __init__(self, main):
+        """Initialize menu."""
+        self._main = main
+        self.status_listener = main.status_listener
+        self._paused = False
+        self.root_menu = Dbusmenu.Menuitem()
+
+        self.open_u1 = Dbusmenu.Menuitem()
+        self.open_u1.property_set(Dbusmenu.MENUITEM_PROP_LABEL, OPEN_U1)
+
+        self.go_to_web = Dbusmenu.Menuitem()
+        self.go_to_web.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+            GO_TO_WEB)
+
+        self.transfers = TransfersMenu(self.status_listener)
+        self.transfers.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+            TRANSFERS)
+
+        self.more_storage = Dbusmenu.Menuitem()
+        self.more_storage.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+            MORE_STORAGE)
+
+        self.get_help = Dbusmenu.Menuitem()
+        self.get_help.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+            GET_HELP)
+
+        # Connect signals
+        self.open_u1.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
+            self.open_control_panel)
+        self.go_to_web.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
+            self.open_go_to_web)
+        self.get_help.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
+            self.open_web_help)
+        self.more_storage.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
+            self.open_get_more_storage)
+
+        # Add items
+        self.root_menu.child_append(self.open_u1)
+        self.root_menu.child_append(self.go_to_web)
+        self.root_menu.child_append(self.transfers)
+        self.root_menu.child_append(self.more_storage)
+        self.root_menu.child_append(self.get_help)
+
+        self.server = Dbusmenu.Server()
+        self.server.set_root(self.root_menu)
+        self.app = SyncMenu.App.new("ubuntuone-installer.desktop")
+        self.app.set_menu(self.server)
+        self.app.connect("notify::paused", self.change_sync_status)
+
+    def start_timer(self):
+        """Start the transfers timer."""
+        self.transfers.start_timer()
+
+    def change_sync_status(self, *args):
+        """Triggered when the sync status is changed fromm the menu."""
+        if self._paused:
+            self._main.external.connect()
+            self._paused = False
+        else:
+            self._main.external.disconnect()
+            self._paused = True
+
+    def open_control_panel(self, *args):
+        """Open the Ubuntu One Control Panel."""
+        glib.spawn_command_line_async('ubuntuone-installer')
+
+    def open_go_to_web(self, *args):
+        """Open the Ubunto One Help Page"""
+        webbrowser.open(DASHBOARD)
+
+    def open_web_help(self, *args):
+        """Open the Ubunto One Help Page"""
+        webbrowser.open(HELP_LINK)
+
+    def open_get_more_storage(self, *args):
+        """Open the Ubunto One Help Page"""
+        webbrowser.open(GET_STORAGE_LINK)
+
+
+class TransfersMenu(Dbusmenu.Menuitem):
+    """Menu that handles the recent and current transfers."""
+
+    def __init__(self, listener):
+        super(TransfersMenu, self).__init__()
+        self.listener = listener
+        self.uploading = {}
+        self.previous_transfers = []
+        self._transfers_items = {}
+        self._uploading_items = {}
+
+    def start_timer(self):
+        """Trigger an update in one second."""
+        self.update_progress()
+        reactor.callLater(3, self.start_timer)
+
+    def update_progress(self):
+        """Update the list of recent transfers and current transfers."""
+        current_transfers = self.listener.status_frontend.recent_transfers()
+        uploading_data = {}
+        for filename, size, written in \
+            self.listener.status_frontend.files_uploading():
+            uploading_data[filename] = (size, written)
+
+        temp_transfers = {}
+        if current_transfers != self.previous_transfers:
+            for item_transfer in self._transfers_items:
+                self.child_delete(self._transfers_items[item_transfer])
+            for item in current_transfers:
+                recent_file = Dbusmenu.Menuitem()
+                recent_file.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+                    item)
+                self.child_add_position(recent_file, 0)
+                temp_transfers[item] = recent_file
+            self._transfers_items = temp_transfers
+
+        items_added = 0
+        remove = []
+        for item in self._uploading_items:
+            if item in uploading_data:
+                size, written = uploading_data[item]
+                percentage = written * 100 / size
+                upload_item = self._uploading_items[item]
+                upload_item.property_set_int(
+                    SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE,
+                    percentage)
+                items_added += 1
+            else:
+                self.child_delete(self._uploading_items[item])
+                remove.append(item)
+        for item in remove:
+            self._uploading_items.pop(item)
+        if items_added < 5:
+            for item in uploading_data:
+                if item not in self._uploading_items and items_added < 5:
+                    size, written = uploading_data[item]
+                    percentage = written * 100 / size
+                    uploading_file = Dbusmenu.Menuitem()
+                    uploading_file.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+                        item)
+                    uploading_file.property_set(Dbusmenu.MENUITEM_PROP_TYPE,
+                        SyncMenu.PROGRESS_MENUITEM_TYPE)
+                    uploading_file.property_set_int(
+                        SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE,
+                        percentage)
+                    self.child_append(uploading_file)
+                    self._uploading_items[item] = uploading_file
+                    items_added += 1
+
+
+class DummySyncMenu(object):
+
+    def start_timer(self):
+        """Do nothing."""
+
+
+UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2012-07-12 16:04:44 +0000
+++ ubuntuone/syncdaemon/main.py	2012-09-19 17:25:32 +0000
@@ -48,7 +48,10 @@
     volume_manager,
 )
 from ubuntuone import syncdaemon, clientdefs
-from ubuntuone.platform import event_logging
+from ubuntuone.platform import (
+    event_logging,
+    sync_menu,
+)
 from ubuntuone.syncdaemon import status_listener
 from ubuntuone.syncdaemon.interaction_interfaces import SyncdaemonService
 from ubuntuone.syncdaemon.states import StateManager, QueueManager
@@ -90,7 +93,8 @@
                  handshake_timeout=30,
                  shares_symlink_name='Shared With Me',
                  read_limit=None, write_limit=None, throttling_enabled=False,
-                 ignore_files=None, oauth_credentials=None, monitor_class=None):
+                 ignore_files=None, oauth_credentials=None,
+                 monitor_class=None):
         self.root_dir = root_dir
         self.shares_dir = shares_dir
         self.shares_dir_link = os.path.join(self.root_dir, shares_symlink_name)
@@ -155,6 +159,14 @@
         self.mark = task.LoopingCall(self.log_mark)
         self.mark.start(mark_interval)
 
+        self.sync_menu = None
+        self.start_sync_menu()
+
+    def start_sync_menu(self):
+        """Create the sync menu and run the loop."""
+        self.sync_menu = sync_menu.UbuntuOneSyncMenu(self)
+        self.sync_menu.start_timer()
+
     def start_event_logger(self):
         """Start the event logger if it's available for this platform."""
         self.eventlog_listener = event_logging.get_listener(self.fs, self.vm)