Merge lp:~ralsina/ubuntuone-control-panel/disable-enable into lp:ubuntuone-control-panel

[Roberto Alsina]

- Disabled search box until it's ready to work (Fixes LP: 1042885)

Disables the file share tab search box until the list of files is obtained.

To test IRL, assuming you have a few dozen thousand files in U1, i you go to that tab quickly, it should
be disabled.

Also added some logging to mark start and end of file list collection.

[lp:~ralsina/ubuntuone-control-panel/disable-enable]

355. By Roberto Alsina on 2012-08-28

beter logging

356. By Roberto Alsina on 2012-08-28

Link bug

[Alejandro J. Cura (alecu)]

Looks good, and provides a decent workaround.

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-08-27 20:02:55 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-08-28 19:49:20 +0000
@@ -22,6 +22,9 @@
 from twisted.internet.defer import inlineCallbacks
 
 from ubuntuone.controlpanel import cache
+from ubuntuone.controlpanel.logger import setup_logging
+
+logger = setup_logging('qt.share_links_search')
 
 
 def get_system_icon_for_filename(file_path):
@@ -41,6 +44,9 @@
 
     def __init__(self, parent=None):
         super(SearchBox, self).__init__(parent)
+        # The search box should be disabled until
+        # the file list is obtained
+        self.setEnabled(False)
         self.popup = FilesPopup()
         self.home_dir = ''
         self.temp_u1_files = []
@@ -67,6 +73,7 @@
     def _get_volumes_info(self):
         """Get the volumes info."""
         self.home_dir = yield self.backend.get_home_dir()
+        logger.info('Starting file list collection')
         self._thread_explore = ThreadExploreFolder(self.home_dir)
         info = yield self.backend.volumes_info()
         self._process_volumes_info(info)
@@ -90,6 +97,9 @@
     def _folder_content_obtained(self):
         """Receive the content of the folders from the thread."""
         files = self._get_filtered_list(self._thread_explore.u1_files)
+        logger.info('Finished file list collection, found %d files.',
+            len(self._thread_explore.u1_files))
+        self.setEnabled(True)
         self.popup.load_items(files)
         text = self.text()
         self.filter(text)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-08-28 00:32:41 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-08-28 19:49:20 +0000
@@ -65,6 +65,12 @@
         self.assertEqual(self.ui.items_per_page, 0)
         self.assertEqual(self.ui.items_step, 20)
         self.assertEqual(self.ui.prefix, '')
+        self.assertFalse(self.ui.isEnabled())
+
+    def test_folder_content_obtained_enables(self):
+        """Check that _folder_content_obtained enables the widget."""
+        self.ui._folder_content_obtained()
+        self.assertTrue(self.ui.isEnabled())
 
     def test_key_down_pressed(self):
         """Check the proper action are executed on key down pressed."""