trafficlunar/options-profiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more logging to copying and deleting files

Browse source
This commit is contained in:
axolotlmaid 2024-07-16 20:53:04 +01:00
parent 427b961fb0
commit 3a8f3695f6
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/src/main/java/com/axolotlmaid/optionsprofiles/profiles/Profiles.java
View file

@ -93,6 +93,7 @@ public class Profiles {
try { try {
Files.copy(options, profileOptions); Files.copy(options, profileOptions);
OptionsProfilesMod.LOGGER.info("[Profile '{}']: Copied file '{}'", profile.getFileName().toString(), options.getFileName().toString());
} catch (IOException e) { } catch (IOException e) {
OptionsProfilesMod.LOGGER.error("[Profile '{}']: Unable to copy '{}'", profile.getFileName().toString(), options.getFileName().toString(), e); OptionsProfilesMod.LOGGER.error("[Profile '{}']: Unable to copy '{}'", profile.getFileName().toString(), options.getFileName().toString(), e);
} }
@ -103,14 +104,19 @@ public class Profiles {
Path profile = PROFILES_DIRECTORY.resolve(profileName); Path profile = PROFILES_DIRECTORY.resolve(profileName);
Path profileOptions = profile.resolve("options.txt"); Path profileOptions = profile.resolve("options.txt");
ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
if (overwriting) { if (overwriting) {
try { try (Stream<Path> files = Files.list(profile)) {
// Removes old option files files.filter(file -> !file.getFileName().toString().equals("configuration.json"))
FileUtils.cleanDirectory(profile.toFile()); .forEach(file -> {
try {
Files.delete(file);
OptionsProfilesMod.LOGGER.info("[Profile '{}']: Deleted file '{}'", profileName, file.getFileName().toString());
} catch (IOException e) {
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when trying to delete the file '{}'", profileName, file.getFileName().toString(), e);
}
});
} catch (IOException e) { } catch (IOException e) {
OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when clearing old options files", profileName, e); OptionsProfilesMod.LOGGER.error("[Profile '{}']: An error occurred when deleting old options files.", profileName, e);
} }
} }
@ -122,6 +128,8 @@ public class Profiles {
copyOptionFile(profile, DISTANT_HORIZONS_OPTIONS_FILE); copyOptionFile(profile, DISTANT_HORIZONS_OPTIONS_FILE);
if (!overwriting) { if (!overwriting) {
ProfileConfiguration profileConfiguration = ProfileConfiguration.get(profileName);
// Add every option value to configuration // Add every option value to configuration
try (Stream<String> lines = Files.lines(profileOptions)) { try (Stream<String> lines = Files.lines(profileOptions)) {
List<String> optionsToLoad = profileConfiguration.getOptionsToLoad(); List<String> optionsToLoad = profileConfiguration.getOptionsToLoad();