Issue 570

Issue 455

(570) Adds a settings option to ignore symlinks during the media scan.

(4550 Adds a regular expression pattern to exclude in addition to the option
of excluding symlinks.

airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp

@@ -172,4 +172,4 @@
     </script>
 </c:if>
 
-</body></html>
+</body></html>

airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp

@@ -69,6 +69,17 @@
         <fmt:message key="musicfoldersettings.access.description"/>
     </p>
 
+    <div>
+	<fmt:message key="musicfoldersettings.excludepattern"/>
+	<form:input path="excludePatternString" size="70"/>
+        <c:import url="helpToolTip.jsp"><c:param name="topic" value="excludepattern"/></c:import>
+    </div>
+
+    <div>
+	<form:checkbox path="ignoreSymLinks" id="ignoreSymLinks"/>
+     	<form:label path="ignoreSymLinks"><fmt:message key="musicfoldersettings.ignoresymlinks"/></form:label>
+    </div>
+
     <div style="padding-top: 0.5em;padding-bottom: 0.3em">
         <span style="white-space: nowrap">
             <fmt:message key="musicfoldersettings.scan"/>
@@ -133,4 +144,4 @@
 
 </form:form>
 
-</body></html>
+</body></html>