From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 4 Sep 2019 11:50:47 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=3b5bd78aea4d8ac8d90d569f3dd8f5f1dabd58e6;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31498
---

diff --git a/server/-configuration/maestro.json b/server/-configuration/maestro.json
index 18378aab..a65216a2 100644
--- a/server/-configuration/maestro.json
+++ b/server/-configuration/maestro.json
@@ -2,7 +2,8 @@
 	"sourceStoreUri": {
 		"protocol": "LOCAL",
 		"uri": "c:/temp",
-		"fileFilter": "*.mxf"
+		"fileFilter": "*.log;*.bat",
+		"showDirectories": true
 	},
 	"targets": 
 	[
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java
index b8be6970..755de486 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/remotestore/DirectoryFileFilter.java
@@ -28,17 +28,25 @@ public class DirectoryFileFilter implements FileFilter {
 		if (filters == null || filters.trim().length() == 0)
 			return ret;
 
-		if (!filters.contains("*")) {
-			ret &= name.toLowerCase().contains(filters.toLowerCase());
-		} else {
-			if (filters.startsWith("*")) {
-				ret &= name.toLowerCase().endsWith(filters.toLowerCase().replace("*", ""));
-				return ret;
-			}
-			if (filters.endsWith("*")) {
-				ret &= name.toLowerCase().startsWith(filters.toLowerCase().replace("*", ""));
-				return ret;
+		String[] tokens = filters.split(";");
+		//		if (name.endsWith("echo.bat"))
+		//			System.out.println("");
+		for (String token : tokens) {
+
+			if (!token.contains("*")) {
+				ret = name.toLowerCase().contains(token.toLowerCase());
+			} else {
+				if (token.startsWith("*")) {
+					ret = name.toLowerCase().endsWith(token.toLowerCase().replace("*", ""));
+				} else {
+					if (token.endsWith("*")) {
+						ret = name.toLowerCase().startsWith(token.toLowerCase().replace("*", ""));
+					}
+				}
 			}
+
+			if (ret == true)
+				break;
 		}
 
 		return ret;