Merge lp:~diegosarmentero/ubuntuone-control-panel/search-shared-files into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Use the search and filter implementation from u1-client to get the list always up to date (LP: #1056189).

This branch requires this u1-client branch:
https://code.launchpad.net/~diegosarmentero/ubuntuone-client/search-filter/+merge/130862

To work as expected.

If you see the following lint issue:
== Python Lint Notices ==

ubuntuone/controlpanel/sd_client/__init__.py:
    235: [E1101, SyncDaemonClient.search_files] Instance of 'SyncDaemonTool' has no 'search_files' member

You will need to add the u1-client branch mentioned to the path when running the tests.

[Roberto Alsina (ralsina)]

review: Approve

[Mike McCracken (mikemc)]

works for me on darwin with the search-filter branch mentioned above and the ~diegosarmentero/ubuntuone-client/fix-tests-jenkins branch.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/search-shared-files into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [O...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/search-shared-files into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [O...

[lp:~diegosarmentero/ubuntuone-control-panel/search-shared-files]

374. By Diego Sarmentero on 2012-10-29

fixing pep8 issues

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-10-26 15:55:18 +0000
+++ ubuntuone/controlpanel/backend.py	2012-10-29 14:02:23 +0000
@@ -883,6 +883,13 @@
         returnValue(result)
 
     @log_call(logger.info)
+    @inlineCallbacks
+    def search_files(self, pattern):
+        """Search for this pattern in the name of u1 files."""
+        result = yield self.sd_client.search_files(pattern)
+        returnValue(result)
+
+    @log_call(logger.info)
     def shutdown(self):
         """Stop this service."""
         # do any other needed cleanup

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-10-16 14:32:44 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-10-29 14:02:23 +0000
@@ -28,6 +28,8 @@
 
 logger = setup_logging('qt.share_links_search')
 
+HOME_DIR = ''
+
 
 def get_system_icon_for_filename(file_path):
     """Return the icon used for the system to represent this file."""
@@ -37,7 +39,7 @@
     return icon
 
 
-# pylint: disable=C0103
+# pylint: disable=C0103,W0603
 
 class SearchBox(QtGui.QLineEdit, cache.Cache):
     """Search widget for the synced files."""
@@ -48,9 +50,7 @@
         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 = []
         self.items_per_page = 0
         self.items_step = 20
@@ -72,7 +72,7 @@
             self._scroll_fetch_more)
         self.textChanged.connect(self.filter)
 
-        self._get_volumes_info()
+        self._get_home_path()
 
     def _scroll_fetch_more(self, value):
         """Fetch more items into the list on scroll."""
@@ -81,56 +81,27 @@
             self.popup.fetch_more(filenames)
 
     @inlineCallbacks
-    def _get_volumes_info(self):
+    def _get_home_path(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)
-
-    def _process_volumes_info(self, info):
-        """Get the volumes paths and process them."""
-        folders = []
-        for _, _, data in info:
-            for d in data:
-                if d['type'] != 'SHARE':
-                    folder = d.get('path', d.get('realpath'))
-                    folders.append(folder)
-        self.get_folders_files(folders)
-
-    def get_folders_files(self, folders):
-        """Get the list of files in each folder and index them."""
-        self._thread_explore.set_folders(folders)
-        self._thread_explore.folderDataObtained.connect(
-            self._folder_content_obtained)
-        self._thread_explore.start()
-
-    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)
-
+        global HOME_DIR
+        HOME_DIR = yield self.backend.get_home_dir()
+
+    @inlineCallbacks
     def filter(self, text):
         """Filter the content of the popup with the text entered."""
         text = unicode(text)
         self.items_per_page = 0
         if text and (self.prefix == '' or self.prefix != text[:-1]):
             self.prefix = text
-            self.temp_u1_files = self._thread_explore.u1_files
-            self._show_filter()
+            self.temp_u1_files = yield self.backend.search_files(self.prefix)
+            self._load_items()
         elif text != '':
             self.prefix = text
-            self._show_filter()
+            self._load_items()
         else:
             self.popup.hide()
 
-    def _show_filter(self):
+    def _load_items(self):
         """Load the items in the popup and display it."""
         if not self.popup.isVisible():
             self.popup.setFixedWidth(self.width())
@@ -210,8 +181,8 @@
         """Move the popup when the windows is moved."""
         super(SearchBox, self).moveEvent(event)
         if self.popup.isVisible():
-            point = self.mapToGlobal(self.line_search.pos())
-            self.popup.move(point.x(), point.y() + self.line_search.height())
+            point = self.mapToGlobal(self.pos())
+            self.popup.move(point.x(), point.y() + self.height())
 
 
 class FileItem(QtGui.QLabel):
@@ -224,17 +195,29 @@
         self.text_style = (u"<span style='color: {2};'>{0}</span><br>"
             "<span style='font-size: 13px; color: {3};'>({1})</span>")
         self.setText(self.text_style.format(
-                self.name, self.file_path, '#333333', 'grey'))
+                self.name, self.reduced_path(self.file_path),
+                '#333333', 'grey'))
+
+    def reduced_path(self, file_path):
+        """Replace the home part of the path with ~."""
+        if file_path.startswith(HOME_DIR):
+            reduce_path = file_path[len(HOME_DIR):]
+            if reduce_path.startswith(os.path.sep):
+                reduce_path = reduce_path[1:]
+            file_path = os.path.join('~', reduce_path)
+        return file_path
 
     def set_selected(self):
         """Set a style for the text when the item is selected."""
         self.setText(self.text_style.format(
-                self.name, self.file_path, 'white', 'white'))
+                self.name, self.reduced_path(self.file_path),
+                'white', 'white'))
 
     def set_not_selected(self):
         """Set a style for the text when the item is not selected."""
         self.setText(self.text_style.format(
-                self.name, self.file_path, '#333333', 'grey'))
+                self.name, self.reduced_path(self.file_path),
+                '#333333', 'grey'))
 
 
 class FilesPopup(QtGui.QFrame):
