From 0f12c440bd1733d632be9c34b8c015d9580969bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 4 Sep 2019 11:30:58 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31497 --- server/-configuration/maestro.json | 3 ++- .../src/user/jobengine/zk/model/DirectoryListModel.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/-configuration/maestro.json b/server/-configuration/maestro.json index 8cc59fcf..18378aab 100644 --- a/server/-configuration/maestro.json +++ b/server/-configuration/maestro.json @@ -1,7 +1,8 @@ { "sourceStoreUri": { "protocol": "LOCAL", - "uri": "c:/temp" + "uri": "c:/temp", + "fileFilter": "*.mxf" }, "targets": [ 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 08fe2076..b370b0fd 100644 --- 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; private FileSizeConverter fileSizeConverter = new FileSizeConverter(); private String searchText; + private String defaultFileFilter; @NotifyChange("searchText") public void changeDirectory(RemoteFile selectedFolder) throws Exception { @@ -99,6 +100,7 @@ public class DirectoryListModel { String key = "jobengine.maestro.config"; config = JSONConfig.read(key, MaestroConfig.class); uri = config.getSourceStoreUri(); + defaultFileFilter = uri.getFileFilter(); files = new ListModelList<>(); setSourceList(); -- 2.54.0