Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2024-12-28 17:48:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve backup logic

Browse Source
This commit is contained in:
GeorgH93 2018-07-25 18:49:54 +02:00
parent 2156e0d6b7
commit 8b883ec2e3
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Database.java
View File

@ -32,12 +32,16 @@
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.FileOutputStream;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -62,7 +66,6 @@ public Database(Minepacks mp)
bungeeCordMode = plugin.getConfiguration().isBungeeCordModeEnabled();
maxAge = plugin.getConfiguration().getAutoCleanupMaxInactiveDays();
unCacheStrategie = bungeeCordMode ? new OnDisconnect(this) : UnCacheStrategie.getUnCacheStrategie(this);
backupFolder = new File(this.plugin.getDataFolder(), "backups");
}
@ -114,26 +117,49 @@ public static Database getDatabase(Minepacks plugin)
return database;
}
public void backup(Backpack backpack)
public void backup(@NotNull Backpack backpack)
{
writeBackup(getPlayerNameOrUUID(backpack.getOwner()), itsSerializer.getUsedSerializer(), itsSerializer.serialize(backpack.getInventory()));
writeBackup(backpack.getOwner().getName(), getPlayerNameOrUUID(backpack.getOwner()), itsSerializer.getUsedSerializer(), itsSerializer.serialize(backpack.getInventory()));
}
public void writeBackup(final String userIdentifier, final int usedSerializer, final byte[] data)
protected void writeBackup(@Nullable String userName, @NonNls String userIdentifier, final int usedSerializer, final @NotNull byte[] data)
{
File save = new File(backupFolder, userIdentifier + "_" + System.currentTimeMillis() + Files.EXT);
if(userIdentifier.equalsIgnoreCase(userName)) userName = null;
if(userName != null) userIdentifier = userName + "_" + userIdentifier;
final File save = new File(backupFolder, userIdentifier + "_" + System.currentTimeMillis() + Files.EXT);
try(FileOutputStream fos = new FileOutputStream(save))
{
fos.write(usedSerializer);
fos.write(data);
plugin.getLogger().info("Backup of the backpack has been created: " + save.getAbsolutePath());
}
catch(Exception e2)
catch(Exception e)
{
plugin.getLogger().warning("Failed to write backup! Error: " + e2.getMessage());
plugin.getLogger().warning("Failed to write backup! Error: " + e.getMessage());
}
}
public @Nullable ItemStack[] loadBackup(final String backupName)
{
File backup = new File(backupFolder, backupName + Files.EXT);
return Files.readFile(itsSerializer, backup, plugin.getLogger());
}
public Collection<String> getBackups()
{
File[] files = backupFolder.listFiles((dir, name) -> name.endsWith(Files.EXT));
List<String> backups = new LinkedList<>();
if(files != null)
{
for(File file : files)
{
if(!file.isFile()) continue;
backups.add(file.getName().replaceAll(Files.EXT_REGEX, ""));
}
}
return backups;
}
protected String getPlayerNameOrUUID(OfflinePlayer player)
{
if(useUUIDs)

4
src/at/pcgamingfreaks/Minepacks/Bukkit/Database/SQL.java
View File

@ -325,7 +325,7 @@ public void saveBackpack(final Backpack backpack)
else
{
plugin.getLogger().warning("Failed saving backpack for: " + name + " (Unable to get players ID from database)");
writeBackup(nameOrUUID, usedSerializer, data);
writeBackup(name, nameOrUUID, usedSerializer, data);
}
}
}
@ -339,7 +339,7 @@ public void saveBackpack(final Backpack backpack)
{
plugin.getLogger().warning("Failed to save backpack in database! Error: " + e.getMessage());
e.printStackTrace();
writeBackup(nameOrUUID, usedSerializer, data);
writeBackup(name, nameOrUUID, usedSerializer, data);
}
});
}