X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FFreenetLinkParser.java;h=7c30b76f2d685aa26f49b72d54b2cf43739bab1a;hp=0a50a62a30909a6913bb7c03b33b8d3028571cc5;hb=a23c4f218c3adf236d89d5927cae37d6e6e4feda;hpb=b8545de14af229c6b557ef2229ee0166459d3a16 diff --git a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java index 0a50a62..7c30b76 100644 --- a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java +++ b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java @@ -27,6 +27,10 @@ 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.TemplateContextFactory; import net.pterodactylus.util.template.TemplateParser; @@ -68,20 +72,32 @@ public class FreenetLinkParser implements Parser { HTTP, /** Link is HTTPS. */ - HTTPS; + HTTPS, + + /** Link is a Sone. */ + SONE, + + /** Link is a post. */ + POST, } + /** The core. */ + private final Core core; + /** The template factory. */ private final TemplateContextFactory templateContextFactory; /** * Creates a new freenet link parser. * + * @param core + * The core * @param templateContextFactory * The template context factory */ - public FreenetLinkParser(TemplateContextFactory templateContextFactory) { + public FreenetLinkParser(Core core, TemplateContextFactory templateContextFactory) { + this.core = core; this.templateContextFactory = templateContextFactory; } @@ -97,8 +113,20 @@ public class FreenetLinkParser implements Parser { 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@"); @@ -106,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; @@ -136,6 +170,14 @@ 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 ((next >= 8) && (line.substring(next - 8, next).equals("freenet:"))) { next -= 8; line = line.substring(0, next) + line.substring(next + 8); @@ -143,7 +185,11 @@ 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); @@ -196,13 +242,44 @@ public class FreenetLinkParser implements Parser { } link = "?_CHECKED_HTTP_=" + link; parts.add(createInternetLinkPart(link, name)); + } else if (linkType == LinkType.SONE) { + String soneId = link.substring(7); + Sone sone = core.getSone(soneId, false); + if (sone != null) { + parts.add(createInSoneLinkPart("viewSone.html?sone=" + soneId, SoneAccessor.getNiceName(sone))); + } else { + parts.add(createPlainTextPart(link)); + } + } else if (linkType == LinkType.POST) { + String postId = link.substring(7); + Post post = core.getPost(postId, false); + if (post != 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(link)); + } } 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; } @@ -264,4 +341,32 @@ public class FreenetLinkParser implements Parser { 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); + } + }