Merge lp:~thisfred/ubuntuone-client/fix-stale-notification into lp:ubuntuone-client

[Eric Casteleijn]

Uploading filename is now reset on every message display.

Uploading filename is now reset on every message display.

[Alejandro J. Cura (alecu)]

Looks fine, and tests pass.

review: Approve

[Natalia Bidart (nataliabidart)]

Can you please use os.path.basename instead of splitting the path? Thanks!

The rest looks good, and works like a charm.

review: Needs Fixing

[lp:~thisfred/ubuntuone-client/fix-stale-notification]

1167. By Eric Casteleijn on 2011-12-12

used os.filename and os.basename

1168. By Eric Casteleijn on 2011-12-12

remerged trunk

1169. By Eric Casteleijn on 2011-12-12

used os.path.basename everywhere

[Eric Casteleijn (thisfred)]

changed code to use os.path.basename everywhere

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-10-27 13:47:09 +0000
+++ tests/status/test_aggregator.py	2011-12-12 22:53:26 +0000
@@ -1327,6 +1327,26 @@
         result = self.aggregator.get_discovery_message()
         self.assertEqual(expected, result)
 
+    def test_get_discovery_message_clears_filenames(self):
+        """Test the message that's shown on the discovery bubble."""
+        uploading = 10
+        downloading = 8
+        filename = 'upfile0.ext'
+        filename2 = 'downfile0.ext'
+        self.aggregator.files_uploading.extend([
+            FakeCommand(path='upfile%d.ext' % n) for n in range(uploading)])
+        self.aggregator.uploading_filename = filename
+        self.aggregator.files_downloading.extend([
+            FakeCommand(path='downfile%d.ext' % n) for n in
+            range(downloading)])
+        self.aggregator.downloading_filename = 'STALE FILENAME'
+        self.aggregator.uploading_filename = 'STALE FILENAME'
+        expected = (
+            aggregator.files_being_uploaded(filename, uploading) + "\n" +
+            aggregator.files_being_downloaded(filename2, downloading))
+        result = self.aggregator.get_discovery_message()
+        self.assertEqual(expected, result)
+
     def test_get_final_status_message(self):
         """The final status message."""
         done = (5, 10)

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-10-21 15:49:18 +0000
+++ ubuntuone/status/aggregator.py	2011-12-12 22:53:26 +0000
@@ -646,12 +646,14 @@
         lines = []
         files_uploading = len(self.files_uploading)
         if files_uploading > 0:
+            self.uploading_filename = os.path.basename(
+                self.files_uploading[0].path)
             lines.append(files_being_uploaded(
                 self.uploading_filename, files_uploading))
         files_downloading = len(self.files_downloading)
         if files_downloading > 0:
-            self.downloading_filename = self.files_downloading[0].path.split(
-                os.path.sep)[-1]
+            self.downloading_filename = os.path.basename(
+                self.files_downloading[0].path)
             lines.append(files_being_downloaded(
                 self.downloading_filename, files_downloading))
         return "\n".join(lines)
@@ -712,8 +714,8 @@
                 (command.share_id, command.node_id)] = command.deflated_size
         # pylint: disable=W0201
         if not self.downloading_filename:
-            self.downloading_filename = self.files_downloading[0].path.split(
-                os.path.sep)[-1]
+            self.downloading_filename = os.path.basename(
+                self.files_downloading[0].path)
         # pylint: enable=W0201
         self.update_progressbar()
         logger.debug(
@@ -743,8 +745,8 @@
                 (command.share_id, command.node_id)] = command.deflated_size
         # pylint: disable=W0201
         if not self.uploading_filename:
-            self.uploading_filename = self.files_uploading[0].path.split(
-                os.path.sep)[-1]
+            self.uploading_filename = os.path.basename(
+                self.files_uploading[0].path)
         # pylint: enable=W0201
         self.update_progressbar()
         logger.debug(