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

diff --git a/server/-configuration/maestro.json b/server/-configuration/maestro.json
index 8cc59fcf0a713503fbaa3725e06feff4c1478faa..18378aabad1145082a1b9eb0b851e820a17b5f90 100644 (file)
--- a/server/-configuration/maestro.json
+++ b/server/-configuration/maestro.json
@@ -1,7 +1,8 @@
 {\r
        "sourceStoreUri": {\r
                "protocol": "LOCAL",\r
-               "uri": "c:/temp"\r
+               "uri": "c:/temp",\r
+               "fileFilter": "*.mxf"\r
        },\r
        "targets": \r
        [\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
index 08fe20764ef3982c1d871e32605a004393042f59..b370b0fdd467b560e121d548c9945d5b128f7ee0 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
@@ -29,6 +29,7 @@ public class DirectoryListModel {
        private MaestroConfig config = null;\r
        private FileSizeConverter fileSizeConverter = new FileSizeConverter();\r
        private String searchText;\r
+       private String defaultFileFilter;\r
 \r
        @NotifyChange("searchText")\r
        public void changeDirectory(RemoteFile selectedFolder) throws Exception {\r
@@ -99,6 +100,7 @@ public class DirectoryListModel {
                        String key = "jobengine.maestro.config";\r
                        config = JSONConfig.read(key, MaestroConfig.class);\r
                        uri = config.getSourceStoreUri();\r
+                       defaultFileFilter = uri.getFileFilter();\r
 \r
                        files = new ListModelList<>();\r
                        setSourceList();\r