Fix ALL the logging!
[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneDownloader.java
index 5d40881..98337b9 100644 (file)
 
 package net.pterodactylus.sone.core;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sone.core.Core.SoneStatus;
+import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Client;
+import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.util.collection.Pair;
 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;
@@ -52,6 +58,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;
 
@@ -86,9 +95,10 @@ public class SoneDownloader extends AbstractService {
         *            The Sone to add
         */
        public void addSone(Sone sone) {
-               if (sones.add(sone)) {
-                       freenetInterface.registerUsk(sone, this);
+               if (!sones.add(sone)) {
+                       freenetInterface.unregisterUsk(sone);
                }
+               freenetInterface.registerUsk(sone, this);
        }
 
        /**
@@ -111,25 +121,56 @@ 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);
+               fetchSone(sone, sone.getRequestUri().sskForUSK());
+       }
+
+       /**
+        * Fetches the updated Sone. This method can be used to fetch a Sone from a
+        * specific URI.
+        *
+        * @param sone
+        *            The Sone to fetch
+        * @param soneUri
+        *            The URI to fetch the Sone from
+        */
+       public void fetchSone(Sone sone, FreenetURI soneUri) {
+               fetchSone(sone, soneUri, false);
+       }
+
+       /**
+        * Fetches the Sone from the given URI.
+        *
+        * @param sone
+        *            The Sone to fetch
+        * @param soneUri
+        *            The URI of the Sone to fetch
+        * @param fetchOnly
+        *            {@code true} to only fetch and parse the Sone, {@code false}
+        *            to {@link Core#updateSone(Sone) update} it in the core
+        * @return The downloaded Sone, or {@code null} if the Sone could not be
+        *         downloaded
+        */
+       public Sone fetchSone(Sone sone, FreenetURI soneUri, boolean fetchOnly) {
+               logger.log(Level.FINE, String.format("Starting fetch for Sone “%s” from %s…", sone, soneUri));
+               FreenetURI requestUri = soneUri.setMetaString(new String[] { "sone.xml" });
+               sone.setStatus(SoneStatus.downloading);
                try {
-                       FetchResult fetchResult = freenetInterface.fetchUri(requestUri);
-                       if (fetchResult == null) {
+                       Pair<FreenetURI, FetchResult> fetchResults = freenetInterface.fetchUri(requestUri);
+                       if (fetchResults == null) {
                                /* TODO - mark Sone as bad. */
-                               return;
+                               return null;
                        }
-                       logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size());
-                       Sone parsedSone = parseSone(sone, fetchResult, requestUri);
+                       logger.log(Level.FINEST, String.format("Got %d bytes back.", fetchResults.getRight().size()));
+                       Sone parsedSone = parseSone(sone, fetchResults.getRight(), fetchResults.getLeft());
                        if (parsedSone != null) {
-                               core.addSone(parsedSone);
+                               if (!fetchOnly) {
+                                       core.updateSone(parsedSone);
+                                       addSone(parsedSone);
+                               }
                        }
+                       return parsedSone;
                } finally {
-                       core.setSoneStatus(sone, (sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
+                       sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
                }
        }
 
@@ -145,118 +186,212 @@ public class SoneDownloader extends AbstractService {
         * @return The parsed Sone, or {@code null} if the Sone could not be parsed
         */
        public Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) {
-               logger.log(Level.FINEST, "Persing FetchResult (%d bytes, %s) for %s…", new Object[] { fetchResult.size(), fetchResult.getMimeType(), originalSone });
-               /* TODO - impose a size limit? */
-               InputStream xmlInputStream = null;
-               Bucket xmlBucket = null;
-               Sone sone;
+               logger.log(Level.FINEST, String.format("Parsing FetchResult (%d bytes, %s) for %s…", fetchResult.size(), fetchResult.getMimeType(), originalSone));
+               Bucket soneBucket = fetchResult.asBucket();
+               InputStream soneInputStream = null;
                try {
-                       xmlBucket = fetchResult.asBucket();
-                       xmlInputStream = xmlBucket.getInputStream();
-                       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);
-                       } catch (NullPointerException npe1) {
-                               /* for some reason, invalid XML can cause NPEs. */
-                               logger.log(Level.WARNING, "XML for Sone " + originalSone + " can not be parsed!", npe1);
-                               return null;
+                       soneInputStream = soneBucket.getInputStream();
+                       Sone parsedSone = parseSone(originalSone, soneInputStream);
+                       if (parsedSone != null) {
+                               parsedSone.setLatestEdition(requestUri.getEdition());
+                               if (requestUri.getKeyType().equals("USK")) {
+                                       parsedSone.setRequestUri(requestUri.setMetaString(new String[0]));
+                               } else {
+                                       parsedSone.setRequestUri(requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]));
+                               }
                        }
+                       return parsedSone;
+               } catch (Exception e1) {
+                       logger.log(Level.WARNING, String.format("Could not parse Sone from %s!", requestUri), e1);
+               } finally {
+                       Closer.close(soneInputStream);
+                       soneBucket.free();
+               }
+               return null;
+       }
 
-                       /* check ID. */
-                       String soneId = soneXml.getValue("id", null);
-                       if ((originalSone != null) && !originalSone.getId().equals(soneId)) {
-                               /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded ID for Sone %s (%s) does not match known ID (%s)!", new Object[] { originalSone, originalSone.getId(), soneId });
-                               return null;
-                       }
+       /**
+        * Parses a Sone from the given input stream and creates a new Sone from the
+        * parsed data.
+        *
+        * @param originalSone
+        *            The Sone to update
+        * @param soneInputStream
+        *            The input stream to parse the Sone from
+        * @return The parsed Sone
+        * @throws SoneException
+        *             if a parse error occurs, or the protocol is invalid
+        */
+       public Sone parseSone(Sone originalSone, InputStream soneInputStream) throws SoneException {
+               /* TODO - impose a size limit? */
 
-                       /* load Sone from core. */
-                       sone = originalSone;
-                       if (sone == null) {
-                               sone = core.getSone(soneId).setRequestUri(requestUri.setMetaString(new String[] {}));
-                       }
+               Document document;
+               /* XML parsing is not thread-safe. */
+               synchronized (this) {
+                       document = XML.transformToDocument(soneInputStream);
+               }
+               if (document == null) {
+                       /* TODO - mark Sone as bad. */
+                       logger.log(Level.WARNING, String.format("Could not parse XML for Sone %s!", originalSone));
+                       return null;
+               }
 
-                       String soneName = soneXml.getValue("name", null);
-                       if (soneName == null) {
-                               /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded name for Sone %s was null!", new Object[] { sone });
-                               return null;
-                       }
-                       sone.setName(soneName);
+               Sone sone = new Sone(originalSone.getId()).setIdentity(originalSone.getIdentity());
 
-                       String soneTime = soneXml.getValue("time", null);
-                       if (soneTime == null) {
-                               /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded time for Sone %s was null!", new Object[] { sone });
+               SimpleXML soneXml;
+               try {
+                       soneXml = SimpleXML.fromDocument(document);
+               } catch (NullPointerException npe1) {
+                       /* for some reason, invalid XML can cause NPEs. */
+                       logger.log(Level.WARNING, String.format("XML for Sone %s can not be parsed!", sone), npe1);
+                       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, String.format("Invalid protocol version: %d! Not parsing Sone.", protocolVersion));
+                       return null;
+               }
+
+               /* check for valid versions. */
+               if (protocolVersion > MAX_PROTOCOL_VERSION) {
+                       logger.log(Level.WARNING, String.format("Unknown protocol version: %d! Not parsing Sone.", protocolVersion));
+                       return null;
+               }
+
+               String soneTime = soneXml.getValue("time", null);
+               if (soneTime == null) {
+                       /* TODO - mark Sone as bad. */
+                       logger.log(Level.WARNING, String.format("Downloaded time for Sone %s was null!", sone));
+                       return null;
+               }
+               try {
+                       sone.setTime(Long.parseLong(soneTime));
+               } catch (NumberFormatException nfe1) {
+                       /* TODO - mark Sone as bad. */
+                       logger.log(Level.WARNING, String.format("Downloaded Sone %s with invalid time: %s", sone, soneTime));
+                       return null;
+               }
+
+               SimpleXML clientXml = soneXml.getNode("client");
+               if (clientXml != null) {
+                       String clientName = clientXml.getValue("name", null);
+                       String clientVersion = clientXml.getValue("version", null);
+                       if ((clientName == null) || (clientVersion == null)) {
+                               logger.log(Level.WARNING, String.format("Download Sone %s with client XML but missing name or version!", sone));
                                return null;
                        }
+                       sone.setClient(new Client(clientName, clientVersion));
+               }
+
+               String soneRequestUri = soneXml.getValue("request-uri", null);
+               if (soneRequestUri != null) {
                        try {
-                               sone.setTime(Long.parseLong(soneTime));
-                       } catch (NumberFormatException nfe1) {
+                               sone.setRequestUri(new FreenetURI(soneRequestUri));
+                       } catch (MalformedURLException mue1) {
                                /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded Sone %s with invalid time: %s", new Object[] { sone, soneTime });
+                               logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid request URI: %s", sone, soneRequestUri), mue1);
                                return null;
                        }
+               }
 
-                       SimpleXML profileXml = soneXml.getNode("profile");
-                       if (profileXml == null) {
+               String soneInsertUri = soneXml.getValue("insert-uri", null);
+               if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
+                       try {
+                               sone.setInsertUri(new FreenetURI(soneInsertUri));
+                               sone.setLatestEdition(Math.max(sone.getRequestUri().getEdition(), sone.getInsertUri().getEdition()));
+                       } catch (MalformedURLException mue1) {
                                /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded Sone %s has no profile!", new Object[] { sone });
+                               logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid insert URI: %s", sone, soneInsertUri), mue1);
                                return null;
                        }
+               }
 
-                       /* parse profile. */
-                       String profileFirstName = profileXml.getValue("first-name", null);
-                       String profileMiddleName = profileXml.getValue("middle-name", null);
-                       String profileLastName = profileXml.getValue("last-name", null);
-                       Profile profile = new Profile().setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName);
+               SimpleXML profileXml = soneXml.getNode("profile");
+               if (profileXml == null) {
+                       /* TODO - mark Sone as bad. */
+                       logger.log(Level.WARNING, String.format("Downloaded Sone %s has no profile!", sone));
+                       return null;
+               }
 
-                       /* parse posts. */
-                       SimpleXML postsXml = soneXml.getNode("posts");
-                       if (postsXml == null) {
-                               /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded Sone %s has no posts!", new Object[] { sone });
-                               return null;
+               /* parse profile. */
+               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(sone).setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName);
+               profile.setBirthDay(profileBirthDay).setBirthMonth(profileBirthMonth).setBirthYear(profileBirthYear);
+               /* avatar is processed after images are loaded. */
+               String avatarId = profileXml.getValue("avatar", null);
+
+               /* 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", "");
+                               if (fieldName == null) {
+                                       logger.log(Level.WARNING, String.format("Downloaded profile field for Sone %s with missing data! Name: %s, Value: %s", sone, fieldName, fieldValue));
+                                       return null;
+                               }
+                               try {
+                                       profile.addField(fieldName).setValue(fieldValue);
+                               } catch (IllegalArgumentException iae1) {
+                                       logger.log(Level.WARNING, String.format("Duplicate field: %s", fieldName), iae1);
+                                       return null;
+                               }
                        }
+               }
 
-                       Set<Post> posts = new HashSet<Post>();
+               /* 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, String.format("Downloaded Sone %s has no posts!", sone));
+               } else {
                        for (SimpleXML postXml : postsXml.getNodes("post")) {
                                String postId = postXml.getValue("id", null);
+                               String postRecipientId = postXml.getValue("recipient", 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 });
+                                       logger.log(Level.WARNING, String.format("Downloaded post for Sone %s with missing data! ID: %s, Time: %s, Text: %s", sone, postId, postTime, postText));
                                        return null;
                                }
                                try {
-                                       posts.add(core.getPost(postId).setSone(sone).setTime(Long.parseLong(postTime)).setText(postText));
+                                       Post post = core.getPost(postId).setSone(sone).setTime(Long.parseLong(postTime)).setText(postText);
+                                       if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
+                                               post.setRecipient(core.getSone(postRecipientId));
+                                       }
+                                       posts.add(post);
                                } 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 });
+                                       logger.log(Level.WARNING, String.format("Downloaded post for Sone %s with invalid time: %s", sone, postTime));
                                        return null;
                                }
                        }
+               }
 
-                       /* parse replies. */
-                       SimpleXML repliesXml = soneXml.getNode("replies");
-                       if (repliesXml == null) {
-                               /* TODO - mark Sone as bad. */
-                               logger.log(Level.WARNING, "Downloaded Sone %s has no replies!", new Object[] { sone });
-                               return null;
-                       }
-
-                       Set<Reply> replies = new HashSet<Reply>();
+               /* parse replies. */
+               SimpleXML repliesXml = soneXml.getNode("replies");
+               Set<PostReply> replies = new HashSet<PostReply>();
+               if (repliesXml == null) {
+                       /* TODO - mark Sone as bad. */
+                       logger.log(Level.WARNING, String.format("Downloaded Sone %s has no replies!", sone));
+               } else {
                        for (SimpleXML replyXml : repliesXml.getNodes("reply")) {
                                String replyId = replyXml.getValue("id", null);
                                String replyPostId = replyXml.getValue("post-id", null);
@@ -264,68 +399,120 @@ public class SoneDownloader extends AbstractService {
                                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 });
+                                       logger.log(Level.WARNING, String.format("Downloaded reply for Sone %s with missing data! ID: %s, Post: %s, Time: %s, Text: %s", 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 });
+                                       logger.log(Level.WARNING, String.format("Downloaded reply for Sone %s with invalid time: %s", sone, replyTime));
                                        return null;
                                }
                        }
+               }
 
