ChromaGaming/SimpleWarBackup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added constructor for selective backups

Browse source
This commit is contained in:
BuildTools 2018-09-13 13:31:40 +01:00
parent 7a5668b1d7
commit f69fb22f88
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/simpleWarBackup/Backup.java
View file

@ -15,7 +15,6 @@ import com.palmergames.bukkit.towny.object.Town;
import com.palmergames.bukkit.towny.object.TownBlock; import com.palmergames.bukkit.towny.object.TownBlock;
import com.palmergames.bukkit.towny.object.TownyUniverse; import com.palmergames.bukkit.towny.object.TownyUniverse;
import simpleWarBackup.RegionChunkList.Coord;
import simpleWarBackup.exceptions.NameCollisionException; import simpleWarBackup.exceptions.NameCollisionException;
/** /**
@ -46,17 +45,41 @@ public class Backup
* TODO write javadoc (this is the default constructor) * TODO write javadoc (this is the default constructor)
* *
* @param name * @param name
* @throws IOException
* @throws NameCollisionException * @throws NameCollisionException
*/ */
Backup(String name, Main plugin) throws NameCollisionException Backup(String name, Main plugin) throws IOException, NameCollisionException
{ {
checkName(this.name = name); //throws NameCollisionException checkName(this.name = name); //throws NameCollisionException
File folder = new File(plugin.getDataFolder(), name); directory = new File(plugin.getDataFolder(), name);
Server server = plugin.getServer(); Server server = plugin.getServer();
List<World> worlds = server.getWorlds(); List<World> worlds = server.getWorlds();
maketree(TownyUniverse.getDataSource().getTowns(), worlds, server, folder); maketree(TownyUniverse.getDataSource().getTowns(), worlds, server);
}
/**
* TODO write javadoc
*
* @param name
* @param plugin
* @throws IOException
* @throws NameCollisionException
*/
Backup(String name, Main plugin, String... townlist)
throws IOException, NameCollisionException
{
checkName(this.name = name); //throws NameCollisionException
directory = new File(plugin.getDataFolder(), name);
Server server = plugin.getServer();
List<World> worlds = server.getWorlds();
maketree(TownyUniverse.getDataSource().getTowns(townlist), worlds, server);
} }
@ -68,7 +91,7 @@ public class Backup
*/ */
private static void checkName(String name) throws NameCollisionException private static void checkName(String name) throws NameCollisionException
{ {
for (String filename : Main.backupsDir.list()) if (filename == name) for (String filename : Main.backupsDir.list()) if (filename.equals(name))
{ {
throw new NameCollisionException(); throw new NameCollisionException();
} }
@ -84,7 +107,7 @@ public class Backup
* @param folder * @param folder
* @throws IOException * @throws IOException
*/ */
private void maketree(List<Town> towns, List<World> worlds, Server server, File folder) throws IOException private void maketree(List<Town> towns, List<World> worlds, Server server) throws IOException
{ {
HashMap<String, HashMap<Coord, RegionChunkList>> townbranch; HashMap<String, HashMap<Coord, RegionChunkList>> townbranch;
HashMap<Coord, RegionChunkList> worldbranch; HashMap<Coord, RegionChunkList> worldbranch;
@ -95,8 +118,6 @@ public class Backup
String worldname; String worldname;
/* TODO
*/
for (Town town : towns) for (Town town : towns)
{ {
townbranch = new HashMap<String, HashMap<Coord, RegionChunkList>>(); townbranch = new HashMap<String, HashMap<Coord, RegionChunkList>>();
@ -119,10 +140,10 @@ public class Backup
coord = new Coord(x >> 5, z >> 5); coord = new Coord(x >> 5, z >> 5);
chunklist = worldbranch.get(coord); chunklist = worldbranch.get(coord);
//create if nonexistent //create chunk list if nonexistent
if (chunklist == null) if (chunklist == null)
{ {
File townDir = new File(folder, town.getUID().toString()); File townDir = new File(directory, town.getUID().toString());
File worldDir = new File(townDir, worldname); File worldDir = new File(townDir, worldname);
File chunksDir = new File(worldDir, "region chunk lists"); File chunksDir = new File(worldDir, "region chunk lists");
File chlistDir = new File(chunksDir, "r."+coord.x+"."+coord.z+".chunklist"); File chlistDir = new File(chunksDir, "r."+coord.x+"."+coord.z+".chunklist");

2
src/simpleWarBackup/RegionFile_Cache.java
View file

@ -20,7 +20,7 @@ public final class RegionFile_Cache
private static final Map<File, RegionFile> cache = new HashMap<File, RegionFile>(); private static final Map<File, RegionFile> cache = new HashMap<File, RegionFile>();
/** /**
* Returns name of the region file that would contain the given chunk coordinates. * Returns name of the region file that contains the given chunk coordinates.
* Name follows the standard minecraft format: "r.[region x].[region z].mca". * Name follows the standard minecraft format: "r.[region x].[region z].mca".
* Region coordinate = chunk coordinate >> 5. * Region coordinate = chunk coordinate >> 5.
* *