lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed HTML loading issue.

Browse Source 
Author: Zoey76
Source: 3479827c55
This commit is contained in:
MobiusDevelopment
2019-04-08 15:48:31 +00:00
parent e002b6d8d0
commit 117572ff57
97 changed files with 748 additions and 1722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
View File

@@ -874,6 +874,7 @@ public final class Config
public static String CLAN_NAME_TEMPLATE;
public static int MAX_CHARACTERS_NUMBER_PER_ACCOUNT;
public static File DATAPACK_ROOT;
public static File SCRIPT_ROOT;
public static boolean ACCEPT_ALTERNATE_ID;
public static int REQUEST_ID;
public static boolean RESERVE_HOST_ON_LOGIN = false;
@@ -1404,6 +1405,16 @@ public final class Config
DATAPACK_ROOT = new File(".");
}
try
{
SCRIPT_ROOT = new File(serverSettings.getString("ScriptRoot", "./data/scripts").replaceAll("\\\\", "/")).getCanonicalFile();
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, "Error setting script root!", e);
SCRIPT_ROOT = new File(".");
}
Pattern charNamePattern;
try

68
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/cache/HtmCache.java vendored
View File

@@ -29,10 +29,10 @@ import com.l2jmobius.Config;
import com.l2jmobius.commons.util.file.filter.HTMLFilter;
import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import com.l2jmobius.gameserver.util.BuilderUtil;
import com.l2jmobius.gameserver.util.Util;
/**
* @author Layane
* @author Zoey76
*/
public class HtmCache
{
@@ -40,7 +40,7 @@ public class HtmCache
private static final HTMLFilter HTML_FILTER = new HTMLFilter();
private static final Map<String, String> _cache = Config.LAZY_CACHE ? new ConcurrentHashMap<>() : new HashMap<>();
private static final Map<String, String> HTML_CACHE = Config.LAZY_CACHE ? new ConcurrentHashMap<>() : new HashMap<>();
private int _loadedFiles;
private long _bytesBuffLen;
@@ -61,14 +61,14 @@ public class HtmCache
{
LOGGER.info("Html cache start...");
parseDir(f);
LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded");
LOGGER.info("Cache[HTML]: " + String.format("%.3f", getMemoryUsage()) + " megabytes on " + _loadedFiles + " files loaded.");
}
else
{
_cache.clear();
HTML_CACHE.clear();
_loadedFiles = 0;
_bytesBuffLen = 0;
LOGGER.info("Cache[HTML]: Running lazy cache");
LOGGER.info("Cache[HTML]: Running lazy cache.");
}
}
@@ -114,19 +114,18 @@ public class HtmCache
return null;
}
final String relpath = Util.getRelativePath(Config.DATAPACK_ROOT, file);
String content = null;
try (FileInputStream fis = new FileInputStream(file);
BufferedInputStream bis = new BufferedInputStream(fis))
{
final int bytes = bis.available();
final byte[] raw = new byte[bytes];
byte[] raw = new byte[bytes];
bis.read(raw);
content = new String(raw, "UTF-8");
content = content.replaceAll("(?s)<!--.*?-->", ""); // Remove html comments
final String oldContent = _cache.put(relpath, content);
final String oldContent = HTML_CACHE.put(file.toURI().getPath().substring(Config.DATAPACK_ROOT.toURI().getPath().length()), content);
if (oldContent == null)
{
_bytesBuffLen += bytes;
@@ -139,63 +138,36 @@ public class HtmCache
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, "Problem with htm file " + e.getMessage(), e);
}
return content;
}
public String getHtmForce(PlayerInstance player, String path)
{
String content = getHtm(player, path);
if (content == null)
{
content = "<html><body>My text is missing:<br>" + path + "</body></html>";
LOGGER.warning("Cache[HTML]: Missing HTML page: " + path);
LOGGER.log(Level.WARNING, "Problem with htm file:", e);
}
return content;
}
public String getHtm(PlayerInstance player, String path)
{
final String prefix = player != null ? player.getHtmlPrefix() : "en";
String newPath = null;
String content;
if ((prefix != null) && !prefix.isEmpty())
final String prefix = player != null ? player.getHtmlPrefix() : "";
final String newPath = prefix + path;
String content = HTML_CACHE.get(newPath);
if (Config.LAZY_CACHE && (content == null))
{
newPath = prefix + path;
content = getHtm(newPath);
if (content != null)
content = loadFile(new File(Config.DATAPACK_ROOT, newPath));
if (content == null)
{
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{
BuilderUtil.sendHtmlMessage(player, newPath.substring(5));
}
return content;
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
content = getHtm(path);
if ((content != null) && (newPath != null))
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{
_cache.put(newPath, content);
BuilderUtil.sendHtmlMessage(player, newPath.substring(5));
}
if ((player != null) && player.isGM() && (path != null) && Config.GM_DEBUG_HTML_PATHS)
{
BuilderUtil.sendHtmlMessage(player, path.substring(5));
}
return content;
}
private String getHtm(String path)
{
// TODO: Check why some files do not get in cache on server startup.
return (path == null) || path.isEmpty() ? "" : _cache.get(path) == null ? loadFile(new File(Config.DATAPACK_ROOT, path)) : _cache.get(path);
}
public boolean contains(String path)
{
return _cache.containsKey(path);
return HTML_CACHE.containsKey(path);
}
/**
@@ -209,11 +181,11 @@ public class HtmCache
public static HtmCache getInstance()
{
return SingletonHolder._instance;
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final HtmCache _instance = new HtmCache();
protected static final HtmCache INSTANCE = new HtmCache();
}
}

7
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/Npc.java
View File

@@ -844,12 +844,9 @@ public class Npc extends Creature
return temp;
}
}
else
else if (HtmCache.getInstance().isLoadable(temp))
{
if (HtmCache.getInstance().isLoadable(temp))
{
return temp;
}
return temp;
}
// If the file is not found, the standard message "I have nothing to say to you" is returned

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -415,7 +415,7 @@ public final class PlayerInstance extends Playable
private Calendar _createDate = Calendar.getInstance();
private String _lang = null;
private String _htmlPrefix = null;
private String _htmlPrefix = "";
private volatile boolean _isOnline = false;
private long _onlineTime;
@@ -13718,7 +13718,7 @@ public final class PlayerInstance extends Playable
public String getHtmlPrefix()
{
return Config.MULTILANG_ENABLE ? _htmlPrefix : null;
return Config.MULTILANG_ENABLE ? _htmlPrefix : "";
}
public String getLang()
@@ -13746,7 +13746,7 @@ public final class PlayerInstance extends Playable
else
{
_lang = null;
_htmlPrefix = null;
_htmlPrefix = "";
}
return result;

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -2491,7 +2491,7 @@ public class Quest extends AbstractScript implements IIdentifiable
content = hc.getHtm(player, "data/scripts/" + getPath() + "/" + fileName);
if (content == null)
{
content = hc.getHtmForce(player, "data/scripts/quests/" + getName() + "/" + fileName);
content = hc.getHtm(player, "data/scripts/quests/" + getName() + "/" + fileName);
}
}
return content;

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/ScriptEngineManager.java
View File

@@ -50,7 +50,7 @@ import com.l2jmobius.gameserver.scripting.java.JavaScriptingEngine;
public final class ScriptEngineManager implements IXmlReader
{
private static final Logger LOGGER = Logger.getLogger(ScriptEngineManager.class.getName());
public static final Path SCRIPT_FOLDER = Paths.get(Config.DATAPACK_ROOT.getAbsolutePath(), "data", "scripts");
public static final Path SCRIPT_FOLDER = Config.SCRIPT_ROOT.toPath();
public static final Path MASTER_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "MasterHandler.java");
public static final Path EFFECT_MASTER_HANDLER_FILE = Paths.get(SCRIPT_FOLDER.toString(), "handlers", "EffectMasterHandler.java");
@@ -201,7 +201,7 @@ public final class ScriptEngineManager implements IXmlReader
final Map<Path, Throwable> invokationErrors = _javaExecutionContext.executeScripts(files);
for (Entry<Path, Throwable> entry : invokationErrors.entrySet())
{
{
LOGGER.log(Level.WARNING, "ScriptEngine: " + entry.getKey() + " failed execution!", entry.getValue());
}
}