Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AddonInfoAddonsXmlProvider check for missing folder #3903

Merged
merged 3 commits into from
Dec 7, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,18 @@ public Set<AddonInfo> getAddonInfos(@Nullable Locale locale) {
}

private void initialize() {
File fileFolder = new File(folder);
try {
if (!fileFolder.isDirectory()) {
logger.warn("Folder '{}' does not exist", folder);
andrewfg marked this conversation as resolved.
Show resolved Hide resolved
return;
}
} catch (SecurityException e) {
logger.warn("Folder '{}' security exception", folder);
andrewfg marked this conversation as resolved.
Show resolved Hide resolved
return;
}
AddonInfoListReader reader = new AddonInfoListReader();
Stream.of(new File(folder).listFiles()).filter(f -> f.isFile() && f.getName().endsWith(".xml")).forEach(f -> {
Stream.of(fileFolder.listFiles()).filter(f -> f.isFile() && f.getName().endsWith(".xml")).forEach(f -> {
try {
String xml = Files.readString(f.toPath());
if (xml != null && !xml.isBlank()) {
Expand All @@ -94,6 +104,8 @@ private void initialize() {
logger.warn("File '{}' has invalid content", f.getName());
} catch (XStreamException e) {
logger.warn("File '{}' could not be deserialized", f.getName());
} catch (SecurityException e) {
logger.warn("File '{}' security exception", f.getName());
andrewfg marked this conversation as resolved.
Show resolved Hide resolved
}
});
}
Expand Down