From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 13 Sep 2012 12:12:44 +0000 (+0200)
Subject: Close buffered reader after parsing.
X-Git-Tag: 0.8.3^2~20
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=bdbd75eb4ef763f7d821e4e5c49b48eac0564cc4;p=Sone.git

Close buffered reader after parsing.
---

diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index dd0da28..baa3dc9 100644
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@ -30,6 +30,7 @@ import net.pterodactylus.sone.core.PostProvider;
 import net.pterodactylus.sone.core.SoneProvider;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import freenet.keys.FreenetURI;
 
@@ -109,187 +110,193 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 	public Iterable<Part> parse(SoneTextParserContext 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) {
-			if (line.trim().length() == 0) {
-				if (lastLineEmpty) {
+		try {
+			String line;
+			boolean lastLineEmpty = true;
+			int emptyLines = 0;
+			while ((line = bufferedReader.readLine()) != null) {
+				if (line.trim().length() == 0) {
+					if (lastLineEmpty) {
+						continue;
+					}
+					parts.add(new PlainTextPart("\n"));
+					++emptyLines;
+					lastLineEmpty = emptyLines == 2;
 					continue;
 				}
-				parts.add(new PlainTextPart("\n"));
-				++emptyLines;
-				lastLineEmpty = emptyLines == 2;
-				continue;
-			}
-			emptyLines = 0;
-			/*
-			 * lineComplete tracks whether the block you are parsing is the
-			 * first block of the line. this is important because sometimes you
-			 * have to add an additional line break.
-			 */
-			boolean lineComplete = true;
-			while (line.length() > 0) {
-				int nextKsk = line.indexOf("KSK@");
-				int nextChk = line.indexOf("CHK@");
-				int nextSsk = line.indexOf("SSK@");
-				int nextUsk = line.indexOf("USK@");
-				int nextHttp = line.indexOf("http://");
-				int nextHttps = line.indexOf("https://");
-				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(new PlainTextPart("\n" + line));
-					} else {
-						parts.add(new PlainTextPart(line));
+				emptyLines = 0;
+				/*
+				 * lineComplete tracks whether the block you are parsing is the
+				 * first block of the line. this is important because sometimes
+				 * you have to add an additional line break.
+				 */
+				boolean lineComplete = true;
+				while (line.length() > 0) {
+					int nextKsk = line.indexOf("KSK@");
+					int nextChk = line.indexOf("CHK@");
+					int nextSsk = line.indexOf("SSK@");
+					int nextUsk = line.indexOf("USK@");
+					int nextHttp = line.indexOf("http://");
+					int nextHttps = line.indexOf("https://");
+					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(new PlainTextPart("\n" + line));
+						} else {
+							parts.add(new PlainTextPart(line));
+						}
+						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 ((nextHttp > -1) && (nextHttp < next)) {
+						next = nextHttp;
+						linkType = LinkType.HTTP;
+					}
+					if ((nextHttps > -1) && (nextHttps < next)) {
+						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;
 					}
-					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 ((nextHttp > -1) && (nextHttp < next)) {
-					next = nextHttp;
-					linkType = LinkType.HTTP;
-				}
-				if ((nextHttps > -1) && (nextHttps < next)) {
-					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;
-				}
 
-				/* cut off “freenet:” from before keys. */
-				if (((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) && (next >= 8) && (line.substring(next - 8, next).equals("freenet:"))) {
-					next -= 8;
-					line = line.substring(0, next) + line.substring(next + 8);
-				}
+					/* cut off “freenet:” from before keys. */
+					if (((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) && (next >= 8) && (line.substring(next - 8, next).equals("freenet:"))) {
+						next -= 8;
+						line = line.substring(0, next) + line.substring(next + 8);
+					}
 
-				/* if there is text before the next item, write it out. */
-				if (lineComplete && !lastLineEmpty) {
-					parts.add(new PlainTextPart("\n"));
-				}
-				if (next > 0) {
-					parts.add(new PlainTextPart(line.substring(0, next)));
-					line = line.substring(next);
-					next = 0;
-				}
-				lineComplete = false;
+					/* if there is text before the next item, write it out. */
+					if (lineComplete && !lastLineEmpty) {
+						parts.add(new PlainTextPart("\n"));
+					}
+					if (next > 0) {
+						parts.add(new PlainTextPart(line.substring(0, next)));
+						line = line.substring(next);
+						next = 0;
+					}
+					lineComplete = false;
 
-				if (linkType == LinkType.SONE) {
-					if (line.length() >= (7 + 43)) {
-						String soneId = line.substring(7, 50);
-						Sone sone = soneProvider.getSone(soneId, false);
-						if (sone == null) {
-							/*
-							 * don’t use create=true above, we don’t want the
-							 * empty shell.
-							 */
-							sone = new Sone(soneId);
+					if (linkType == LinkType.SONE) {
+						if (line.length() >= (7 + 43)) {
+							String soneId = line.substring(7, 50);
+							Sone sone = soneProvider.getSone(soneId, false);
+							if (sone == null) {
+								/*
+								 * don’t use create=true above, we don’t want
+								 * the empty shell.
+								 */
+								sone = new Sone(soneId);
+							}
+							parts.add(new SonePart(sone));
+							line = line.substring(50);
+						} else {
+							parts.add(new PlainTextPart(line));
+							line = "";
 						}
-						parts.add(new SonePart(sone));
-						line = line.substring(50);
-					} else {
-						parts.add(new PlainTextPart(line));
-						line = "";
+						continue;
 					}
-					continue;
-				}
-				if (linkType == LinkType.POST) {
-					if (line.length() >= (7 + 36)) {
-						String postId = line.substring(7, 43);
-						Post post = postProvider.getPost(postId, false);
-						if ((post != null) && (post.getSone() != null)) {
-							parts.add(new PostPart(post));
+					if (linkType == LinkType.POST) {
+						if (line.length() >= (7 + 36)) {
+							String postId = line.substring(7, 43);
+							Post post = postProvider.getPost(postId, false);
+							if ((post != null) && (post.getSone() != null)) {
+								parts.add(new PostPart(post));
+							} else {
+								parts.add(new PlainTextPart(line.substring(0, 43)));
+							}
+							line = line.substring(43);
 						} else {
-							parts.add(new PlainTextPart(line.substring(0, 43)));
+							parts.add(new PlainTextPart(line));
+							line = "";
 						}
-						line = line.substring(43);
-					} else {
-						parts.add(new PlainTextPart(line));
-						line = "";
+						continue;
 					}
-					continue;
-				}
-				Matcher matcher = whitespacePattern.matcher(line);
-				int nextSpace = matcher.find(0) ? matcher.start() : line.length();
-				String link = line.substring(0, nextSpace);
-				String name = link;
-				logger.log(Level.FINER, String.format("Found link: %s", link));
-				logger.log(Level.FINEST, String.format("CHK: %d, SSK: %d, USK: %d", nextChk, nextSsk, nextUsk));
+					Matcher matcher = whitespacePattern.matcher(line);
+					int nextSpace = matcher.find(0) ? matcher.start() : line.length();
+					String link = line.substring(0, nextSpace);
+					String name = link;
+					logger.log(Level.FINER, String.format("Found link: %s", link));
+					logger.log(Level.FINEST, String.format("CHK: %d, SSK: %d, USK: %d", nextChk, nextSsk, nextUsk));
 
-				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('?'));
-					}
-					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 ((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) {
+						FreenetURI uri;
+						if (name.indexOf('?') > -1) {
+							name = name.substring(0, name.indexOf('?'));
 						}
-						if (name == null) {
-							name = link.substring(0, Math.min(9, link.length()));
+						if (name.endsWith("/")) {
+							name = name.substring(0, name.length() - 1);
 						}
-						boolean fromPostingSone = ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) && (context != null) && (context.getPostingSone() != null) && link.substring(4, Math.min(link.length(), 47)).equals(context.getPostingSone().getId());
-						parts.add(new FreenetLinkPart(link, name, fromPostingSone));
-					} catch (MalformedURLException mue1) {
-						/* not a valid link, insert as plain text. */
-						parts.add(new PlainTextPart(link));
-					} catch (NullPointerException npe1) {
-						/* FreenetURI sometimes throws these, too. */
-						parts.add(new PlainTextPart(link));
-					} catch (ArrayIndexOutOfBoundsException aioobe1) {
-						/* oh, and these, too. */
-						parts.add(new PlainTextPart(link));
-					}
-				} else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) {
-					name = link.substring(linkType == LinkType.HTTP ? 7 : 8);
-					int firstSlash = name.indexOf('/');
-					int lastSlash = name.lastIndexOf('/');
-					if ((lastSlash - firstSlash) > 3) {
-						name = name.substring(0, firstSlash + 1) + "…" + name.substring(lastSlash);
-					}
-					if (name.endsWith("/")) {
-						name = name.substring(0, name.length() - 1);
-					}
-					if (((name.indexOf('/') > -1) && (name.indexOf('.') < name.lastIndexOf('.', name.indexOf('/'))) || ((name.indexOf('/') == -1) && (name.indexOf('.') < name.lastIndexOf('.')))) && name.startsWith("www.")) {
-						name = name.substring(4);
-					}
-					if (name.indexOf('?') > -1) {
-						name = name.substring(0, name.indexOf('?'));
+						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)) && (context != null) && (context.getPostingSone() != null) && link.substring(4, Math.min(link.length(), 47)).equals(context.getPostingSone().getId());
+							parts.add(new FreenetLinkPart(link, name, fromPostingSone));
+						} catch (MalformedURLException mue1) {
+							/* not a valid link, insert as plain text. */
+							parts.add(new PlainTextPart(link));
+						} catch (NullPointerException npe1) {
+							/* FreenetURI sometimes throws these, too. */
+							parts.add(new PlainTextPart(link));
+						} catch (ArrayIndexOutOfBoundsException aioobe1) {
+							/* oh, and these, too. */
+							parts.add(new PlainTextPart(link));
+						}
+					} else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) {
+						name = link.substring(linkType == LinkType.HTTP ? 7 : 8);
+						int firstSlash = name.indexOf('/');
+						int lastSlash = name.lastIndexOf('/');
+						if ((lastSlash - firstSlash) > 3) {
+							name = name.substring(0, firstSlash + 1) + "…" + name.substring(lastSlash);
+						}
+						if (name.endsWith("/")) {
+							name = name.substring(0, name.length() - 1);
+						}
+						if (((name.indexOf('/') > -1) && (name.indexOf('.') < name.lastIndexOf('.', name.indexOf('/'))) || ((name.indexOf('/') == -1) && (name.indexOf('.') < name.lastIndexOf('.')))) && name.startsWith("www.")) {
+							name = name.substring(4);
+						}
+						if (name.indexOf('?') > -1) {
+							name = name.substring(0, name.indexOf('?'));
+						}
+						parts.add(new LinkPart(link, name));
 					}
-					parts.add(new LinkPart(link, name));
+					line = line.substring(nextSpace);
 				}
-				line = line.substring(nextSpace);
+				lastLineEmpty = false;
+			}
+		} finally {
+			if (bufferedReader != source) {
+				Closer.close(bufferedReader);
 			}
-			lastLineEmpty = false;
 		}
 		for (int partIndex = parts.size() - 1; partIndex >= 0; --partIndex) {
 			Part part = parts.getPart(partIndex);