private static final Logger logger = Logging.getLogger(FreenetLinkParser.class);
/** Pattern to detect whitespace. */
- private static final Pattern whitespacePattern = Pattern.compile("[\\p{javaWhitespace}]");
+ private static final Pattern whitespacePattern = Pattern.compile("[\\u000a\u0020\u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u200c\u200d\u202f\u205f\u2060\u2800\u3000]");
+
+ /**
+ * Enumeration for all recognized link types.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+ private enum LinkType {
+
+ /** Link is a KSK. */
+ KSK,
+
+ /** Link is a CHK. */
+ CHK,
+
+ /** Link is an SSK. */
+ SSK,
+
+ /** Link is a USK. */
+ USK
+
+ }
/** The template factory. */
private final TemplateFactory templateFactory;
break;
}
int next = Integer.MAX_VALUE;
+ LinkType linkType = null;
if ((nextKsk > -1) && (nextKsk < next)) {
next = nextKsk;
+ linkType = LinkType.KSK;
}
if ((nextChk > -1) && (nextChk < next)) {
next = nextChk;
+ linkType = LinkType.CHK;
}
if ((nextSsk > -1) && (nextSsk < next)) {
next = nextSsk;
+ linkType = LinkType.SSK;
}
if ((nextUsk > -1) && (nextUsk < next)) {
next = nextUsk;
+ linkType = LinkType.USK;
+ }
+ if ((next >= 8) && (line.substring(next - 8, next).equals("freenet:"))) {
+ next -= 8;
+ line = line.substring(0, next) + line.substring(next + 8);
}
Matcher matcher = whitespacePattern.matcher(line);
int nextSpace = matcher.find(next) ? matcher.start() : line.length();
parts.add(createPlainTextPart(line.substring(0, next)));
String link = line.substring(next, nextSpace);
String name = link;
- logger.log(Level.FINER, "Found link: " + link);
+ logger.log(Level.FINER, "Found link: %s", link);
logger.log(Level.FINEST, "Next: %d, CHK: %d, SSK: %d, USK: %d", new Object[] { next, nextChk, nextSsk, nextUsk });
- if (((next == nextChk) || (next == nextSsk) || (next == nextUsk)) && (link.length() > 98) && (link.charAt(47) == ',') && (link.charAt(91) == ',') && (link.charAt(99) == '/')) {
+ if (((linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) && (link.length() > 98) && (link.charAt(47) == ',') && (link.charAt(91) == ',') && (link.charAt(99) == '/')) {
name = link.substring(0, 47) + "…" + link.substring(99);
}
parts.add(createLinkPart(link, name));