X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=a01c29669f5447804216d40f3495d4d1b6179280;hb=90c85f39570270b879e2d3020fe95231410f57c6;hp=5d40881457d9b4b9a3150607b705e2e164c76171;hpb=5176fec23f420e0ebfe3c94d2b40afcb43d29841;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 5d40881..a01c296 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -32,6 +32,7 @@ import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.xml.SimpleXML;
 import net.pterodactylus.util.xml.XML;
@@ -219,87 +220,114 @@ public class SoneDownloader extends AbstractService {
 			String profileFirstName = profileXml.getValue("first-name", null);
 			String profileMiddleName = profileXml.getValue("middle-name", null);
 			String profileLastName = profileXml.getValue("last-name", null);
+			Integer profileBirthDay = Numbers.safeParseInteger(profileXml.getValue("birth-day", null));
+			Integer profileBirthMonth = Numbers.safeParseInteger(profileXml.getValue("birth-month", null));
+			Integer profileBirthYear = Numbers.safeParseInteger(profileXml.getValue("birth-year", null));
 			Profile profile = new Profile().setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName);
+			profile.setBirthDay(profileBirthDay).setBirthMonth(profileBirthMonth).setBirthYear(profileBirthYear);
 
 			/* parse posts. */
 			SimpleXML postsXml = soneXml.getNode("posts");
