TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 20:12:54 +00:00
Code Issues Projects Releases Wiki Activity

Optimize TextInput to cache motd and info textfiles.

Browse source
This commit is contained in:
snowleo 2012-01-16 04:51:27 +01:00
parent 81ec87d893
commit f26cccb663
2 changed files with 62 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
View file

@ -4,6 +4,7 @@ import com.earth2me.essentials.DescParseTickFormat;
import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -16,11 +17,13 @@ import org.bukkit.plugin.Plugin;
public class KeywordReplacer implements IText public class KeywordReplacer implements IText
{ {
private final transient IText input; private final transient IText input;
private final transient List<String> replaced;
private final transient IEssentials ess; private final transient IEssentials ess;
public KeywordReplacer(final IText input, final CommandSender sender, final IEssentials ess) public KeywordReplacer(final IText input, final CommandSender sender, final IEssentials ess)
{ {
this.input = input; this.input = input;
this.replaced = new ArrayList<String>(this.input.getLines().size());
this.ess = ess; this.ess = ess;
replaceKeywords(sender); replaceKeywords(sender);
} }
@ -120,14 +123,14 @@ public class KeywordReplacer implements IText
line = line.replace("{WORLDDATE}", worldDate); line = line.replace("{WORLDDATE}", worldDate);
line = line.replace("{PLUGINS}", plugins); line = line.replace("{PLUGINS}", plugins);
line = line.replace("{VERSION}", version); line = line.replace("{VERSION}", version);
input.getLines().set(i, line); replaced.add(line);
} }
} }
@Override @Override
public List<String> getLines() public List<String> getLines()
{ {
return input.getLines(); return replaced;
} }
@Override @Override

41
Essentials/src/com/earth2me/essentials/textreader/TextInput.java
View file

@ -4,6 +4,7 @@ import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util; import com.earth2me.essentials.Util;
import java.io.*; import java.io.*;
import java.lang.ref.SoftReference;
import java.util.*; import java.util.*;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -11,9 +12,11 @@ import org.bukkit.entity.Player;
public class TextInput implements IText public class TextInput implements IText
{ {
private final transient List<String> lines = new ArrayList<String>(); private final transient List<String> lines;
private final transient List<String> chapters = new ArrayList<String>(); private final transient List<String> chapters;
private final transient Map<String, Integer> bookmarks = new HashMap<String, Integer>(); private final transient Map<String, Integer> bookmarks;
private final transient long lastChange;
private final static HashMap<String, SoftReference<TextInput>> cache = new HashMap<String, SoftReference<TextInput>>();
public TextInput(final CommandSender sender, final String filename, final boolean createFile, final IEssentials ess) throws IOException public TextInput(final CommandSender sender, final String filename, final boolean createFile, final IEssentials ess) throws IOException
{ {
@ -33,6 +36,30 @@ public class TextInput implements IText
file = new File(ess.getDataFolder(), filename + ".txt"); file = new File(ess.getDataFolder(), filename + ".txt");
} }
if (file.exists()) if (file.exists())
{
lastChange = file.lastModified();
boolean readFromfile;
synchronized (cache)
{
final SoftReference<TextInput> inputRef = cache.get(file.getName());
TextInput input;
if (inputRef == null || (input = inputRef.get()) == null || input.lastChange < lastChange)
{
lines = new ArrayList<String>();
chapters = new ArrayList<String>();
bookmarks = new HashMap<String, Integer>();
cache.put(file.getName(), new SoftReference<TextInput>(this));
readFromfile = true;
}
else
{
lines = Collections.unmodifiableList(input.getLines());
chapters = Collections.unmodifiableList(input.getChapters());
bookmarks = Collections.unmodifiableMap(input.getBookmarks());
readFromfile = false;
}
}
if (readFromfile)
{ {
final BufferedReader bufferedReader = new BufferedReader(new FileReader(file)); final BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
try try
@ -59,8 +86,13 @@ public class TextInput implements IText
bufferedReader.close(); bufferedReader.close();
} }
} }
}
else else
{ {
lastChange = 0;
lines = Collections.emptyList();
chapters = Collections.emptyList();
bookmarks = Collections.emptyMap();
if (createFile) if (createFile)
{ {
final InputStream input = ess.getResource(filename + ".txt"); final InputStream input = ess.getResource(filename + ".txt");
@ -68,8 +100,7 @@ public class TextInput implements IText
try try
{ {
final byte[] buffer = new byte[1024]; final byte[] buffer = new byte[1024];
int length = 0; int length = input.read(buffer);
length = input.read(buffer);
while (length > 0) while (length > 0)
{ {
output.write(buffer, 0, length); output.write(buffer, 0, length);