demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 19:55:48 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

[automation] Improve file extension exclusion (#1370)

Browse Source 
This change improves the way file extensions are excluded from ScriptFileWatcher. Discussed [here](https://github.com/openhab/openhab-core/pull/1367#discussion_r379914147).

Signed-off-by: Scott Rushworth <openhab@5iver.com>
This commit is contained in:
Scott Rushworth 2020-02-27 06:50:50 -05:00 committed by GitHub
parent 2bb50f8255
commit 5710532b05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/loader/ScriptFileWatcher.java
View File

@ -25,6 +25,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.WatchEvent;
import java.nio.file.WatchEvent.Kind;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Map;
@ -52,6 +53,8 @@ import org.osgi.service.component.annotations.Reference;
*/
@Component(immediate = true)
public class ScriptFileWatcher extends AbstractWatchService {
private static final Set<String> EXCLUDED_FILE_EXTENSIONS = new HashSet<>(
Arrays.asList("txt", "old", "example", "backup", "md", "swp", "tmp", "bak"));
private static final String FILE_DIRECTORY = "automation" + File.separator + "jsr223";
private static final long INITIAL_DELAY = 25;
private static final long RECHECK_INTERVAL = 20;
@ -222,14 +225,14 @@ public class ScriptFileWatcher extends AbstractWatchService {
private String getScriptType(URL url) {
String fileName = url.getPath();
int idx = fileName.lastIndexOf(".");
if (idx == -1) {
int index = fileName.lastIndexOf(".");
if (index == -1) {
return null;
}
String fileExtension = fileName.substring(idx + 1);
String fileExtension = fileName.substring(index + 1);
// ignore known file extensions for "temp" files
if (fileExtension.equals("txt") || fileExtension.endsWith("~") || fileExtension.endsWith("swp")) {
if (EXCLUDED_FILE_EXTENSIONS.contains(fileExtension) || fileExtension.endsWith("~")) {
return null;
}
return fileExtension;