From 27efe06a3299bde4346392edef184343aa76f8c6 Mon Sep 17 00:00:00 2001 From: Dominik Sitar Date: Tue, 27 Nov 2018 12:41:44 +0100 Subject: [PATCH] Added better solution to issue #968 --- src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java | 4 ---- .../java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 348f241a..95643b4c 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -563,10 +563,6 @@ public abstract class AbstractRipper LOGGER.error("Got exception while running ripper:", e); waitForThreads(); sendUpdate(STATUS.RIP_ERRORED, "HTTP status code " + e.getStatusCode() + " for URL " + e.getUrl()); - }catch(NullPointerException e){ - LOGGER.error("Got null pointer exception while running ripper:", e); - waitForThreads(); - sendUpdate(STATUS.NO_ALBUM_OR_USER, "Album or user doesn't exist!"); } catch (Exception e) { LOGGER.error("Got exception while running ripper:", e); waitForThreads(); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java index 93e7b318..4b73ba55 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java @@ -171,6 +171,10 @@ public class TumblrRipper extends AlbumRipper { HttpStatusException status = (HttpStatusException)cause; if (status.getStatusCode() == HttpURLConnection.HTTP_UNAUTHORIZED && !useDefaultApiKey) { retry = true; + } else if (status.getStatusCode() == 404) { + LOGGER.error("No user or album found!"); + sendUpdate(STATUS.NO_ALBUM_OR_USER, "Album or user doesn't exist!"); + break; } else if (status.getStatusCode() == 429) { LOGGER.error("Tumblr rate limit has been exceeded"); sendUpdate(STATUS.DOWNLOAD_ERRORED,"Tumblr rate limit has been exceeded");