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

[Diego Sarmentero]

- Collect and return the data for the menu from aggregator (LP: #1032659).

[Roberto Alsina (ralsina)]

Nice!

review: Approve

[Alejandro J. Cura (alecu)]

deque ftw!

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2012-04-09 20:07:05 +0000
+++ tests/status/test_aggregator.py	2012-08-06 14:27:25 +0000
@@ -706,6 +706,8 @@
         self.share_id = path
         self.node_id = path
         self.deflated_size = 10000
+        self.size = 0
+        self.n_bytes_written = 0
 
 
 class FakeVolumeManager(object):
@@ -733,6 +735,7 @@
         self.files_uploading = []
         self.files_downloading = []
         self.progress_events = []
+        self.recent_transfers = aggregator.deque(maxlen=10)
 
     def queue_done(self):
         """The queue completed all operations."""
@@ -762,6 +765,7 @@
         """An upload just finished."""
         if command in self.files_uploading:
             self.files_uploading.remove(command)
+        self.recent_transfers.append(command.path)
         self.queued_commands.discard(command)
 
     def progress_made(self, share_id, node_id, n_bytes, deflated_size):
@@ -796,6 +800,64 @@
                                                        self.fakevm,
                                                        self.status_frontend)
 
+    def test_recent_transfers(self):
+        """Check that it generates a tuple with the recent transfers."""
+        self.patch(status_listener.action_queue, "Upload", FakeCommand)
+        fake_command = FakeCommand('path1')
+        self.listener.handle_SYS_QUEUE_ADDED(fake_command)
+        self.listener.handle_SYS_QUEUE_REMOVED(fake_command)
+        fake_command = FakeCommand('path2')
+        self.listener.handle_SYS_QUEUE_ADDED(fake_command)
+        self.listener.handle_SYS_QUEUE_REMOVED(fake_command)
+        fake_command = FakeCommand('path3')
+        self.listener.handle_SYS_QUEUE_ADDED(fake_command)
+        self.listener.handle_SYS_QUEUE_REMOVED(fake_command)
+        transfers = self.status_frontend.recent_transfers()
+        expected = ('path1', 'path2', 'path3')
+        self.assertEqual(transfers, expected)
+
+        menu_data = self.listener.menu_data()
+        self.assertEqual(menu_data, ([], expected))
+
+    def test_file_uploading(self):
+        """Check that it returns a list with the path, size, and progress."""
+        fc = FakeCommand(path='testfile.txt')
+        self.status_frontend.upload_started(fc)
+        uploading = self.status_frontend.files_uploading()
+        expected = [('testfile.txt', 0, 0)]
+        self.assertEqual(uploading, expected)
+        menu_data = self.listener.menu_data()
+        self.assertEqual(menu_data, (expected, ()))
+
+        fc.size = 1000
+        fc.n_bytes_written = 200
+        fc2 = FakeCommand(path='testfile2.txt')
+        fc2.size = 2000
+        fc2.n_bytes_written = 450
+        self.status_frontend.upload_started(fc2)
+        uploading = self.status_frontend.files_uploading()
+        expected = [('testfile.txt', 1000, 200), ('testfile2.txt', 2000, 450)]
+        self.assertEqual(uploading, expected)
+
+        menu_data = self.listener.menu_data()
+        self.assertEqual(menu_data, (expected, ()))
+
+    def test_menu_data_full_response(self):
+        """Check that listener.menu_data returns both uploading and recent."""
+        self.patch(status_listener.action_queue, "Upload", FakeCommand)
+        fake_command = FakeCommand('path1')
+        self.listener.handle_SYS_QUEUE_ADDED(fake_command)
+        self.listener.handle_SYS_QUEUE_REMOVED(fake_command)
+        fc = FakeCommand(path='testfile.txt')
+        fc.size = 1000
+        fc.n_bytes_written = 200
+        self.status_frontend.upload_started(fc)
+        uploading = self.status_frontend.files_uploading()
+        transfers = self.status_frontend.recent_transfers()
+        expected = ([('testfile.txt', 1000, 200)], ('path1',))
+
+        self.assertEqual((uploading, transfers), expected)
+
     def test_file_published(self):
         """A file published event is processed."""
         share_id = "fake share id"
@@ -1308,6 +1370,15 @@
         self.assertEqual(
             {(fc.share_id, fc.node_id): (fc.deflated_size)},
             self.aggregator.progress)
+        self.assertEqual(len(self.aggregator.recent_transfers), 1)
+
+    def test_max_recent_files(self):
+        """Check that the queue doesn't exceed the 10 items."""
+        for i in range(15):
+            fc = FakeCommand()
+            self.status_frontend.upload_started(fc)
+            self.status_frontend.upload_finished(fc)
+        self.assertEqual(len(self.aggregator.recent_transfers), 10)
 
     def test_progress_made(self):
         """Progress on up and downloads is tracked."""

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/status/aggregator.py	2012-08-06 14:27:25 +0000
@@ -33,7 +33,7 @@
 import itertools
 import operator
 import os
-
+from collections import deque
 
 import gettext
 
@@ -624,6 +624,7 @@
         self.finished_delay = 10
         self.progress = {}
         self.to_do = {}
+        self.recent_transfers = deque(maxlen=10)
 
     def get_notification(self):
         """Create a new toggleable notification object."""
@@ -775,6 +776,7 @@
         if command.deflated_size is not None:
             self.progress[
                 (command.share_id, command.node_id)] = command.deflated_size
+        self.recent_transfers.append(command.path)
         logger.debug("unqueueing command: %s", command.__class__.__name__)
         self.update_progressbar()
 
@@ -806,6 +808,18 @@
         self.messaging = Messaging()
         self.quota_timer = None
 
+    def recent_transfers(self):
+        """Return a tuple with the recent transfers paths."""
+        return tuple(self.aggregator.recent_transfers)
+
+    def files_uploading(self):
+        """Return a list with the files being uploading."""
+        uploading = []
+        for upload in self.aggregator.files_uploading:
+            uploading.append((upload.path, upload.size,
+                upload.n_bytes_written))
+        return uploading
+
     def file_published(self, public_url):
         """A file was published."""
         status_event = FilePublishingStatus(new_public_url=public_url)

=== modified file 'ubuntuone/syncdaemon/status_listener.py'
--- ubuntuone/syncdaemon/status_listener.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/syncdaemon/status_listener.py	2012-08-06 14:27:25 +0000
@@ -66,6 +66,12 @@
         user_conf = config.get_user_config()
         self.show_all_notifications = user_conf.get_show_all_notifications()
 
+    def menu_data(self):
+        """Return the info necessary to construct the sync menu."""
+        transfers = self.status_frontend.recent_transfers()
+        uploading = self.status_frontend.files_uploading()
+        return uploading, transfers
+
     def get_show_all_notifications(self):
         """Get the value of show_all_notifications."""
         return self._show_all_notifications