Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-11 09:51:43 +01:00
Code Issues Projects Releases Wiki Activity

Fixed ResourceSvc file write if no directory exists

Browse Source
This commit is contained in:
Risto Lahtela 2020-03-21 16:01:15 +02:00
parent b7c84980e3
commit 6470832ef6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResourceSvc.java
View File

@ -35,6 +35,7 @@ import java.io.IOException;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.OpenOption; import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.util.*; import java.util.*;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -171,7 +172,9 @@ public class ResourceSvc implements ResourceService {
WebResource original = source.get(); WebResource original = source.get();
byte[] bytes = original.asBytes(); byte[] bytes = original.asBytes();
OpenOption[] overwrite = {StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE}; OpenOption[] overwrite = {StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE};
Files.write(files.getCustomizationDirectory().resolve(fileName), bytes, overwrite); Path to = files.getCustomizationDirectory().resolve(fileName);
Files.createDirectories(to.getParent());
Files.write(to, bytes, overwrite);
return original; return original;
} }

5
Plan/common/src/main/java/com/djrapitops/plan/settings/config/ResourceSettings.java
View File

@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import java.io.IOException; import java.io.IOException;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
import java.util.Collections;
public class ResourceSettings { public class ResourceSettings {
@ -33,13 +34,17 @@ public class ResourceSettings {
public boolean shouldBeCustomized(String plugin, String fileName) { public boolean shouldBeCustomized(String plugin, String fileName) {
ConfigNode fileCustomization = config.getNode("Customized_files").orElseGet(() -> config.addNode("Customized_files")); ConfigNode fileCustomization = config.getNode("Customized_files").orElseGet(() -> config.addNode("Customized_files"));
fileCustomization.setComment(Collections.singletonList("The files are placed in /Plan/web/ if the setting is 'true' when accessed."));
ConfigNode pluginCustomization = fileCustomization.getNode(plugin).orElseGet(() -> fileCustomization.addNode(plugin)); ConfigNode pluginCustomization = fileCustomization.getNode(plugin).orElseGet(() -> fileCustomization.addNode(plugin));
String fileNameNonPath = StringUtils.replaceChars(fileName, '.', ','); String fileNameNonPath = StringUtils.replaceChars(fileName, '.', ',');
if (pluginCustomization.contains(fileNameNonPath)) { if (pluginCustomization.contains(fileNameNonPath)) {
return pluginCustomization.getBoolean(fileNameNonPath); return pluginCustomization.getBoolean(fileNameNonPath);
} else { } else {
pluginCustomization.set(fileNameNonPath, false); pluginCustomization.set(fileNameNonPath, false);
try { try {
pluginCustomization.sort();
pluginCustomization.save(); pluginCustomization.save();
} catch (IOException e) { } catch (IOException e) {
throw new UncheckedIOException("Could not save config.yml: " + e.getMessage(), e); throw new UncheckedIOException("Could not save config.yml: " + e.getMessage(), e);