X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=8d0d1f29ffa715586c9ea7b4e742cdb6d996dd15;hb=356a84e5ec2bb0936b7d1cdc635f7f051788da6a;hp=ff22dc1f599e446a8a2f4eacb49843fd882f7d7e;hpb=c87610de85485c3837fcae522498b56d50dec723;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 ff22dc1..8d0d1f2 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java @@ -17,7 +17,6 @@ package net.pterodactylus.sone.core; -import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.util.ArrayList; @@ -184,8 +183,8 @@ public class SoneDownloader extends AbstractService { } } return parsedSone; - } catch (IOException ioe1) { - logger.log(Level.WARNING, "Could not parse Sone from " + requestUri + "!", ioe1); + } catch (Exception e1) { + logger.log(Level.WARNING, "Could not parse Sone from " + requestUri + "!", e1); } finally { Closer.close(soneInputStream); soneBucket.free(); @@ -425,7 +424,7 @@ public class SoneDownloader extends AbstractService { String id = albumXml.getValue("id", null); String parentId = albumXml.getValue("parent", null); String title = albumXml.getValue("title", null); - String description = albumXml.getValue("desecription", null); + String description = albumXml.getValue("description", null); if ((id == null) || (title == null) || (description == null)) { logger.log(Level.WARNING, "Downloaded Sone %s contains invalid album!", new Object[] { sone }); return null; @@ -451,14 +450,14 @@ public class SoneDownloader extends AbstractService { String imageCreationTimeString = imageXml.getValue("creation-time", null); String imageKey = imageXml.getValue("key", null); String imageTitle = imageXml.getValue("title", null); - String imageDescription = imageXml.getValue("description", 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) || (imageDescription == null) || (imageWidthString == null) || (imageHeightString == null)) { + if ((imageId == null) || (imageCreationTimeString == null) || (imageKey == null) || (imageTitle == null) || (imageWidthString == null) || (imageHeightString == null)) { logger.log(Level.WARNING, "Downloaded Sone %s contains invalid images!", new Object[] { sone }); return null; } - long creationTime = Numbers.safeParseInteger(imageCreationTimeString, 0); + long creationTime = Numbers.safeParseLong(imageCreationTimeString, 0L); int imageWidth = Numbers.safeParseInteger(imageWidthString, 0); int imageHeight = Numbers.safeParseInteger(imageHeightString, 0); if ((imageWidth < 1) || (imageHeight < 1)) {