EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

More tweaks to handling corrupt data for flat file

Browse Source
This commit is contained in:
nossr50 2021-03-11 14:48:21 -08:00
parent eb1e657af1
commit 91204262f5
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
View File

@ -384,8 +384,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
} }
} }
private void writeUserToLine(PlayerProfile profile, String playerName, UUID uuid, StringBuilder writer) { private void writeUserToLine(PlayerProfile profile, String playerName, @Nullable UUID uuid, StringBuilder writer) {
// FlyingMonkey_:0:::0:0:0:0:0:0:0:0:0:0:5:0:156:460:
writer.append(playerName).append(":"); writer.append(playerName).append(":");
writer.append(profile.getSkillLevel(PrimarySkillType.MINING)).append(":"); writer.append(profile.getSkillLevel(PrimarySkillType.MINING)).append(":");
writer.append(":"); writer.append(":");
@ -582,7 +581,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
// Update playerName in database after name change // Update playerName in database after name change
if (!rawSplitData[USERNAME_INDEX].equalsIgnoreCase(playerName)) { if (!rawSplitData[USERNAME_INDEX].equalsIgnoreCase(playerName)) {
//TODO: A proper fix for changed names //TODO: A proper fix for changed names
mcMMO.p.debug("Name change detected: " + rawSplitData[USERNAME_INDEX] + " => " + playerName); mcMMO.p.getLogger().info("Name change detected: " + rawSplitData[USERNAME_INDEX] + " => " + playerName);
rawSplitData[USERNAME_INDEX] = playerName; rawSplitData[USERNAME_INDEX] = playerName;
// updateRequired = true; //Flag profile to update // updateRequired = true; //Flag profile to update
} }
@ -931,6 +930,8 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
* Checks that the file is present and valid * Checks that the file is present and valid
*/ */
private void checkStructure() { private void checkStructure() {
boolean corruptDataFound = false;
if (usersFile.exists()) { if (usersFile.exists()) {
BufferedReader in = null; BufferedReader in = null;
FileWriter out = null; FileWriter out = null;
@ -938,7 +939,7 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
synchronized (fileWritingLock) { synchronized (fileWritingLock) {
try { try {
boolean corruptDataNotice = false;
in = new BufferedReader(new FileReader(usersFilePath)); in = new BufferedReader(new FileReader(usersFilePath));
StringBuilder writer = new StringBuilder(); StringBuilder writer = new StringBuilder();
String line; String line;
@ -958,11 +959,17 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
String[] rawSplitData = line.split(":"); String[] rawSplitData = line.split(":");
//Not enough data found to have a name so we remove the data //Not enough data found to be considered a user reliably (NOTE: not foolproof)
if(rawSplitData.length < USERNAME_INDEX + 1) { if(rawSplitData.length < (UUID_INDEX + 1)) {
if(!corruptDataNotice) { if(!corruptDataFound) {
mcMMO.p.getLogger().severe("Removing corrupt data from mcmmo.users"); mcMMO.p.getLogger().severe("Removing corrupt data from mcmmo.users");
corruptDataNotice = true; corruptDataFound = true;
}
if(rawSplitData.length >= 10 //The value here is kind of arbitrary, it shouldn't be too low to avoid false positives, but also we aren't really going to correctly identify when player data has been corrupted or not with 100% accuracy ever
&& rawSplitData[0] != null && !rawSplitData[0].isEmpty()) {
//This user may have had a name so declare it
mcMMO.p.getLogger().severe("Not enough data found to recover corrupted player data for user: "+rawSplitData[0]);
} }
continue; continue;
@ -991,10 +998,14 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
//Correctly size the data (null entries for missing values) //Correctly size the data (null entries for missing values)
if(line.length() < DATA_ENTRY_COUNT) { //TODO: Test this condition if(line.length() < DATA_ENTRY_COUNT) { //TODO: Test this condition
String[] correctSizeSplitData = Arrays.copyOf(rawSplitData, DATA_ENTRY_COUNT); String[] correctSizeSplitData = Arrays.copyOf(rawSplitData, DATA_ENTRY_COUNT);
line = org.apache.commons.lang.StringUtils.join(rawSplitData, ":") + ":"; line = org.apache.commons.lang.StringUtils.join(correctSizeSplitData, ":") + ":";
rawSplitData = line.split(":");
PlayerProfile temporaryProfile = loadFromLine(rawSplitData);
writeUserToLine(temporaryProfile, rawSplitData[USERNAME_INDEX], temporaryProfile.getUniqueId(), writer);
} else {
writer.append(line).append("\r\n");
} }
writer.append(line).append("\r\n");
} }
// Write the new file // Write the new file
@ -1024,13 +1035,9 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
} }
} }
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_FISHING); if(corruptDataFound)
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_BLAST_MINING_COOLDOWN); mcMMO.p.getLogger().info("Corrupt data was found and removed, everything should be working fine. It is possible some player data was lost.");
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_SQL_INDEXES);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_MOB_HEALTHBARS);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SQL_PARTY_NAMES);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.DROP_SPOUT);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_ALCHEMY);
return; return;
} }
@ -1153,9 +1160,9 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
} }
} }
private void tryLoadSkillFloatValuesFromRawData(@NotNull Map<PrimarySkillType, Float> skillMap, @NotNull String[] character, @NotNull PrimarySkillType primarySkillType, int expTaming, @NotNull String userName) { private void tryLoadSkillFloatValuesFromRawData(@NotNull Map<PrimarySkillType, Float> skillMap, @NotNull String[] character, @NotNull PrimarySkillType primarySkillType, int index, @NotNull String userName) {
try { try {
float valueFromString = Integer.parseInt(character[expTaming]); float valueFromString = Integer.parseInt(character[index]);
skillMap.put(primarySkillType, valueFromString); skillMap.put(primarySkillType, valueFromString);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
skillMap.put(primarySkillType, 0F); skillMap.put(primarySkillType, 0F);
@ -1164,9 +1171,9 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
} }
} }
private void tryLoadSkillIntValuesFromRawData(@NotNull Map<PrimarySkillType, Integer> skillMap, @NotNull String[] character, @NotNull PrimarySkillType primarySkillType, int expTaming, @NotNull String userName) { private void tryLoadSkillIntValuesFromRawData(@NotNull Map<PrimarySkillType, Integer> skillMap, @NotNull String[] character, @NotNull PrimarySkillType primarySkillType, int index, @NotNull String userName) {
try { try {
int valueFromString = Integer.parseInt(character[expTaming]); int valueFromString = Integer.parseInt(character[index]);
skillMap.put(primarySkillType, valueFromString); skillMap.put(primarySkillType, valueFromString);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
skillMap.put(primarySkillType, 0); skillMap.put(primarySkillType, 0);