projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store original and parsed text in contenxt, compare to hide “toggle” link.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
text
/
FreenetLinkParser.java
diff --git
a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
index
73b33be
..
ad9381d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
+++ b/
src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
@@
-28,7
+28,8
@@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.pterodactylus.util.logging.Logging;
import java.util.regex.Pattern;
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;
/**
import freenet.keys.FreenetURI;
/**
@@
-72,16
+73,16
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
}
/** The template factory. */
}
/** The template factory. */
- private final Template
Factory template
Factory;
+ private final Template
ContextFactory templateContext
Factory;
/**
* Creates a new freenet link parser.
*
/**
* Creates a new freenet link parser.
*
- * @param templateFactory
- * The template factory
+ * @param template
Context
Factory
+ * The template
context
factory
*/
*/
- public FreenetLinkParser(Template
Factory template
Factory) {
- this.template
Factory = template
Factory;
+ public FreenetLinkParser(Template
ContextFactory templateContext
Factory) {
+ this.template
ContextFactory = templateContext
Factory;
}
//
}
//
@@
-96,8
+97,21
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
PartContainer parts = new PartContainer();
BufferedReader bufferedReader = (source instanceof BufferedReader) ? (BufferedReader) source : new BufferedReader(source);
String line;
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) {
while ((line = bufferedReader.readLine()) != null) {
- line = line.trim() + "\n";
+ line = line.trim();
+ if (line.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@");
while (line.length() > 0) {
int nextKsk = line.indexOf("KSK@");
int nextChk = line.indexOf("CHK@");
@@
-106,7
+120,11
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
int nextHttp = line.indexOf("http://");
int nextHttps = line.indexOf("https://");
if ((nextKsk == -1) && (nextChk == -1) && (nextSsk == -1) && (nextUsk == -1) && (nextHttp == -1) && (nextHttps == -1)) {
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));
+ if (lineComplete && !lastLineEmpty) {
+ parts.add(createPlainTextPart("\n" + line));
+ } else {
+ parts.add(createPlainTextPart(line));
+ }
break;
}
int next = Integer.MAX_VALUE;
break;
}
int next = Integer.MAX_VALUE;
@@
-142,7
+160,11
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
Matcher matcher = whitespacePattern.matcher(line);
int nextSpace = matcher.find(next) ? matcher.start() : line.length();
if (nextSpace > (next + 4)) {
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);
String link = line.substring(next, nextSpace);
String name = link;
logger.log(Level.FINER, "Found link: %s", link);
@@
-170,6
+192,12
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
} catch (MalformedURLException mue1) {
/* not a valid link, insert as plain text. */
parts.add(createPlainTextPart(link));
} 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));
}
} else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) {
name = link.substring(linkType == LinkType.HTTP ? 7 : 8);
}
} else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) {
name = link.substring(linkType == LinkType.HTTP ? 7 : 8);
@@
-192,10
+220,22
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
}
line = line.substring(nextSpace);
} else {
}
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);
}
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;
}
}
return parts;
}
@@
-212,7
+252,7
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
* @return The part that displays the given text
*/
private Part createPlainTextPart(String text) {
* @return The part that displays the given text
*/
private Part createPlainTextPart(String text) {
- return new TemplatePart(template
Factory.createTemplat
e(new StringReader("<% text|html>"))).set("text", text);
+ return new TemplatePart(template
ContextFactory, TemplateParser.pars
e(new StringReader("<% text|html>"))).set("text", text);
}
/**
}
/**
@@
-226,7
+266,7
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
* @return The part that displays the link
*/
private Part createInternetLinkPart(String link, String name) {
* @return The part that displays the link
*/
private Part createInternetLinkPart(String link, String name) {
- return new TemplatePart(template
Factory.createTemplat
e(new StringReader("<a class=\"internet\" href=\"/<% link|html>\" title=\"<% link|html>\"><% name|html></a>"))).set("link", link).set("name", name);
+ return new TemplatePart(template
ContextFactory, TemplateParser.pars
e(new StringReader("<a class=\"internet\" href=\"/<% link|html>\" title=\"<% link|html>\"><% name|html></a>"))).set("link", link).set("name", name);
}
/**
}
/**
@@
-240,7
+280,7
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
* @return The part that displays the link
*/
private Part createFreenetLinkPart(String link, String name) {
* @return The part that displays the link
*/
private Part createFreenetLinkPart(String link, String name) {
- return new TemplatePart(template
Factory.createTemplat
e(new StringReader("<a class=\"freenet\" href=\"/<% link|html>\" title=\"<% link|html>\"><% name|html></a>"))).set("link", link).set("name", name);
+ return new TemplatePart(template
ContextFactory, TemplateParser.pars
e(new StringReader("<a class=\"freenet\" href=\"/<% link|html>\" title=\"<% link|html>\"><% name|html></a>"))).set("link", link).set("name", name);
}
/**
}
/**
@@
-254,7
+294,7
@@
public class FreenetLinkParser implements Parser<FreenetLinkParserContext> {
* @return The part that displays the link
*/
private Part createTrustedFreenetLinkPart(String link, String name) {
* @return The part that displays the link
*/
private Part createTrustedFreenetLinkPart(String link, String name) {
- return new TemplatePart(template
Factory.createTemplat
e(new StringReader("<a class=\"freenet-trusted\" href=\"/<% link|html>\" title=\"<% link|html>\"><% name|html></a>"))).set("link", link).set("name", name);
+ return new TemplatePart(template
ContextFactory, TemplateParser.pars
e(new StringReader("<a class=\"freenet-trusted\" href=\"/<% link|html>\" title=\"<% link|html>\"><% name|html></a>"))).set("link", link).set("name", name);
}
}
}
}