@@ -296,47 +279,3 @@
         """Notify when the popup is hidden."""
         super(FilesPopup, self).hideEvent(event)
         self.popupHidden.emit()
-
-
-class ThreadExploreFolder(QtCore.QThread):
-    """Retrieve the data of the folders asynchronously."""
-
-    folderDataObtained = QtCore.pyqtSignal()
-
-    def __init__(self, home_dir=''):
-        super(ThreadExploreFolder, self).__init__()
-        self.home_dir = home_dir
-        self.u1_files = []
-        self.folders = []
-
-    def set_folders(self, folders):
-        """Set the folders to be explored."""
-        self.folders = folders
-
-    def run(self):
-        """Execute the thread to obtain the folders data."""
-        folders_data = []
-        for folder in self.folders:
-            folders_data += self.get_folder_info(folder)
-        temp_files = []
-        for file_ in folders_data:
-            if file_.startswith(self.home_dir):
-                new_path = file_[len(self.home_dir):]
-                if new_path.startswith(os.path.sep):
-                    new_path = new_path[1:]
-                path = os.path.join('~', new_path)
-                temp_files.append(path)
-            else:
-                temp_files.append(file_)
-        folders_data = temp_files
-        folders_data.sort()
-        self.u1_files = folders_data
-        self.folderDataObtained.emit()
-
-    def get_folder_info(self, folder):
-        """Return the list of files in the proper folder."""
-        files_list = []
-        if os.path.exists(folder):
-            for root, _, files in os.walk(folder):
-                files_list.extend([os.path.join(root, f) for f in files])
-        return files_list

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-10-04 21:12:56 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-10-29 14:02:23 +0000
@@ -146,6 +146,7 @@
         'replications_info',
         'restart_files',
         'restore_file_sync_settings',
+        'search_files',
         'set_public_access_changed_handler',
         'set_public_access_change_error_handler',
         'set_public_files_list_handler',

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-10-16 14:19:39 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-10-29 14:02:23 +0000
@@ -19,7 +19,6 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.qt import gui
-from ubuntuone.controlpanel.gui.qt import share_links_search
 from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase, FakedDialog
 
 
@@ -44,8 +43,6 @@
     @defer.inlineCallbacks
     def setUp(self):
         """Set the different tests."""
