Merge lp:~diegosarmentero/ubuntuone-client/case-insensitive-search into lp:ubuntuone-client

[Diego Sarmentero]

- Allow case insensitive search (LP: #1073664).

[dobey (dobey)]

11 + path = '/my/path/to/file_test'

While I understand that these are dummy data, I still don't like the fact that we have '/path/to/foo' in tests, when there is no obvious distinction in each individual test between what may hit the disk, and what definitely won't.

review: Approve

[Michał Karnicki (karni)]

review: Approve

=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py	2012-10-22 13:31:02 +0000
+++ tests/syncdaemon/test_fsm.py	2012-11-02 13:53:20 +0000
@@ -4339,6 +4339,25 @@
         result = self.fsm.get_paths_by_pattern(search)
         self.assertEqual(result, expected)
 
+    def test_get_paths_by_pattern_case_insensitive(self):
+        """Check that we obtain the files that correspond to the filter."""
+        mdid = 'id'
+        path = '/my/path/to/file_test'
+        mdobj = {'server_hash': 'asdqwe123'}
+        mdid2 = 'id2'
+        path2 = '/my/path/to/my_photos'
+        mdobj2 = {'server_hash': 'asdqwe456'}
+        self.fsm._idx_path = {path: mdid, path2: mdid2}
+        self.fsm.fs = {mdid: mdobj, mdid2: mdobj2}
+        expected = ['/my/path/to/file_test']
+        # expectations
+        paths = "(%s|%s)" % ('/my/path/', '/home/')
+        pattern = paths + ".*/.*%s.*$"
+        keywords = '.+'.join(re.escape('FILE').split('\\ '))
+        search = pattern % keywords
+        result = self.fsm.get_paths_by_pattern(search)
+        self.assertEqual(result, expected)
+
     def test_get_paths_by_pattern_valid_folders(self):
         """Search for the pattern in the valid folders."""
         mdid = 'id'

=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2012-10-25 17:28:03 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2012-11-02 13:53:20 +0000
@@ -1366,7 +1366,7 @@
 
     def get_paths_by_pattern(self, search):
         """Return a list of  paths that match the pattern."""
-        pattern = re.compile(search)
+        pattern = re.compile(search, re.IGNORECASE)
 
         def _get_matching():
             """Find the paths that match"""