X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneParser.java;h=1fe4794853b57da2dbd5ef87e8d7d2d5dc65cf00;hb=a3ba9ccfd92c4497a40f5326254a2200e5016c82;hp=3158a0b60d52e2b2771853e1fa54ddcc674d5f96;hpb=7708df5b6f4d1cf1416a8202b825a4f6f78f289e;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 3158a0b..1fe4794 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java @@ -71,7 +71,7 @@ public class SoneParser { * The input stream to parse the Sone from * @return The parsed Sone */ - public Optional parseSone(Database database, Sone originalSone, InputStream soneInputStream) { + public Sone parseSone(Database database, Sone originalSone, InputStream soneInputStream) { /* TODO - impose a size limit? */ Document document; @@ -82,13 +82,13 @@ public class SoneParser { if (document == null) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, String.format("Could not parse XML for Sone %s!", originalSone.getId())); - return absent(); + throw new InvalidXml(); } Optional soneXml = parseXml(originalSone, document); if (!soneXml.isPresent()) { logger.log(Level.WARNING, String.format("XML for Sone %s can not be parsed!", originalSone.getId())); - return absent(); + throw new InvalidXml(); } Optional parsedClient = parseClient(originalSone, soneXml.get()); @@ -98,11 +98,11 @@ public class SoneParser { if (protocolVersion.isPresent()) { if (protocolVersion.get() < 0) { logger.log(Level.WARNING, String.format("Invalid protocol version: %d! Not parsing Sone.", protocolVersion.get())); - return absent(); + throw new InvalidProtocolVersion(); } if (protocolVersion.get() > MAX_PROTOCOL_VERSION) { logger.log(Level.WARNING, String.format("Unknown protocol version: %d! Not parsing Sone.", protocolVersion.get())); - return absent(); + throw new InvalidProtocolVersion(); } } @@ -110,21 +110,21 @@ public class SoneParser { if (soneTime == null) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, String.format("Downloaded time for Sone %s was null!", sone)); - return absent(); + throw new MalformedXml(); } 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 absent(); + throw new MalformedXml(); } 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)); - return absent(); + throw new MalformedXml(); } /* parse profile. */ @@ -147,13 +147,13 @@ public class SoneParser { 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 absent(); + throw new MalformedXml(); } try { profile.setField(profile.addField(fieldName), fieldValue); } catch (IllegalArgumentException iae1) { logger.log(Level.WARNING, String.format("Duplicate field: %s", fieldName), iae1); - return absent(); + throw new DuplicateField(); } } } @@ -173,7 +173,7 @@ public class SoneParser { if ((postId == null) || (postTime == null) || (postText == null)) { /* TODO - mark Sone as bad. */ 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 absent(); + throw new MalformedXml(); } try { PostBuilder postBuilder = sone.newPostBuilder(); @@ -186,7 +186,7 @@ public class SoneParser { } catch (NumberFormatException nfe1) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, String.format("Downloaded post for Sone %s with invalid time: %s", sone, postTime)); - return absent(); + throw new MalformedTime(); } } } @@ -206,7 +206,7 @@ public class SoneParser { if ((replyId == null) || (replyPostId == null) || (replyTime == null) || (replyText == null)) { /* TODO - mark Sone as bad. */ 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 absent(); + return null; } try { /* TODO - parse time correctly. */ @@ -215,7 +215,7 @@ public class SoneParser { } catch (NumberFormatException nfe1) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, String.format("Downloaded reply for Sone %s with invalid time: %s", sone, replyTime)); - return absent(); + return null; } } } @@ -258,14 +258,14 @@ public class SoneParser { 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 absent(); + return null; } Album parent = sone.getRootAlbum(); if (parentId != null) { parent = albums.get(parentId); if (parent == null) { logger.log(Level.WARNING, String.format("Downloaded Sone %s has album with invalid parent!", sone)); - return absent(); + return null; } } Album album = parent.newAlbumBuilder().withId(id).build().modify().setTitle(title).setDescription(description).update(); @@ -282,14 +282,14 @@ public class SoneParser { 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 absent(); + 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 absent(); + return null; } Image image = album.newImageBuilder().withId(imageId).at(imageKey).created(creationTime).sized(imageWidth, imageHeight).build(Optional.absent()); image = image.modify().setTitle(imageTitle).setDescription(imageDescription).update(); @@ -309,7 +309,7 @@ public class SoneParser { sone.setLikePostIds(likedPostIds); sone.setLikeReplyIds(likedReplyIds); - return of(sone); + return sone; } private Optional parseProtocolVersion(SimpleXML soneXml) { @@ -344,4 +344,23 @@ public class SoneParser { return of(new Client(clientName, clientVersion)); } + public static class InvalidXml extends RuntimeException { + + } + + public static class InvalidProtocolVersion extends RuntimeException { + + } + + public static class MalformedXml extends RuntimeException { + + } + + public static class DuplicateField extends RuntimeException { + + } + + public static class MalformedTime extends RuntimeException { + + } }