-
-
Notifications
You must be signed in to change notification settings - Fork 21
GH-959 Move warp contents from language files. #1172
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
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6483164
GH-959 Move warp contents from language files.
vLuckyyy d9617b8
Fix.
vLuckyyy c07228c
Improve error handling. use `ReentrantReadWriteLock`
vLuckyyy e966737
Merge branch 'master' into move-warp-inventory-from-language
vLuckyyy 95291e3
Apply review feedback.
vLuckyyy 4994bf9
Refactor WarpInventory and WarpInventoryConfigService for improved as…
vLuckyyy 4beb1b5
Merge branch 'refs/heads/master' into move-warp-inventory-from-language
vLuckyyy 85d4c99
Refactor Warp-related classes and services for improved configuration…
vLuckyyy b265477
Refactor WarpInventory-related components for consistent formatting, …
vLuckyyy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
178 changes: 178 additions & 0 deletions
178
...e/core/configuration/migrations/Migration_0035_Move_warp_inventory_to_dedicated_file.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| package com.eternalcode.core.configuration.migrations; | ||
|
|
||
| import eu.okaeri.configs.OkaeriConfig; | ||
| import eu.okaeri.configs.migrate.ConfigMigration; | ||
| import eu.okaeri.configs.migrate.view.RawConfigView; | ||
| import java.io.File; | ||
| import java.io.FileReader; | ||
| import java.io.FileWriter; | ||
| import java.io.IOException; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
| import lombok.NonNull; | ||
| import org.yaml.snakeyaml.DumperOptions; | ||
| import org.yaml.snakeyaml.Yaml; | ||
|
|
||
| public class Migration_0035_Move_warp_inventory_to_dedicated_file implements ConfigMigration { | ||
|
|
||
| private static final String ROOT_KEY = "warpInventory"; | ||
| private static final String NESTED_KEY = "warp.warpInventory"; | ||
| private static final String NESTED_SECTION = "warp"; | ||
|
|
||
| @Override | ||
| public boolean migrate(@NonNull OkaeriConfig config, @NonNull RawConfigView view) { | ||
| String foundKey = null; | ||
| Map<String, Object> warpInventory = this.getFromView(view, ROOT_KEY); | ||
|
|
||
| if (warpInventory != null) { | ||
| foundKey = ROOT_KEY; | ||
| } | ||
| else { | ||
| warpInventory = this.getFromView(view, NESTED_KEY); | ||
| if (warpInventory != null) { | ||
| foundKey = NESTED_KEY; | ||
| } | ||
| } | ||
|
|
||
| if (warpInventory == null) { | ||
| warpInventory = this.getFromFileFallback(config); | ||
| } | ||
|
|
||
| if (warpInventory == null) { | ||
| return false; | ||
| } | ||
|
|
||
| Map<String, Object> newContent = this.transformData(warpInventory); | ||
|
|
||
| if (!this.saveNewConfig(config, newContent)) { | ||
| return false; | ||
| } | ||
|
|
||
| if (foundKey != null) { | ||
| view.remove(foundKey); | ||
| } | ||
| else { | ||
| view.remove(ROOT_KEY); | ||
| view.remove(NESTED_KEY); | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| private Map<String, Object> getFromView(RawConfigView view, String key) { | ||
| if (!view.exists(key)) { | ||
| return null; | ||
| } | ||
| Object obj = view.get(key); | ||
| return obj instanceof Map ? (Map<String, Object>) obj : null; | ||
| } | ||
|
|
||
| private Map<String, Object> getFromFileFallback(OkaeriConfig config) { | ||
| File bindFile = config.getBindFile().toFile(); | ||
| if (bindFile == null || !bindFile.exists()) { | ||
| return null; | ||
| } | ||
|
|
||
| try (FileReader reader = new FileReader(bindFile)) { | ||
| Map<String, Object> content = new Yaml().load(reader); | ||
| if (content == null) { | ||
| return null; | ||
| } | ||
|
|
||
| if (content.containsKey(ROOT_KEY) && content.get(ROOT_KEY) instanceof Map) { | ||
| return (Map<String, Object>) content.get(ROOT_KEY); | ||
| } | ||
|
|
||
| if (content.containsKey(NESTED_SECTION) && content.get(NESTED_SECTION) instanceof Map) { | ||
| Map<String, Object> warpSection = (Map<String, Object>) content.get(NESTED_SECTION); | ||
| if (warpSection.containsKey(ROOT_KEY) && warpSection.get(ROOT_KEY) instanceof Map) { | ||
| return (Map<String, Object>) warpSection.get(ROOT_KEY); | ||
| } | ||
| } | ||
| } | ||
| catch (Exception exception) { | ||
| exception.printStackTrace(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private Map<String, Object> transformData(Map<String, Object> source) { | ||
| Map<String, Object> result = new LinkedHashMap<>(); | ||
|
|
||
| if (source.containsKey("title")) { | ||
| Map<String, Object> display = new LinkedHashMap<>(); | ||
| display.put("title", source.get("title")); | ||
| result.put("display", display); | ||
| } | ||
|
|
||
| this.copyIfPresent(source, result, "items"); | ||
| this.copyIfPresent(source, result, "border"); | ||
| this.copyIfPresent(source, result, "decorationItems"); | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| private void copyIfPresent(Map<String, Object> source, Map<String, Object> target, String key) { | ||
| if (source.containsKey(key)) { | ||
| target.put(key, source.get(key)); | ||
| } | ||
| } | ||
|
|
||
| private boolean saveNewConfig(OkaeriConfig config, Map<String, Object> content) { | ||
| File destFile = this.getDestinationFile(config); | ||
| if (destFile == null) { | ||
| return false; | ||
| } | ||
|
|
||
| if (destFile.exists() && !this.targetIsSafeToWrite(destFile)) { | ||
| return true; | ||
| } | ||
|
|
||
| if (!destFile.getParentFile().exists()) { | ||
| destFile.getParentFile().mkdirs(); | ||
| } | ||
|
|
||
| DumperOptions options = new DumperOptions(); | ||
| options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); | ||
| options.setPrettyFlow(true); | ||
| options.setIndent(2); | ||
| options.setIndicatorIndent(0); | ||
| options.setSplitLines(false); | ||
|
|
||
| try (FileWriter writer = new FileWriter(destFile)) { | ||
| new Yaml(options).dump(content, writer); | ||
| return true; | ||
| } | ||
| catch (IOException e) { | ||
| e.printStackTrace(); | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| private File getDestinationFile(OkaeriConfig config) { | ||
| File bindFile = config.getBindFile().toFile(); | ||
| if (bindFile == null) { | ||
| return null; | ||
| } | ||
| File dataFolder = bindFile.getParentFile(); | ||
| if ("lang".equals(dataFolder.getName())) { | ||
| dataFolder = dataFolder.getParentFile(); | ||
| } | ||
| return new File(dataFolder, "warp-inventory.yml"); | ||
| } | ||
|
|
||
| private boolean targetIsSafeToWrite(File file) { | ||
| try (FileReader reader = new FileReader(file)) { | ||
| Map<String, Object> existing = new Yaml().load(reader); | ||
| if (existing == null || !existing.containsKey("items")) { | ||
| return true; | ||
| } | ||
| Object items = existing.get("items"); | ||
| return items instanceof Map && ((Map<?, ?>) items).isEmpty(); | ||
| } | ||
| catch (Exception exception) { | ||
| exception.printStackTrace(); | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.