-        self.patch(share_links_search.SearchBox, "_get_volumes_info",
-            lambda *args, **kwargs: None)
         yield super(MainWindowTestCase, self).setUp()
 
     def test_close_event_calls_custom_close_callback(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-16 14:32:44 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-29 14:02:23 +0000
@@ -44,8 +44,6 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        self.patch(gui.share_links_ui.SearchBox, "_get_volumes_info",
-            lambda *args, **kwargs: None)
         yield super(ShareLinksTestCase, self).setUp()
 
     def test_setup(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-10-16 14:32:44 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-10-29 14:02:23 +0000
@@ -18,7 +18,7 @@
 
 import os
 
-from dirspec import utils
+#from dirspec import utils
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.tests import USER_HOME
@@ -36,63 +36,39 @@
 
     @defer.inlineCallbacks
     def setUp(self):
-        self.patch(gui.ThreadExploreFolder, "start",
-            lambda *args, **kwargs: self.fake_start())
-        self.patch(gui.SearchBox, "_get_volumes_info",
-            lambda *args, **kwargs: None)
         yield super(SearchBoxTestCase, self).setUp()
-
-        self.ui.home_dir = yield self.ui.backend.get_home_dir()
-        self.ui._thread_explore = gui.ThreadExploreFolder(self.ui.home_dir)
-        self.patch(utils, "user_home", USER_HOME)
-        self.patch(self.ui._thread_explore, "get_folder_info",
-            self.fake_get_folder_info)
-        self.folder_info = {
-            'folder1': [
-                os.path.join(USER_HOME, 'ubuntu', 'file1'),
-                os.path.join(USER_HOME, 'ubuntu', 'file2'),
-                os.path.join(USER_HOME, 'one', 'file3'),
-            ],
-            'folder2': [
-                os.path.join(USER_HOME, 'test', 'asd'),
-                os.path.join('other_path', 'test', 'qwe'),
-                os.path.join(USER_HOME, 'blabla', 'iop'),
-            ]
-        }
+        self.patch(self.ui.backend, "search_files", self.fake_search_files)
+        self.files = []
         self._slot_item = None
 
-    def fake_start(self):
-        """Fake thread start."""
-        self.ui._thread_explore.run()
+    def fake_search_files(self, pattern):
+        """Fake search_files from the backend."""
+        self.files = [os.path.join(USER_HOME, 'blabla', 'iop'),
+            os.path.join(USER_HOME, 'one', 'file3'),
+            os.path.join(USER_HOME, 'test', 'asd'),
+            os.path.join(USER_HOME, 'ubuntu', 'file1'),
+            os.path.join(USER_HOME, 'ubuntu', 'file2'),
+            os.path.join('other_path', 'test', 'qwe')]
+        return sorted(self.files)
 
     def fake_slot(self, item):
         """Fake function to be called when itemSelected is emitted."""
         self._slot_item = item
 
-    def fake_get_folder_info(self, folder):
-        """Fake get_folder_info."""
-        return self.folder_info.get(folder, [])
-
     def test_initialization(self):
         """Check that the widget is build properly"""
-        self.assertEqual(self.ui.home_dir, USER_HOME)
-        self.assertEqual(self.ui._thread_explore.u1_files, [])
+        self.assertEqual(gui.HOME_DIR, USER_HOME)
         self.assertEqual(self.ui.temp_u1_files, [])
         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 actions are executed on key down pressed."""
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.popup.setVisible(True)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui._load_items()
         self.ui.popup.list_widget.setCurrentRow(1)
         current = self.ui.popup.list_widget.currentRow()
         self.ui._key_down_pressed(current)
@@ -107,12 +83,10 @@
             data.append(True)
 
         self.patch(self.ui.popup, "fetch_more", fake_fetch_more)
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2),
-            (0, 0, data1), (0, 0, data2), (0, 0, data1), (0, 0, data2),
-            (0, 0, data1), (0, 0, data2), (0, 0, data1), (0, 0, data2),
-            (0, 0, data1), (0, 0, data2), (0, 0, data1), (0, 0, data2)])
+        self.ui.popup.setVisible(True)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui.temp_u1_files = self.ui.temp_u1_files * 4
+        self.ui._load_items()
         self.assertEqual(self.ui.popup.list_widget.count(), 20)
         self.ui.popup.list_widget.setCurrentRow(
             self.ui.popup.list_widget.count() - 5)
@@ -122,9 +96,9 @@
 
     def test_key_up_pressed(self):
         """Check the proper actions are executed on key up pressed."""
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.popup.setVisible(True)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui._load_items()
         self.ui.popup.list_widget.setCurrentRow(1)
         current = self.ui.popup.list_widget.currentRow()
         self.ui._key_up_pressed(current)
@@ -132,9 +106,9 @@
 
     def test_key_up_pressed_stay_in_0(self):
         """Check the proper actions are executed on key up pressed."""
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.popup.setVisible(True)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui._load_items()
         self.ui.popup.list_widget.setCurrentRow(0)
         current = self.ui.popup.list_widget.currentRow()
         self.assertEqual(self.ui.popup.list_widget.currentRow(), 0)
@@ -143,33 +117,33 @@
 
     def test_key_return_pressed(self):
         """Check the proper actions are executed on key return pressed."""
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.popup.setVisible(True)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui._load_items()
         self.ui.popup.list_widget.setCurrentRow(1)
         current = self.ui.popup.list_widget.currentRow()
         self.ui.itemSelected.connect(self.fake_slot)
         self.ui._key_return_pressed(current)
         expected = unicode(self._slot_item).replace('~', USER_HOME)
-        self.assertEqual(expected, self.folder_info['folder2'][2])
+        self.assertEqual(expected, self.files[1])
 
     def test_mouse_click_pressed(self):
         """Check the proper actions are executed when click is pressed."""
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui.popup.setVisible(True)
+        self.ui._load_items()
         self.ui.popup.list_widget.setCurrentRow(1)
         current = self.ui.popup.list_widget.currentItem()
         self.ui.itemSelected.connect(self.fake_slot)
         self.ui.popup.list_widget.itemPressed.emit(current)
         expected = unicode(self._slot_item).replace('~', USER_HOME)
-        self.assertEqual(expected, self.folder_info['folder2'][2])
+        self.assertEqual(expected, self.files[1])
 
     def test_mouse_scroll(self):
         """Check that fetch_more is called when we reach the end of scroll."""
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui.popup.setVisible(True)
+        self.ui._load_items()
         self.patch(self.ui.popup, "fetch_more", self._set_called)
         self.ui._scroll_fetch_more(
             self.ui.popup.list_widget.verticalScrollBar().maximum())
@@ -185,13 +159,13 @@
             data.append(text)
 
         self.patch(self.ui, "setText", fake_set_text)
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
-        self.ui.popup.list_widget.setCurrentRow(1)
+        self.ui.popup.setVisible(True)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui._load_items()
+        self.ui.popup.list_widget.setCurrentRow(2)
 
         self.ui._key_space_pressed()
-        expected = ['iop']
+        expected = [os.path.basename(self.files[2])]
         self.assertEqual(expected, data)
 
     def test_key_space_pressed_without_selection(self):
@@ -201,64 +175,50 @@
 
     def test_process_volumes_info(self):
         """Check that _process_volumes_info obtain the proper info."""
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
-        expected = [
-            os.path.join('other_path', 'test', 'qwe'),
-            os.path.join('~', 'blabla', 'iop'),
-            os.path.join('~', 'one', 'file3'),
-            os.path.join('~', 'test', 'asd'),
-            os.path.join('~', 'ubuntu', 'file1'),
-            os.path.join('~', 'ubuntu', 'file2')]
-        self.assertEqual(self.ui._thread_explore.u1_files, expected)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui.popup.setVisible(True)
+        self.addCleanup(self.ui.popup.hide)
+        self.ui._load_items()
+        expected = self.files
+        expected.sort()
+        self.assertEqual(self.ui.temp_u1_files, expected)
         self.assertEqual(self.ui.popup.list_widget.count(), 6)
 
     def test_filter(self):
         """Check the results of the filter."""
         # This tests the behavior of:
         # filter
-        # _show_filter
+        # _load_items
         # _get_filtered_list
         self.patch(self.ui.popup, "isVisible", lambda: True)
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.popup.setVisible(True)
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui._load_items()
         self.ui.filter('p')
-        expected = [os.path.join('~', 'blabla', 'iop')]
+        expected = [os.path.join(USER_HOME, 'blabla', 'iop')]
         self.assertEqual(expected, self.ui.temp_u1_files)
 
         self.ui.filter('i')
         expected = [
-            os.path.join('~', 'blabla', 'iop'),
-            os.path.join('~', 'one', 'file3'),
-            os.path.join('~', 'ubuntu', 'file1'),
-            os.path.join('~', 'ubuntu', 'file2')]
+            os.path.join(USER_HOME, 'blabla', 'iop'),
+            os.path.join(USER_HOME, 'one', 'file3'),
+            os.path.join(USER_HOME, 'ubuntu', 'file1'),
+            os.path.join(USER_HOME, 'ubuntu', 'file2')]
         self.assertEqual(expected, self.ui.temp_u1_files)
 
     def test_set_selected_item(self):
         """Check the notification of the selected item."""
         self.ui.itemSelected.connect(self._set_called)
         self.patch(self.ui.popup, "isVisible", lambda: True)
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'UDF'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.temp_u1_files = self.ui.backend.search_files('')
+        self.ui._load_items()
         self.ui.popup.list_widget.setCurrentRow(0)
         item = self.ui.popup.list_widget.currentItem()
         self.ui._set_selected_item(item)
         self.assertEqual(self._called,
-                ((os.path.join(u'other_path', u'test', u'qwe'),), {}))
+                ((os.path.join(USER_HOME, 'blabla', 'iop'),), {}))
         self.assertEqual(self.ui.text(), '')
 
-    def test_ignore_shared_folders(self):
-        """Check that the folders shared with me are ignored."""
-        data = []
-        self.patch(self.ui, "get_folders_files", data.append)
-        data1 = [{'path': 'folder1', 'type': 'ROOT'}]
-        data2 = [{'realpath': 'folder2', 'type': 'SHARE'}]
-        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
-        self.assertEqual(data, [['folder1']])
-
 
 class FileItemTestCase(BaseTestCase):
     """Test the File Item."""
@@ -267,6 +227,11 @@
     file_path = '/home/tester/ubuntu/file1.txt'
     kwargs = {'file_path': file_path}
 
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(FileItemTestCase, self).setUp()
+        gui.HOME_DIR = '/path/'
+
     def test_default(self):
         """Check the default style of the item"""
         name = os.path.basename(self.file_path)
@@ -290,6 +255,13 @@
             '#333333', 'grey')
         self.assertEqual(self.ui.text(), style)
 
+    def test_reduce_path(self):
+        """Check the default style of the item"""
+        gui.HOME_DIR = USER_HOME
+        result = self.ui.reduced_path(self.file_path)
+        expected = os.path.join('~', 'ubuntu', 'file1.txt')
+        self.assertEqual(expected, result)
+
 
 class FilesPopupTestCase(BaseTestCase):
 

=== modified file 'ubuntuone/controlpanel/sd_client/__init__.py'
--- ubuntuone/controlpanel/sd_client/__init__.py	2012-08-24 20:44:03 +0000
+++ ubuntuone/controlpanel/sd_client/__init__.py	2012-10-29 14:02:23 +0000
@@ -229,3 +229,7 @@
     def set_public_access_change_error_handler(self, handler):
         """Set the status handler function."""
         return self.proxy.connect_signal('PublicAccessChangeError', handler)
+
+    def search_files(self, pattern):
+        """Search for this pattern in the name of u1 files."""
+        return self.proxy.search_files(pattern)

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-10-29 14:02:23 +0000
@@ -170,6 +170,7 @@
         self.folders = []
         self.volumes_refreshed = False
         self.menu_data = {'recent-transfers': (), 'uploading': ()}
+        self.files_search = ['/home/u1/path/my_file', '/home/u1/path/test']
         self.publicfiles = [
             {'path': '/home/file1', 'public_url': 'http:ubuntuone.com/asd123'},
             {'path': '/home/file2', 'public_url': 'http:ubuntuone.com/qwe456'},
@@ -340,6 +341,10 @@
         """Return the sync menu data."""
         return self.menu_data
 
+    def search_files(self, pattern):
+        """Return the search files results."""
+        return [file_ for file_ in self.files_search if pattern in file_]
+
     def get_public_files(self):
         """Trigger the action to get the public files."""
         if self.public_files_list_handler is not None:
@@ -1808,6 +1813,16 @@
         self.assertEqual(result, expected)
 
     @inlineCallbacks
+    def test_search_files(self):
+        """Check that we get the right data to create the menu."""
+        result = yield self.be.search_files('file')
+        expected = ['/home/u1/path/my_file']
+        self.assertEqual(result, expected)
+        result = yield self.be.search_files('test')
+        expected = ['/home/u1/path/test']
+        self.assertEqual(result, expected)
+
+    @inlineCallbacks
     def test_get_public_files(self):
         """Check that we get list of public files."""
         data = []