Move isMatch to FileWatcher to prevent file locks. (qzind#567)

miadigitalsolutions · Feb 13, 2020 · 506093c · 506093c
1 parent 1a3e93f
commit 506093c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/qz/communication/FileIO.java b/src/qz/communication/FileIO.java
@@ -77,7 +77,7 @@ public FileIO(Session session, JSONObject params, Path originalPath, Path absolu
         }
     }
 
-    private boolean isMatch(String fileName) {
+    public boolean isMatch(String fileName) {
         boolean match = inclusions.isEmpty();
         for (String inclusion : inclusions) {
             if(FilenameUtils.wildcardMatch(fileName, inclusion, caseSensitivity)) {
@@ -134,8 +134,6 @@ public void setWk(WatchKey wk) {
     }
 
     public void fileChanged(String fileName, String type, String fileData) {
-        if (!isMatch(fileName)) return;
-
         StreamEvent evt = new StreamEvent(StreamEvent.Stream.FILE, StreamEvent.Type.ACTION)
                 .withData("file", getOriginalPath().resolve(fileName))
                 .withData("eventType", type);

diff --git a/src/qz/utils/FileWatcher.java b/src/qz/utils/FileWatcher.java
@@ -72,6 +72,8 @@ public static void deregisterWatch(FileIO fileIO) {
     private synchronized static void fileChanged(Path path, String fileName, String type) {
         Path filePath = path.resolve(fileName);
         for(FileIO fio : fileIOs) {
+            if (!fio.isMatch(fileName)) continue;
+
             String fileData = null;
             if (fio.getAbsolutePath().equals(path.normalize().toAbsolutePath())) {
                 if (!type.equals("ENTRY_DELETE") && fio.returnsContents() && !Files.isDirectory(filePath)) {