honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug with NpmPackage ignoring files in root of package

This commit is contained in:
Grahame Grieve 2019-12-07 06:55:30 +11:00
parent a999f53700
commit c62848a886
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java vendored
View File

@ -189,23 +189,29 @@ public class NpmPackage {
File dir = new File(path);
for (File f : dir.listFiles()) {
if (f.isDirectory()) {
String d = f.getName();
if (!d.equals("package")) {
d = Utilities.path("package", d);
}
NpmPackageFolder folder = res.new NpmPackageFolder(d);
folder.folder = f;
res.folders.put(f.getName(), folder);
File ij = new File(Utilities.path(f.getAbsolutePath(), ".index.json"));
if (ij.exists()) {
try {
folder.readIndex(JsonTrackingParser.parseJson(ij));
} catch (Exception e) {
throw new IOException("Error parsing "+ij.getAbsolutePath()+": "+e.getMessage(), e);
if (!Utilities.existsInList(f.getName(), ".git", ".svn") && !Utilities.existsInList(f.getName(), exemptions)) {
if (f.isDirectory()) {
String d = f.getName();
if (!d.equals("package")) {
d = Utilities.path("package", d);
}
NpmPackageFolder folder = res.new NpmPackageFolder(d);
folder.folder = f;
res.folders.put(f.getName(), folder);
File ij = new File(Utilities.path(f.getAbsolutePath(), ".index.json"));
if (ij.exists()) {
try {
folder.readIndex(JsonTrackingParser.parseJson(ij));
} catch (Exception e) {
throw new IOException("Error parsing "+ij.getAbsolutePath()+": "+e.getMessage(), e);
}
}
loadSubFolders(res, dir.getAbsolutePath(), f);
} else {
NpmPackageFolder folder = res.new NpmPackageFolder("package/$root");
folder.folder = dir;
res.folders.put("package/$root", folder);
}
loadSubFolders(res, dir.getAbsolutePath(), f);
}
}
}