X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FFreenetLinkParser.java;h=770a4842212ffbae609921c0092bfee8d7e0ba86;hb=e5647042f01e94a78f6411216cf77a67f52e1b7a;hp=24eac3b3f18fe89c62acb178965d8dc3dd3688de;hpb=02de134dcf3d4500ae02320aab2dae827d499fa1;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java index 24eac3b..770a484 100644 --- a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java +++ b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java @@ -21,21 +21,27 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; import java.io.StringReader; +import java.net.MalformedURLException; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.pterodactylus.sone.core.Core; +import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.template.SoneAccessor; import net.pterodactylus.util.logging.Logging; -import net.pterodactylus.util.template.TemplateFactory; +import net.pterodactylus.util.template.TemplateContextFactory; +import net.pterodactylus.util.template.TemplateParser; +import freenet.keys.FreenetURI; /** * {@link Parser} implementation that can recognize Freenet URIs. * * @author David ‘Bombe’ Roden */ -public class FreenetLinkParser implements Parser { +public class FreenetLinkParser implements Parser { /** The logger. */ private static final Logger logger = Logging.getLogger(FreenetLinkParser.class); @@ -66,40 +72,33 @@ public class FreenetLinkParser implements Parser { HTTP, /** Link is HTTPS. */ - HTTPS; + HTTPS, - } - - /** The template factory. */ - private final TemplateFactory templateFactory; + /** Link is a Sone. */ + SONE, - /** The Sone that posted the currently parsed text. */ - private Sone postingSone; + /** Link is a post. */ + POST, - /** - * Creates a new freenet link parser. - * - * @param templateFactory - * The template factory - */ - public FreenetLinkParser(TemplateFactory templateFactory) { - this.templateFactory = templateFactory; } - // - // ACCESSORS - // + /** The core. */ + private final Core core; + + /** The template factory. */ + private final TemplateContextFactory templateContextFactory; /** - * Sets the Sone that posted the text that will be parsed in the next call - * to {@link #parse(Reader)}. You need to synchronize calling this method - * and {@link #parse(Reader)}! + * Creates a new freenet link parser. * - * @param sone - * The Sone that posted the text + * @param core + * The core + * @param templateContextFactory + * The template context factory */ - public void setPostingSone(Sone sone) { - postingSone = sone; + public FreenetLinkParser(Core core, TemplateContextFactory templateContextFactory) { + this.core = core; + this.templateContextFactory = templateContextFactory; } // @@ -110,12 +109,24 @@ public class FreenetLinkParser implements Parser { * {@inheritDoc} */ @Override - public Part parse(Reader source) throws IOException { + public Part parse(FreenetLinkParserContext context, Reader source) throws IOException { PartContainer parts = new PartContainer(); BufferedReader bufferedReader = (source instanceof BufferedReader) ? (BufferedReader) source : new BufferedReader(source); String line; + boolean lastLineEmpty = true; + int emptyLines = 0; while ((line = bufferedReader.readLine()) != null) { - line = line.trim() + "\n"; + if (line.trim().length() == 0) { + if (lastLineEmpty) { + continue; + } + parts.add(createPlainTextPart("\n")); + ++emptyLines; + lastLineEmpty = emptyLines == 2; + continue; + } + emptyLines = 0; + boolean lineComplete = true; while (line.length() > 0) { int nextKsk = line.indexOf("KSK@"); int nextChk = line.indexOf("CHK@"); @@ -123,8 +134,14 @@ public class FreenetLinkParser implements Parser { int nextUsk = line.indexOf("USK@"); int nextHttp = line.indexOf("http://"); int nextHttps = line.indexOf("https://"); - if ((nextKsk == -1) && (nextChk == -1) && (nextSsk == -1) && (nextUsk == -1) && (nextHttp == -1) && (nextHttps == -1)) { - parts.add(createPlainTextPart(line)); + int nextSone = line.indexOf("sone://"); + int nextPost = line.indexOf("post://"); + if ((nextKsk == -1) && (nextChk == -1) && (nextSsk == -1) && (nextUsk == -1) && (nextHttp == -1) && (nextHttps == -1) && (nextSone == -1) && (nextPost == -1)) { + if (lineComplete && !lastLineEmpty) { + parts.add(createPlainTextPart("\n" + line)); + } else { + parts.add(createPlainTextPart(line)); + } break; } int next = Integer.MAX_VALUE; @@ -153,6 +170,55 @@ public class FreenetLinkParser implements Parser { next = nextHttps; linkType = LinkType.HTTPS; } + if ((nextSone > -1) && (nextSone < next)) { + next = nextSone; + linkType = LinkType.SONE; + } + if ((nextPost > -1) && (nextPost < next)) { + next = nextPost; + linkType = LinkType.POST; + } + if (linkType == LinkType.SONE) { + if (next > 0) { + parts.add(createPlainTextPart(line.substring(0, next))); + } + if (line.length() >= (next + 7 + 43)) { + String soneId = line.substring(next + 7, next + 50); + Sone sone = core.getSone(soneId, false); + if (sone != null) { + parts.add(createInSoneLinkPart("viewSone.html?sone=" + soneId, SoneAccessor.getNiceName(sone))); + } else { + parts.add(createPlainTextPart(line.substring(next, next + 50))); + } + line = line.substring(next + 50); + } else { + parts.add(createPlainTextPart(line.substring(next))); + line = ""; + } + continue; + } + if (linkType == LinkType.POST) { + if (next > 0) { + parts.add(createPlainTextPart(line.substring(0, next))); + } + if (line.length() >= (next + 7 + 36)) { + String postId = line.substring(next + 7, next + 43); + Post post = core.getPost(postId, false); + if ((post != null) && (post.getSone() != null)) { + String postText = post.getText(); + postText = postText.substring(0, Math.min(postText.length(), 20)) + "…"; + Sone postSone = post.getSone(); + parts.add(createInSoneLinkPart("viewPost.html?post=" + postId, postText, (postSone == null) ? postText : SoneAccessor.getNiceName(post.getSone()))); + } else { + parts.add(createPlainTextPart(line.substring(next, next + 43))); + } + line = line.substring(next + 43); + } else { + parts.add(createPlainTextPart(line.substring(next))); + line = ""; + } + continue; + } if ((next >= 8) && (line.substring(next - 8, next).equals("freenet:"))) { next -= 8; line = line.substring(0, next) + line.substring(next + 8); @@ -160,34 +226,45 @@ public class FreenetLinkParser implements Parser { Matcher matcher = whitespacePattern.matcher(line); int nextSpace = matcher.find(next) ? matcher.start() : line.length(); if (nextSpace > (next + 4)) { - parts.add(createPlainTextPart(line.substring(0, next))); + if (!lastLineEmpty && lineComplete) { + parts.add(createPlainTextPart("\n" + line.substring(0, next))); + } else { + parts.add(createPlainTextPart(line.substring(0, next))); + } String link = line.substring(next, nextSpace); String name = 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 (linkType == LinkType.KSK) { - name = link.substring(4); - } else if ((linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) { - if (name.indexOf('/') > -1) { - if (!name.endsWith("/")) { - name = name.substring(name.lastIndexOf('/') + 1); - } else { - if (name.indexOf('/') != name.lastIndexOf('/')) { - name = name.substring(name.lastIndexOf('/', name.lastIndexOf('/') - 1)); - } else { - /* shorten to 5 chars. */ - name = name.substring(4, 9); - } - } - } + + if ((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) { + FreenetURI uri; if (name.indexOf('?') > -1) { name = name.substring(0, name.indexOf('?')); } - boolean fromPostingSone = false; - if ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) { - fromPostingSone = link.substring(4, 47).equals(postingSone.getId()); + if (name.endsWith("/")) { + name = name.substring(0, name.length() - 1); + } + try { + uri = new FreenetURI(name); + name = uri.lastMetaString(); + if (name == null) { + name = uri.getDocName(); + } + if (name == null) { + name = link.substring(0, Math.min(9, link.length())); + } + boolean fromPostingSone = ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) && link.substring(4, Math.min(link.length(), 47)).equals(context.getPostingSone().getId()); + parts.add(fromPostingSone ? createTrustedFreenetLinkPart(link, name) : createFreenetLinkPart(link, name)); + } catch (MalformedURLException mue1) { + /* not a valid link, insert as plain text. */ + parts.add(createPlainTextPart(link)); + } catch (NullPointerException npe1) { + /* FreenetURI sometimes throws these, too. */ + parts.add(createPlainTextPart(link)); + } catch (ArrayIndexOutOfBoundsException aioobe1) { + /* oh, and these, too. */ + parts.add(createPlainTextPart(link)); } - parts.add(fromPostingSone ? createTrustedFreenetLinkPart(link, name) : createFreenetLinkPart(link, name)); } else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) { name = link.substring(linkType == LinkType.HTTP ? 7 : 8); int firstSlash = name.indexOf('/'); @@ -209,10 +286,22 @@ public class FreenetLinkParser implements Parser { } line = line.substring(nextSpace); } else { - parts.add(createPlainTextPart(line.substring(0, next + 4))); + if (!lastLineEmpty && lineComplete) { + parts.add(createPlainTextPart("\n" + line.substring(0, next + 4))); + } else { + parts.add(createPlainTextPart(line.substring(0, next + 4))); + } line = line.substring(next + 4); } + lineComplete = false; + } + lastLineEmpty = false; + } + for (int partIndex = parts.size() - 1; partIndex >= 0; --partIndex) { + if (!parts.getPart(partIndex).toString().equals("\n")) { + break; } + parts.removePart(partIndex); } return parts; } @@ -229,7 +318,7 @@ public class FreenetLinkParser implements Parser { * @return The part that displays the given text */ private Part createPlainTextPart(String text) { - return new TemplatePart(templateFactory.createTemplate(new StringReader("<% text|html>"))).set("text", text); + return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("<% text|html>"))).set("text", text); } /** @@ -243,7 +332,7 @@ public class FreenetLinkParser implements Parser { * @return The part that displays the link */ private Part createInternetLinkPart(String link, String name) { - return new TemplatePart(templateFactory.createTemplate(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); + return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); } /** @@ -257,7 +346,7 @@ public class FreenetLinkParser implements Parser { * @return The part that displays the link */ private Part createFreenetLinkPart(String link, String name) { - return new TemplatePart(templateFactory.createTemplate(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); + return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); } /** @@ -271,7 +360,35 @@ public class FreenetLinkParser implements Parser { * @return The part that displays the link */ private Part createTrustedFreenetLinkPart(String link, String name) { - return new TemplatePart(templateFactory.createTemplate(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); + return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); + } + + /** + * Creates a new part based on a template that links to a page in Sone. + * + * @param link + * The target of the link + * @param name + * The name of the link + * @return The part that displays the link + */ + private Part createInSoneLinkPart(String link, String name) { + return createInSoneLinkPart(link, name, name); + } + + /** + * Creates a new part based on a template that links to a page in Sone. + * + * @param link + * The target of the link + * @param name + * The name of the link + * @param title + * The title attribute of the link + * @return The part that displays the link + */ + private Part createInSoneLinkPart(String link, String name, String title) { + return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("\" title=\"<%title|html>\"><%name|html>"))).set("link", link).set("name", name).set("title", title); } }