Externalized the Lucene ignore extensions

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 2ac6598febdbe84c601f9cda790cf95a33aed111..ad8228095c7a97e22f17f32c5f5078ebd6ecfb00 100644 (file)
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -373,6 +373,12 @@ web.summaryRefsCount = 5
 # SINCE 0.5.0\r
 web.itemsPerPage = 50\r
 \r
+# Registered file extensions to ignore during Lucene indexing\r
+#\r
+# SPACE-DELIMITED\r
+# SINCE 0.9.0\r
+web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip\r
+\r
 # Registered extensions for google-code-prettify\r
 #\r
 # SPACE-DELIMITED\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 126ee239b2c123792cbd09ce3e833a69acdd12fb..a6170e6046c8da640261a3312b20b56a2925d9d2 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -17,8 +17,10 @@
 #### additions\r
 \r
 - Added optional Lucene branch indexing (issue 16)  \r
-Repository branches may be optionally indexed by Lucene for improved searching.  To use this feature you have to specify which branches to index within the *Edit Repository* page.  Indexes are automatically built and incrementally updated on a 2 minute cycle. (i.e you will have to wait 2-3 minutes after specifying a branch to be indexed before the index will be built.)<br/><br/>\r
-If a repository has Lucene-indexed branches the *search* form on the repository pages will redirect to the root-level Lucene search page.  If the repository does not specify any indexed branches then the traditional repository commit search is used.\r
+    **New:** *web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip*  \r
+Repository branches may be optionally indexed by Lucene for improved searching.  To use this feature you must specify which branches to index within the *Edit Repository* page; _no repositories are automatically indexed_.  Gitblit will build or incrementally update enrolled repositories on a 2 minute cycle. (i.e you will have to wait 2-3 minutes after respecifying indexed branches or pushing new commits before Gitblit will build/update the repository's Lucene index.)  \r
+If a repository has Lucene-indexed branches the *search* form on the repository pages will redirect to the root-level Lucene search page and only the content of those branches can be searched.  \r
+If the repository does not specify any indexed branches then repository commit-traversal search is used.\r
 - Allow specifying timezone to use for Gitblit which is independent of both the JVM and the system timezone (issue 54)  \r
     **New:** *web.timezone =*  \r
 - Added a built-in AJP connector for integrating Gitblit GO into an Apache mod_proxy setup (issue 59)  \r

diff --git a/src/com/gitblit/LuceneExecutor.java b/src/com/gitblit/LuceneExecutor.java
index 12f230508295b1c743437011fa03d9237cb98e5f..b6df254a5bcea82c472d44809da9b4b0030f1fdb 100644 (file)
--- a/src/com/gitblit/LuceneExecutor.java
+++ b/src/com/gitblit/LuceneExecutor.java
@@ -25,7 +25,6 @@ import java.lang.reflect.Method;
 import java.text.MessageFormat;\r
 import java.text.ParseException;\r
 import java.util.ArrayList;\r
-import java.util.Arrays;\r
 import java.util.Collections;\r
 import java.util.Comparator;\r
 import java.util.HashMap;\r
@@ -138,10 +137,9 @@ public class LuceneExecutor implements Runnable {
        private final Map<String, IndexSearcher> searchers = new ConcurrentHashMap<String, IndexSearcher>();\r
        private final Map<String, IndexWriter> writers = new ConcurrentHashMap<String, IndexWriter>();\r
        \r
-       private final Set<String> excludedExtensions = new TreeSet<String>(Arrays.asList("7z", "arc",\r
-                       "arj", "bin", "bmp", "dll", "doc", "docx", "exe", "gif", "gz", "jar", "jpg", "lib",\r
-                       "lzh", "odg", "pdf", "ppt", "png", "so", "swf", "xcf", "xls", "xlsx", "zip"));\r
-\r
+       private final String luceneIgnoreExtensions = "7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip";\r
+       private Set<String> excludedExtensions;\r
+       \r
        public LuceneExecutor(IStoredSettings settings, File repositoriesFolder) {\r
                this.storedSettings = settings;\r
                this.repositoriesFolder = repositoriesFolder;\r
@@ -154,6 +152,10 @@ public class LuceneExecutor implements Runnable {
         */\r
        @Override\r
        public void run() {\r
+               // reload the excluded extensions\r
+               String exts = storedSettings.getString(Keys.web.luceneIgnoreExtensions, luceneIgnoreExtensions);\r
+               excludedExtensions = new TreeSet<String>(StringUtils.getStringsFromValue(exts));\r
+\r
                for (String repositoryName: GitBlit.self().getRepositoryList()) {\r
                        RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);\r
                        if (model.hasCommits && !ArrayUtils.isEmpty(model.indexedBranches)) {\r