Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added .tar and .tar.* support, *maybe*.

Browse Source
This commit is contained in:
sk89q 2010-11-05 22:50:22 -07:00
parent 49739bab76
commit 5fc97f0f7d
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/WorldEditListener.java
View File

@ -1098,6 +1098,9 @@ public class WorldEditListener extends PluginListener {
try {
chunkStore = snapshot.getChunkStore();
player.print("Snapshot '" + snapshot.getName() + "' loaded; now restoring...");
} catch (DataException e) {
player.printError("Failed to load snapshot: " + e.getMessage());
return true;
} catch (IOException e) {
player.printError("Failed to load snapshot: " + e.getMessage());
return true;

10
src/com/sk89q/worldedit/snapshots/Snapshot.java
View File

@ -54,13 +54,21 @@ public class Snapshot {
* @return
* @throws IOException
*/
public ChunkStore getChunkStore() throws IOException {
public ChunkStore getChunkStore() throws IOException, DataException {
if (file.getName().toLowerCase().endsWith(".zip")) {
try {
return new TrueZipAlphaChunkStore(file);
} catch (NoClassDefFoundError e) {
return new ZippedAlphaChunkStore(file);
}
} else if (file.getName().toLowerCase().endsWith(".tar.bz2")
|| file.getName().toLowerCase().endsWith(".tar.gz")
|| file.getName().toLowerCase().endsWith(".tar")) {
try {
return new TrueZipAlphaChunkStore(file);
} catch (NoClassDefFoundError e) {
throw new DataException("TrueZIP is required for .tar support");
}
} else {
return new AlphaChunkStore(file);
}

25
src/com/sk89q/worldedit/snapshots/SnapshotRepository.java
View File

@ -61,9 +61,7 @@ public class SnapshotRepository {
FilenameFilter filter = new FilenameFilter() {
public boolean accept(File dir, String name) {
File f = new File(dir, name);
return (name.toLowerCase().endsWith(".zip")
&& f.isFile())
|| f.isDirectory();
return isValidSnapshot(f);
}
};
@ -105,17 +103,30 @@ public class SnapshotRepository {
* Check to see if a snapshot is valid.
*
* @param dir
* @param snapshot
* @return whether it is a valid snapshot
*/
public boolean isValidSnapshotName(String snapshot) {
if (!snapshot.matches("[A-Za-z0-9_\\-,.\\[\\]\\(\\) ]{1,50}")) {
return isValidSnapshot(new File(dir, snapshot));
}
/**
* Check to see if a snapshot is valid.
*
* @param f
* @return whether it is a valid snapshot
*/
public boolean isValidSnapshot(File f) {
if (!f.getName().matches("[A-Za-z0-9_\\-,.\\[\\]\\(\\) ]{1,50}")) {
return false;
}
File f = new File(dir, snapshot);
return (f.isDirectory() && (new File(f, "level.dat")).exists())
|| (f.isFile() && f.getName().toLowerCase().endsWith((".zip")));
|| (f.isFile() && (
f.getName().toLowerCase().endsWith(".zip")
|| f.getName().toLowerCase().endsWith(".tar.bz2")
|| f.getName().toLowerCase().endsWith(".tar.gz")
|| f.getName().toLowerCase().endsWith(".tar")
));
}
/**