Merge pull request #30 from Shekeen/exclude-subfolders

Remove possible subfolders from a list of folders to search in.

Author: leonid-shevtsov

search_in_project.py

@@ -81,7 +81,7 @@ def perform_search(self, text):
         self.last_search_string = text
         folders = self.search_folders()
 
-        self.common_path = self.find_common_path(folders)
+        self.common_path = os.path.commonprefix(folders)
         try:
             self.results = self.engine.run(text, folders)
             if self.results:
@@ -163,18 +163,6 @@ def search_folders(self):
                 search_folders = [os.path.expanduser("~")]
         return search_folders
 
-    def find_common_path(self, paths):
-        paths = [path.replace("\"", "") for path in paths]
-        paths = [path.split("/") for path in paths]
-        common_path = []
-        while 0 not in [len(path) for path in paths]:
-            next_segment = list(set([path.pop(0) for path in paths]))
-            if len(next_segment) == 1:
-                common_path += next_segment
-            else:
-                break
-        return "\"" + "/".join(common_path) + "/\""
-
 class SearchInProjectResultsCommand(sublime_plugin.TextCommand):
     def format_result(self, common_path, filename, lines):
         lines_text = "\n".join(["  %s: %s" % (location, text) for location, text in lines])
@@ -201,4 +189,3 @@ def run(self, edit, common_path, results, query):
         self.view.insert(edit, self.view.text_point(0,0), results_text)
         self.view.sel().clear()
         self.view.sel().add(sublime.Region(0,0))
-

searchengines/base.py

@@ -37,7 +37,7 @@ def run(self, query, folders):
             the absolute file path, and optionally row information, separated
             by a semicolon, and the second element is the result string
         """
-        arguments = self._arguments(query, folders)
+        arguments = self._arguments(query, self._remove_subfolders(folders))
         print("Running: %s" % " ".join(arguments))
 
         try:
@@ -49,7 +49,7 @@ def run(self, query, folders):
             pipe = subprocess.Popen(arguments,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
-                cwd=folders[0],
+                cwd=os.path.commonprefix(folders),
                 startupinfo=startupinfo
                 )
         except OSError: # Not FileNotFoundError for compatibility with Sublime Text 2
@@ -61,6 +61,17 @@ def run(self, query, folders):
             raise RuntimeError(self._sanitize_output(error))
         return self._parse_output(self._sanitize_output(output))
 
+    def _remove_subfolders(self, folders):
+        """
+            Optimize folder list by removing possible subfolders.
+        """
+        unique_folders = []
+        for folder in sorted(folders):
+            if (len(unique_folders) == 0 or
+                not folder.startswith(unique_folders[-1])):
+                unique_folders.append(folder)
+        return unique_folders
+
     def _arguments(self, query, folders):
         """
             Prepare arguments list for the search engine.