X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneParser.java;h=b12866a9e0953808ff5934b837b968934bc52282;hb=b55dc075f9cd34fb32baa44bbbc54a89d05e80b9;hp=1f3056538458efe737a3c48cdcd9c76340e1a6e9;hpb=03cec6a6772c2d836d94864adddaf544cbe9d72f;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneParser.java b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
index 1f30565..b12866a 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java
@@ -1,5 +1,6 @@
 package net.pterodactylus.sone.core;
 
+import static java.util.concurrent.TimeUnit.*;
 import static java.util.logging.Logger.getLogger;
 import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
 import static net.pterodactylus.sone.utils.NumberParsers.parseLong;
@@ -11,6 +12,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -32,6 +34,8 @@ import net.pterodactylus.sone.database.SoneBuilder;
 import net.pterodactylus.util.xml.SimpleXML;
 import net.pterodactylus.util.xml.XML;
 
+import com.codahale.metrics.*;
+import com.google.common.base.*;
 import org.w3c.dom.Document;
 
 /**
@@ -42,15 +46,18 @@ public class SoneParser {
 	private static final Logger logger = getLogger(SoneParser.class.getName());
 	private static final int MAX_PROTOCOL_VERSION = 0;
 	private final Database database;
+	private final Histogram soneParsingDurationHistogram;
 
 	@Inject
-	public SoneParser(Database database) {
+	public SoneParser(Database database, MetricRegistry metricRegistry) {
 		this.database = database;
+		this.soneParsingDurationHistogram = metricRegistry.histogram("sone.parsing.duration");
 	}
 
 	public Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
 		/* TODO - impose a size limit? */
 
+		Stopwatch stopwatch = Stopwatch.createStarted();
 		Document document;
 		/* XML parsing is not thread-safe. */
 		synchronized (this) {
@@ -257,6 +264,7 @@ public class SoneParser {
 		SimpleXML albumsXml = soneXml.getNode("albums");
 		Map<String, Image> allImages = new HashMap<>();
 		List<Album> topLevelAlbums = new ArrayList<>();
+		Map<String, Album> allAlbums = new HashMap<>();
 		if (albumsXml != null) {
 			for (SimpleXML albumXml : albumsXml.getNodes("album")) {
 				String id = albumXml.getValue("id", null);
@@ -269,7 +277,7 @@ public class SoneParser {
 				}
 				Album parent = null;
 				if (parentId != null) {
-					parent = database.getAlbum(parentId);
+					parent = allAlbums.get(parentId);
 					if (parent == null) {
 						logger.log(Level.WARNING, String.format("Downloaded Sone %s has album with invalid parent!", sone));
 						return null;
@@ -288,6 +296,7 @@ public class SoneParser {
 				} else {
 					topLevelAlbums.add(album);
 				}
+				allAlbums.put(album.getId(), album);
 				SimpleXML imagesXml = albumXml.getNode("images");
 				if (imagesXml != null) {
 					for (SimpleXML imageXml : imagesXml.getNodes("image")) {
@@ -334,6 +343,10 @@ public class SoneParser {
 			sone.getRootAlbum().addAlbum(album);
 		}
 
+		// record the duration
+		stopwatch.stop();
+		soneParsingDurationHistogram.update(stopwatch.elapsed(MICROSECONDS));
+
 		return sone;
 
 	}