X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneParser.java;h=7640ebd6a699e842b7841ace6bbdbdcc76d0205e;hb=47ced1c22f0604a5b57c79a4d5560e15adfddc0a;hp=7900a10a31f19a46d4bb40c4ebd0841f8581d2b8;hpb=f1a337e97c0188170e8ea8bb06b99324f3a07dee;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 7900a10..7640ebd 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java @@ -17,8 +17,11 @@ package net.pterodactylus.sone.core; +import static com.google.common.base.Optional.absent; +import static com.google.common.base.Optional.fromNullable; +import static com.google.common.base.Optional.of; + import java.io.InputStream; -import java.net.MalformedURLException; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -43,10 +46,9 @@ import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.xml.SimpleXML; import net.pterodactylus.util.xml.XML; -import freenet.keys.FreenetURI; - import com.google.common.base.Optional; import com.google.common.collect.Maps; +import com.google.common.primitives.Ints; import org.w3c.dom.Document; /** @@ -90,51 +92,28 @@ public class SoneParser { return null; } - 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!", originalSone), npe1); + Optional soneXml = parseXml(originalSone, document); + if (!soneXml.isPresent()) { + logger.log(Level.WARNING, String.format("XML for Sone %s can not be parsed!", originalSone)); return null; } - SimpleXML clientXml = soneXml.getNode("client"); - Client soneClient = originalSone.getClient(); - 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!", originalSone)); + Optional parsedClient = parseClient(originalSone, soneXml.get()); + Sone sone = new DefaultSone(new MemoryDatabase(null), originalSone.getId(), originalSone.isLocal(), parsedClient.or(originalSone.getClient())); + + Optional protocolVersion = parseProtocolVersion(originalSone, soneXml.get()); + if (protocolVersion.isPresent()) { + if (protocolVersion.get() < 0) { + logger.log(Level.WARNING, String.format("Invalid protocol version: %d! Not parsing Sone.", protocolVersion)); + return null; + } + if (protocolVersion.get() > MAX_PROTOCOL_VERSION) { + logger.log(Level.WARNING, String.format("Unknown protocol version: %d! Not parsing Sone.", protocolVersion)); return null; } - soneClient = new Client(clientName, clientVersion); - } - - Sone sone = new DefaultSone(new MemoryDatabase(null), originalSone.getId(), originalSone.isLocal(), soneClient); - - 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); + String soneTime = soneXml.get().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)); @@ -148,7 +127,7 @@ public class SoneParser { return null; } - SimpleXML profileXml = soneXml.getNode("profile"); + SimpleXML profileXml = soneXml.get().getNode("profile"); if (profileXml == null) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, String.format("Downloaded Sone %s has no profile!", sone)); @@ -187,7 +166,7 @@ public class SoneParser { } /* parse posts. */ - SimpleXML postsXml = soneXml.getNode("posts"); + SimpleXML postsXml = soneXml.get().getNode("posts"); Set posts = new HashSet(); if (postsXml == null) { /* TODO - mark Sone as bad. */ @@ -208,7 +187,7 @@ public class SoneParser { /* TODO - parse time correctly. */ postBuilder.withId(postId).withTime(Long.parseLong(postTime)).withText(postText); if ((postRecipientId != null) && (postRecipientId.length() == 43)) { - postBuilder.to(Optional.of(postRecipientId)); + postBuilder.to(of(postRecipientId)); } posts.add(postBuilder.build(Optional.absent())); } catch (NumberFormatException nfe1) { @@ -220,7 +199,7 @@ public class SoneParser { } /* parse replies. */ - SimpleXML repliesXml = soneXml.getNode("replies"); + SimpleXML repliesXml = soneXml.get().getNode("replies"); Set replies = new HashSet(); if (repliesXml == null) { /* TODO - mark Sone as bad. */ @@ -249,7 +228,7 @@ public class SoneParser { } /* parse liked post IDs. */ - SimpleXML likePostIdsXml = soneXml.getNode("post-likes"); + SimpleXML likePostIdsXml = soneXml.get().getNode("post-likes"); Set likedPostIds = new HashSet(); if (likePostIdsXml == null) { /* TODO - mark Sone as bad. */ @@ -262,7 +241,7 @@ public class SoneParser { } /* parse liked reply IDs. */ - SimpleXML likeReplyIdsXml = soneXml.getNode("reply-likes"); + SimpleXML likeReplyIdsXml = soneXml.get().getNode("reply-likes"); Set likedReplyIds = new HashSet(); if (likeReplyIdsXml == null) { /* TODO - mark Sone as bad. */ @@ -275,7 +254,7 @@ public class SoneParser { } /* parse albums. */ - SimpleXML albumsXml = soneXml.getNode("albums"); + SimpleXML albumsXml = soneXml.get().getNode("albums"); Map albums = Maps.newHashMap(); if (albumsXml != null) { for (SimpleXML albumXml : albumsXml.getNodes("album")) { @@ -341,4 +320,37 @@ public class SoneParser { return sone; } + + private Optional parseProtocolVersion(Sone originalSone, SimpleXML soneXml) { + String soneProtocolVersion = soneXml.getValue("protocol-version", null); + if (soneProtocolVersion == null) { + logger.log(Level.INFO, "No protocol version found, assuming 0."); + return absent(); + } + return fromNullable(Ints.tryParse(soneProtocolVersion)); + } + + private Optional parseXml(Sone originalSone, Document document) { + try { + return fromNullable(SimpleXML.fromDocument(document)); + } catch (NullPointerException npe1) { + /* for some reason, invalid XML can cause NPEs. */ + return absent(); + } + } + + private Optional parseClient(Sone sone, SimpleXML soneXml) { + SimpleXML clientXml = soneXml.getNode("client"); + if (clientXml == null) { + return absent(); + } + 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; + } + return of(new Client(clientName, clientVersion)); + } + }