-                       /* 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;
+               /* 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, String.format("Downloaded Sone %s has no post likes!", sone));
+               } else {
+                       for (SimpleXML likedPostIdXml : likePostIdsXml.getNodes("post-like")) {
+                               String postId = likedPostIdXml.getValue();
+                               likedPostIds.add(postId);
                        }
+               }
 
-                       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 });
+               /* 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, String.format("Downloaded Sone %s has no reply likes!", sone));
+               } else {
+                       for (SimpleXML likedReplyIdXml : likeReplyIdsXml.getNodes("reply-like")) {
+                               String replyId = likedReplyIdXml.getValue();
+                               likedReplyIds.add(replyId);
+                       }
+               }
+
+               /* parse albums. */
+               SimpleXML albumsXml = soneXml.getNode("albums");
+               List<Album> topLevelAlbums = new ArrayList<Album>();
+               if (albumsXml != null) {
+                       for (SimpleXML albumXml : albumsXml.getNodes("album")) {
+                               String id = albumXml.getValue("id", null);
+                               String parentId = albumXml.getValue("parent", null);
+                               String title = albumXml.getValue("title", null);
+                               String description = albumXml.getValue("description", "");
+                               String albumImageId = albumXml.getValue("album-image", null);
+                               if ((id == null) || (title == null) || (description == null)) {
+                                       logger.log(Level.WARNING, String.format("Downloaded Sone %s contains invalid album!", sone));
                                        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;
+                               Album parent = null;
+                               if (parentId != null) {
+                                       parent = core.getAlbum(parentId, false);
+                                       if (parent == null) {
+                                               logger.log(Level.WARNING, String.format("Downloaded Sone %s has album with invalid parent!", sone));
+                                               return null;
+                                       }
                                }
+                               Album album = core.getAlbum(id).setSone(sone).setTitle(title).setDescription(description);
+                               if (parent != null) {
+                                       parent.addAlbum(album);
+                               } else {
+                                       topLevelAlbums.add(album);
+                               }
+                               SimpleXML imagesXml = albumXml.getNode("images");
+                               if (imagesXml != null) {
+                                       for (SimpleXML imageXml : imagesXml.getNodes("image")) {
+                                               String imageId = imageXml.getValue("id", null);
+                                               String imageCreationTimeString = imageXml.getValue("creation-time", null);
+                                               String imageKey = imageXml.getValue("key", null);
+                                               String imageTitle = imageXml.getValue("title", null);
+                                               String imageDescription = imageXml.getValue("description", "");
+                                               String imageWidthString = imageXml.getValue("width", null);
+                                               String imageHeightString = imageXml.getValue("height", null);
+                                               if ((imageId == null) || (imageCreationTimeString == null) || (imageKey == null) || (imageTitle == null) || (imageWidthString == null) || (imageHeightString == null)) {
+                                                       logger.log(Level.WARNING, String.format("Downloaded Sone %s contains invalid images!", sone));
+                                                       return null;
+                                               }
+                                               long creationTime = Numbers.safeParseLong(imageCreationTimeString, 0L);
+                                               int imageWidth = Numbers.safeParseInteger(imageWidthString, 0);
+                                               int imageHeight = Numbers.safeParseInteger(imageHeightString, 0);
+                                               if ((imageWidth < 1) || (imageHeight < 1)) {
+                                                       logger.log(Level.WARNING, String.format("Downloaded Sone %s contains image %s with invalid dimensions (%s, %s)!", sone, imageId, imageWidthString, imageHeightString));
+                                                       return null;
+                                               }
+                                               Image image = core.getImage(imageId).setSone(sone).setKey(imageKey).setCreationTime(creationTime);
+                                               image.setTitle(imageTitle).setDescription(imageDescription);
+                                               image.setWidth(imageWidth).setHeight(imageHeight);
+                                               album.addImage(image);
+                                       }
+                               }
+                               album.setAlbumImage(albumImageId);
                        }
+               }
 
-                       /* okay, apparently everything was parsed correctly. Now import. */
-                       /* atomic setter operation on the Sone. */
-                       synchronized (sone) {
-                               sone.setProfile(profile);
-                               sone.setPosts(posts);
-                               sone.setReplies(replies);
-                               sone.setModificationCounter(0);
-                       }
-
-                       /* add all known Sones to core for downloading. */
-                       for (Sone knownSone : knownSones) {
-                               core.addSone(knownSone);
-                       }
+               /* process avatar. */
+               if (avatarId != null) {
+                       profile.setAvatar(core.getImage(avatarId, false));
+               }
 
-               } catch (IOException ioe1) {
-                       logger.log(Level.WARNING, "Could not read XML file from " + originalSone + "!", ioe1);
-                       return null;
-               } finally {
-                       if (xmlBucket != null) {
-                               xmlBucket.free();
-                       }
-                       Closer.close(xmlInputStream);
+               /* okay, apparently everything was parsed correctly. Now import. */
+               /* atomic setter operation on the Sone. */
+               synchronized (sone) {
+                       sone.setProfile(profile);
+                       sone.setPosts(posts);
+                       sone.setReplies(replies);
+                       sone.setLikePostIds(likedPostIds);
+                       sone.setLikeReplyIds(likedReplyIds);
+                       sone.setAlbums(topLevelAlbums);
                }
+
                return sone;
        }