Fix error message.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneDownloader.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index e11ded8..9f76b7e 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -111,6 +111,9 @@ public class SoneDownloader extends AbstractService {
         *            The Sone to fetch
         */
        public void fetchSone(Sone sone) {
+               if (core.getSoneStatus(sone) == SoneStatus.downloading) {
+                       return;
+               }
                logger.log(Level.FINE, "Starting fetch for Sone “%s” from %s…", new Object[] { sone, sone.getRequestUri().setMetaString(new String[] { "sone.xml" }) });
                FreenetURI requestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
                core.setSoneStatus(sone, SoneStatus.downloading);
@@ -150,7 +153,16 @@ public class SoneDownloader extends AbstractService {
                try {
                        xmlBucket = fetchResult.asBucket();
                        xmlInputStream = xmlBucket.getInputStream();
-                       Document document = XML.transformToDocument(xmlInputStream);
+                       Document document;
+                       /* XML parsing is not thread-safe. */
+                       synchronized (this) {
+                               document = XML.transformToDocument(xmlInputStream);
+                       }
+                       if (document == null) {
+                               /* TODO - mark Sone as bad. */
+                               logger.log(Level.WARNING, "Could not parse XML for Sone %s at %s!", new Object[] { originalSone, requestUri });
+                               return null;
+                       }
                        SimpleXML soneXml;
                        try {
                                soneXml = SimpleXML.fromDocument(document);
@@ -264,38 +276,47 @@ public class SoneDownloader extends AbstractService {
                                }
                        }
 
-                       /* parse friends. */
-                       SimpleXML friendsXml = soneXml.getNode("friends");
-                       if (friendsXml == null) {
+                       /* parse liked post IDs. */
+                       SimpleXML likePostIdsXml = soneXml.getNode("post-likes");
+                       if (likePostIdsXml == null) {
                                /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded Sone %s has no friends!", new Object[] { sone });
+                               logger.log(Level.WARNING, "Downloaded Sone %s has no post likes!", new Object[] { sone });
                                return null;
                        }
 
-                       Set<Sone> friends = new HashSet<Sone>();
-                       for (SimpleXML friendXml : friendsXml.getNodes("friend")) {
-                               String friendId = friendXml.getValue("sone-id", null);
-                               String friendKey = friendXml.getValue("sone-key", null);
-                               String friendName = friendXml.getValue("sone-name", null);
-                               if ((friendId == null) || (friendKey == null) || (friendName == null)) {
-                                       /* TODO - mark Sone as bad. */
-                                       logger.log(Level.WARNING, "Downloaded friend for Sone %s with missing data! ID: %s, Key: %s, Name: %s", new Object[] { sone, friendId, friendKey, friendName });
-                                       return null;
-                               }
-                               try {
-                                       friends.add(core.getSone(friendId).setRequestUri(new FreenetURI(friendKey)).setName(friendName));
-                               } catch (MalformedURLException mue1) {
-                                       /* TODO - mark Sone as bad. */
-                                       logger.log(Level.WARNING, "Downloaded friend for Sone %s with invalid key: %s", new Object[] { sone, friendKey });
-                                       return null;
-                               }
+                       Set<String> likedPostIds = new HashSet<String>();
+                       for (SimpleXML likedPostIdXml : likePostIdsXml.getNodes("post-like")) {
+                               String postId = likedPostIdXml.getValue();
+                               likedPostIds.add(postId);
+                       }
+
+                       /* parse liked reply IDs. */
+                       SimpleXML likeReplyIdsXml = soneXml.getNode("reply-likes");
+                       if (likeReplyIdsXml == null) {
+                               /* TODO - mark Sone as bad. */
+                               logger.log(Level.WARNING, "Downloaded Sone %s has no reply likes!", new Object[] { sone });
+                               return null;
+                       }
+
+                       Set<String> likedReplyIds = new HashSet<String>();
+                       for (SimpleXML likedReplyIdXml : likeReplyIdsXml.getNodes("reply-like")) {
+                               String replyId = likedReplyIdXml.getValue();
+                               likedReplyIds.add(replyId);
+                       }
+
+                       /* parse known Sones. */
+                       SimpleXML knownSonesXml = soneXml.getNode("known-sones");
+                       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 friendXml : friendsXml.getNodes("friend")) {
-                               String knownSoneId = friendXml.getValue("sone-id", null);
-                               String knownSoneKey = friendXml.getValue("sone-key", null);
-                               String knownSoneName = friendXml.getValue("sone-name", null);
+                       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 });
@@ -316,7 +337,7 @@ public class SoneDownloader extends AbstractService {
                                sone.setProfile(profile);
                                sone.setPosts(posts);
                                sone.setReplies(replies);
-                               sone.setFriends(friends);
+                               sone.setLikePostIds(likedPostIds);
                                sone.setModificationCounter(0);
                        }