Merge lp:~mikemc/ubuntuone-client/no-multi-add-recents-fix-1069953 into lp:ubuntuone-client

[Mike McCracken]

- Avoid adding the same file to the recent transfers list twice, just reorder it. (LP: #1069953)

- Avoid adding the same file to the recent transfers list twice, just reorder it. (LP: #1069953)

Updated tests are in tests/status/

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~mikemc/ubuntuone-client/add-downloads-to-menudata has not yet been merged into https://code.launchpad.net/~ubuntuone-control-tower/ubuntuone-client/trunk.

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2012-10-24 16:12:31 +0000
+++ tests/status/test_aggregator.py	2012-10-24 16:12:31 +0000
@@ -1529,15 +1529,41 @@
     def test_max_recent_files(self):
         """Check that the queue doesn't exceed the 5 items."""
         for i in range(10):
-            fc = FakeUploadCommand()
+            fc = FakeUploadCommand(str(i))
             self.status_frontend.upload_started(fc)
             self.status_frontend.upload_finished(fc)
         for i in range(10):
-            fc = FakeDownloadCommand()
+            fc = FakeDownloadCommand(str(i))
             self.status_frontend.download_started(fc)
             self.status_frontend.download_finished(fc)
         self.assertEqual(len(self.aggregator.recent_transfers), 5)
 
+    def test_recent_transfers_is_unique(self):
+        """Check that a given path is not repeated in recent transfers."""
+        fc = FakeDownloadCommand('hi')
+        self.status_frontend.download_started(fc)
+        self.status_frontend.download_finished(fc)
+        fc = FakeDownloadCommand('hi')
+        self.status_frontend.download_started(fc)
+        self.status_frontend.download_finished(fc)
+        self.assertEqual(len(self.aggregator.recent_transfers), 1)
+
+    def test_recent_transfers_reorders(self):
+        """Check that if a transfer is repeated we put it back at the end."""
+        fc = FakeDownloadCommand('hi')
+        self.status_frontend.download_started(fc)
+        self.status_frontend.download_finished(fc)
+        fc = FakeDownloadCommand('howdy')
+        self.status_frontend.download_started(fc)
+        self.status_frontend.download_finished(fc)
+        fc = FakeUploadCommand('hi')
+        self.status_frontend.upload_started(fc)
+        self.status_frontend.upload_finished(fc)
+
+        self.assertEqual(len(self.aggregator.recent_transfers), 2)
+        self.assertEqual(['howdy', 'hi'],
+                         list(self.aggregator.recent_transfers))
+
     def test_progress_made(self):
         """Progress on up and downloads is tracked."""
         share_id = 'fake_share'
 
=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-10-24 16:12:31 +0000
+++ ubuntuone/status/aggregator.py	2012-10-24 16:12:31 +0000
@@ -754,6 +754,8 @@
         if command.deflated_size is not None:
             self.progress[
                 (command.share_id, command.node_id)] = command.deflated_size
+        if command.path in self.recent_transfers:
+            self.recent_transfers.remove(command.path)
         self.recent_transfers.append(command.path)
         logger.debug("unqueueing command: %s", command.__class__.__name__)
         self.update_progressbar()
@@ -786,6 +788,8 @@
         if command.deflated_size is not None:
             self.progress[
                 (command.share_id, command.node_id)] = command.deflated_size
+        if command.path in self.recent_transfers:
+            self.recent_transfers.remove(command.path)
         self.recent_transfers.append(command.path)
         logger.debug("unqueueing command: %s", command.__class__.__name__)
         self.update_progressbar()