Merge lp:~diegosarmentero/ubuntuone-client/fixwin-search into lp:ubuntuone-client

[Diego Sarmentero]

- Using the proper os separator and escaping the base paths (LP: #1073660).

[lp:~diegosarmentero/ubuntuone-client/fixwin-search]

1359. By Diego Sarmentero on 2012-11-05

adding new line at the end of the file

1360. By Diego Sarmentero on 2012-11-05

removing unnecessary test

1361. By Diego Sarmentero on 2012-11-05

adding new line at the end

[Michał Karnicki (karni)]

Looks good to me.

review: Approve

[Brian Curtin (brian.curtin)]

Approved on Windows IRL & tests

review: Approve

=== modified file 'tests/syncdaemon/test_files_search.py'
--- tests/syncdaemon/test_files_search.py	2012-10-22 17:17:32 +0000
+++ tests/syncdaemon/test_files_search.py	2012-11-05 14:41:22 +0000
@@ -28,6 +28,9 @@
 # files in the program, then also delete it here.
 """Test the files search module."""
 
+import os
+import re
+
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
@@ -55,17 +58,18 @@
         self.pattern = pattern
 
 
-class FilesystemManagerTestCase(TestCase):
+class FilesSearchTestCase(TestCase):
     """Test the SyncMenu."""
 
     @defer.inlineCallbacks
     def setUp(self):
-        yield super(FilesystemManagerTestCase, self).setUp()
+        yield super(FilesSearchTestCase, self).setUp()
         self.fsm = FakeFilesystemManager()
         self.search = files_search.SearchFiles(self.fsm)
         root, udf_dir, shared_dir, _ = self.fsm.vm.get_folders()
-        paths = "(%s|%s|%s)" % (root, udf_dir, shared_dir)
-        self.basic_pattern = paths + ".*/.*%s.*$"
+        paths = "(%s|%s|%s)" % (re.escape(root), re.escape(udf_dir),
+            re.escape(shared_dir))
+        self.basic_pattern = paths + ".*" + os.sep + ".*%s.*$"
 
     def test_simple_string(self):
         """Check the pattern is the same string."""

=== modified file 'ubuntuone/syncdaemon/files_search.py'
--- ubuntuone/syncdaemon/files_search.py	2012-10-22 17:17:32 +0000
+++ ubuntuone/syncdaemon/files_search.py	2012-11-05 14:41:22 +0000
@@ -28,6 +28,7 @@
 # files in the program, then also delete it here.
 """Searchs for files inside the U1 folder."""
 
+import os
 import re
 
 
@@ -37,12 +38,13 @@
     def __init__(self, fs):
         self.fs = fs
         root, udf_dir, shared_dir, _ = self.fs.vm.get_folders()
-        paths = "(%s|%s|%s)" % (root, udf_dir, shared_dir)
-        self.pattern = paths + ".*/.*%s.*$"
+        paths = "(%s|%s|%s)" % (re.escape(root), re.escape(udf_dir),
+            re.escape(shared_dir))
+        self.pattern = paths + ".*" + os.sep + ".*%s.*$"
 
     def search(self, pattern=''):
         """Search for the files that contains name."""
         keywords = '.+'.join(re.escape(pattern).split('\\ '))
         search = self.pattern % keywords
         results = self.fs.get_paths_by_pattern(search)
-        return results
\ No newline at end of file
+        return results