X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=c883301503d8f343eb23402df22326bb85751e81;hb=c2537ba1cf3ab56e0f1a2e7520d2fbf0b48eecbd;hp=fa0063e4898e5dc335356da450a890239cb30d0d;hpb=96fcb6d250349cb1c02df44d6e3acdb93c8e7370;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index fa0063e..c883301 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -55,6 +55,9 @@ public class SoneDownloader extends AbstractService {
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SoneDownloader.class);
 
+	/** The maximum protocol version. */
+	private static final int MAX_PROTOCOL_VERSION = 0;
+
 	/** The core. */
 	private final Core core;
 
@@ -221,6 +224,27 @@ public class SoneDownloader extends AbstractService {
 			return null;
 		}
 
+		Integer protocolVersion = null;
+		String soneProtocolVersion = soneXml.getValue("protocol-version", null);
+		if (soneProtocolVersion != null) {
+			protocolVersion = Numbers.safeParseInteger(soneProtocolVersion);
+		}
+		if (protocolVersion == null) {
+			logger.log(Level.INFO, "No protocol version found, assuming 0.");
+			protocolVersion = 0;
+		}
+
+		if (protocolVersion < 0) {
+			logger.log(Level.WARNING, "Invalid protocol version: " + protocolVersion + "! Not parsing Sone.");
+			return null;
+		}
+
+		/* check for valid versions. */
+		if (protocolVersion > MAX_PROTOCOL_VERSION) {
+			logger.log(Level.WARNING, "Unknown protocol version: " + protocolVersion + "! Not parsing Sone.");
+			return null;
+		}
+
 		String soneTime = soneXml.getValue("time", null);
 		if (soneTime == null) {
 			/* TODO - mark Sone as bad. */
@@ -261,7 +285,7 @@ public class SoneDownloader extends AbstractService {
 		if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
 			try {
 				sone.setInsertUri(new FreenetURI(soneInsertUri));
-				sone.setLatestEdition(Math.max(sone.getRequestUri().getSuggestedEdition(), sone.getInsertUri().getSuggestedEdition()));
+				sone.setLatestEdition(Math.max(sone.getRequestUri().getEdition(), sone.getInsertUri().getEdition()));
 			} catch (MalformedURLException mue1) {
 				/* TODO - mark Sone as bad. */
 				logger.log(Level.WARNING, "Downloaded Sone " + sone + " has invalid insert URI: " + soneInsertUri, mue1);
@@ -286,6 +310,25 @@ public class SoneDownloader extends AbstractService {
 		Profile profile = new Profile().setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName);
 		profile.setBirthDay(profileBirthDay).setBirthMonth(profileBirthMonth).setBirthYear(profileBirthYear);
 
+		/* parse profile fields. */
+		SimpleXML profileFieldsXml = profileXml.getNode("fields");
+		if (profileFieldsXml != null) {
+			for (SimpleXML fieldXml : profileFieldsXml.getNodes("field")) {
+				String fieldName = fieldXml.getValue("field-name", null);
+				String fieldValue = fieldXml.getValue("field-value", null);
+				if ((fieldName == null) || (fieldValue == null)) {
+					logger.log(Level.WARNING, "Downloaded profile field for Sone %s with missing data! Name: %s, Value: %s", new Object[] { sone, fieldName, fieldValue });
+					return null;
+				}
+				try {
+					profile.addField(fieldName).setValue(fieldValue);
+				} catch (IllegalArgumentException iae1) {
+					logger.log(Level.WARNING, "Duplicate field: " + fieldName, iae1);
+					return null;
+				}
+			}
+		}
+
 		/* parse posts. */
 		SimpleXML postsXml = soneXml.getNode("posts");
 		Set<Post> posts = new HashSet<Post>();