+			Set<Post> posts = new HashSet<Post>();
 			if (postsXml == null) {
 				/* TODO - mark Sone as bad. */
 				logger.log(Level.WARNING, "Downloaded Sone %s has no posts!", new Object[] { sone });
-				return null;
-			}
-
-			Set<Post> posts = new HashSet<Post>();
-			for (SimpleXML postXml : postsXml.getNodes("post")) {
-				String postId = postXml.getValue("id", null);
-				String postTime = postXml.getValue("time", null);
-				String postText = postXml.getValue("text", null);
-				if ((postId == null) || (postTime == null) || (postText == null)) {
-					/* TODO - mark Sone as bad. */
-					logger.log(Level.WARNING, "Downloaded post for Sone %s with missing data! ID: %s, Time: %s, Text: %s", new Object[] { sone, postId, postTime, postText });
-					return null;
-				}
-				try {
-					posts.add(core.getPost(postId).setSone(sone).setTime(Long.parseLong(postTime)).setText(postText));
-				} catch (NumberFormatException nfe1) {
-					/* TODO - mark Sone as bad. */
-					logger.log(Level.WARNING, "Downloaded post for Sone %s with invalid time: %s", new Object[] { sone, postTime });
-					return null;
+			} else {
+				for (SimpleXML postXml : postsXml.getNodes("post")) {
+					String postId = postXml.getValue("id", null);
+					String postTime = postXml.getValue("time", null);
+					String postText = postXml.getValue("text", null);
+					if ((postId == null) || (postTime == null) || (postText == null)) {
+						/* TODO - mark Sone as bad. */
+						logger.log(Level.WARNING, "Downloaded post for Sone %s with missing data! ID: %s, Time: %s, Text: %s", new Object[] { sone, postId, postTime, postText });
+						return null;
+					}
+					try {
+						posts.add(core.getPost(postId).setSone(sone).setTime(Long.parseLong(postTime)).setText(postText));
+					} catch (NumberFormatException nfe1) {
+						/* TODO - mark Sone as bad. */
+						logger.log(Level.WARNING, "Downloaded post for Sone %s with invalid time: %s", new Object[] { sone, postTime });
+						return null;
+					}
 				}
 			}
 
 			/* parse replies. */
 			SimpleXML repliesXml = soneXml.getNode("replies");
+			Set<Reply> replies = new HashSet<Reply>();
 			if (repliesXml == null) {
 				/* TODO - mark Sone as bad. */
 				logger.log(Level.WARNING, "Downloaded Sone %s has no replies!", new Object[] { sone });
-				return null;
+			} else {
+				for (SimpleXML replyXml : repliesXml.getNodes("reply")) {
+					String replyId = replyXml.getValue("id", null);
+					String replyPostId = replyXml.getValue("post-id", null);
+					String replyTime = replyXml.getValue("time", null);
+					String replyText = replyXml.getValue("text", null);
+					if ((replyId == null) || (replyPostId == null) || (replyTime == null) || (replyText == null)) {
+						/* TODO - mark Sone as bad. */
+						logger.log(Level.WARNING, "Downloaded reply for Sone %s with missing data! ID: %s, Post: %s, Time: %s, Text: %s", new Object[] { sone, replyId, replyPostId, replyTime, replyText });
+						return null;
+					}
+					try {
+						replies.add(core.getReply(replyId).setSone(sone).setPost(core.getPost(replyPostId)).setTime(Long.parseLong(replyTime)).setText(replyText));
+					} catch (NumberFormatException nfe1) {
+						/* TODO - mark Sone as bad. */
+						logger.log(Level.WARNING, "Downloaded reply for Sone %s with invalid time: %s", new Object[] { sone, replyTime });
+						return null;
+					}
+				}
 			}
 
-			Set<Reply> replies = new HashSet<Reply>();
-			for (SimpleXML replyXml : repliesXml.getNodes("reply")) {
-				String replyId = replyXml.getValue("id", null);
-				String replyPostId = replyXml.getValue("post-id", null);
-				String replyTime = replyXml.getValue("time", null);
-				String replyText = replyXml.getValue("text", null);
-				if ((replyId == null) || (replyPostId == null) || (replyTime == null) || (replyText == null)) {
-					/* TODO - mark Sone as bad. */
-					logger.log(Level.WARNING, "Downloaded reply for Sone %s with missing data! ID: %s, Post: %s, Time: %s, Text: %s", new Object[] { sone, replyId, replyPostId, replyTime, replyText });
-					return null;
+			/* parse liked post IDs. */
+			SimpleXML likePostIdsXml = soneXml.getNode("post-likes");
+			Set<String> likedPostIds = new HashSet<String>();
+			if (likePostIdsXml == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded Sone %s has no post likes!", new Object[] { sone });
+			} else {
+				for (SimpleXML likedPostIdXml : likePostIdsXml.getNodes("post-like")) {
+					String postId = likedPostIdXml.getValue();
+					likedPostIds.add(postId);
 				}
-				try {
-					replies.add(core.getReply(replyId).setSone(sone).setPost(core.getPost(replyPostId)).setTime(Long.parseLong(replyTime)).setText(replyText));
-				} catch (NumberFormatException nfe1) {
-					/* TODO - mark Sone as bad. */
-					logger.log(Level.WARNING, "Downloaded reply for Sone %s with invalid time: %s", new Object[] { sone, replyTime });
-					return null;
+			}
+
+			/* parse liked reply IDs. */
+			SimpleXML likeReplyIdsXml = soneXml.getNode("reply-likes");
+			Set<String> likedReplyIds = new HashSet<String>();
+			if (likeReplyIdsXml == null) {
+				/* TODO - mark Sone as bad. */
+				logger.log(Level.WARNING, "Downloaded Sone %s has no reply likes!", new Object[] { sone });
+			} else {
+				for (SimpleXML likedReplyIdXml : likeReplyIdsXml.getNodes("reply-like")) {
+					String replyId = likedReplyIdXml.getValue();
+					likedReplyIds.add(replyId);
 				}
 			}
 
 			/* parse known Sones. */
 			SimpleXML knownSonesXml = soneXml.getNode("known-sones");
+			Set<Sone> knownSones = new HashSet<Sone>();
 			if (knownSonesXml == null) {
 				/* TODO - mark Sone as bad. */
 				logger.log(Level.WARNING, "Downloaded Sone %s has no known Sones!", new Object[] { sone });
-				return null;
-			}
-
-			Set<Sone> knownSones = new HashSet<Sone>();
-			for (SimpleXML knownSoneXml : knownSonesXml.getNodes("known-sone")) {
-				String knownSoneId = knownSoneXml.getValue("sone-id", null);
-				String knownSoneKey = knownSoneXml.getValue("sone-key", null);
-				String knownSoneName = knownSoneXml.getValue("sone-name", null);
-				if ((knownSoneId == null) || (knownSoneKey == null) || (knownSoneName == null)) {
-					/* TODO - mark Sone as bad. */
-					logger.log(Level.WARNING, "Downloaded known Sone for Sone %s with missing data! ID: %s, Key: %s, Name: %s", new Object[] { sone, knownSoneId, knownSoneKey, knownSoneName });
-					return null;
-				}
-				try {
-					knownSones.add(core.getSone(knownSoneId).setRequestUri(new FreenetURI(knownSoneKey)).setName(knownSoneName));
-				} catch (MalformedURLException mue1) {
-					/* TODO - mark Sone as bad. */
-					logger.log(Level.WARNING, "Downloaded known Sone for Sone %s with invalid key: %s", new Object[] { sone, knownSoneKey });
-					return null;
+			} else {
+				for (SimpleXML knownSoneXml : knownSonesXml.getNodes("known-sone")) {
+					String knownSoneId = knownSoneXml.getValue("sone-id", null);
+					String knownSoneKey = knownSoneXml.getValue("sone-key", null);
+					String knownSoneName = knownSoneXml.getValue("sone-name", null);
+					if ((knownSoneId == null) || (knownSoneKey == null) || (knownSoneName == null)) {
+						/* TODO - mark Sone as bad. */
+						logger.log(Level.WARNING, "Downloaded known Sone for Sone %s with missing data! ID: %s, Key: %s, Name: %s", new Object[] { sone, knownSoneId, knownSoneKey, knownSoneName });
+						return null;
+					}
+					try {
+						knownSones.add(core.getSone(knownSoneId).setRequestUri(new FreenetURI(knownSoneKey)).setName(knownSoneName));
+					} catch (MalformedURLException mue1) {
+						/* TODO - mark Sone as bad. */
+						logger.log(Level.WARNING, "Downloaded known Sone for Sone %s with invalid key: %s", new Object[] { sone, knownSoneKey });
+						return null;
+					}
 				}
 			}
 
@@ -309,6 +337,7 @@ public class SoneDownloader extends AbstractService {
 				sone.setProfile(profile);
 				sone.setPosts(posts);
 				sone.setReplies(replies);
+				sone.setLikePostIds(likedPostIds);
 				sone.setModificationCounter(0);
 			}