From bb11af20fdfd52baa9ccc2d6f685e29838297996 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 5 Mar 2020 22:16:35 +0100 Subject: [PATCH] improved recursive if scanning ignores --- .../java/org/hl7/fhir/validation/ValidationEngine.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java index 69b434d3a..cb18d3eb7 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java @@ -436,6 +436,8 @@ public class ValidationEngine implements IValidatorResourceFetcher { File f = new File(Utilities.path(src)); if (f.exists()) { + if(isIgnoreFile(f)) + return null; if (f.isDirectory() && new File(Utilities.path(src, "package.tgz")).exists()) return loadPackage(new FileInputStream(Utilities.path(src, "package.tgz")), Utilities.path(src, "package.tgz")); if (f.isDirectory() && new File(Utilities.path(src, "igpack.zip")).exists()) @@ -547,8 +549,10 @@ public class ValidationEngine implements IValidatorResourceFetcher { } private boolean isIgnoreFile(File ff) { - return Utilities.existsInList(ff.getName(), ".DS_Store") || Utilities.existsInList(Utilities.getFileExtension(ff.getName()).toLowerCase(), "md", "css", "js", "png", "gif", "jpg", "html", "tgz", "pack", "zip"); - + if (ff.getName().startsWith(".")|| ff.getAbsolutePath().contains(".git")){ + return true; + } + return Utilities.existsInList(Utilities.getFileExtension(ff.getName()).toLowerCase(), "md", "css", "js", "png", "gif", "jpg", "html", "tgz", "pack", "zip"); } private Map loadPackage(InputStream stream, String name) throws Exception {