From ed2082dfe8b2804ea0c6a99355e57fe031c5cc6c Mon Sep 17 00:00:00 2001 From: MrPlaygon <-> Date: Thu, 4 Apr 2019 20:12:41 +0200 Subject: [PATCH] Added check if login URL results in 404 for development purpose --- .../ripper/rippers/DeviantartRipper.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java index 6a171228..80b78f1a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java @@ -207,7 +207,7 @@ public class DeviantartRipper extends AbstractHTMLRipper { Utils.setConfigString(utilsKey, serialize(new HashMap(getDACookie()))); Utils.saveConfig(); // save now because of other instances that might work simultaneously - }else { + } else { LOGGER.info("No new Login needed"); } @@ -394,6 +394,7 @@ public class DeviantartRipper extends AbstractHTMLRipper { /** * Updates cookies + * * @param m new Cookies */ private void updateCookie(Map m) { @@ -402,7 +403,7 @@ public class DeviantartRipper extends AbstractHTMLRipper { while (iter.hasNext()) { String current = iter.next(); if (!this.allowedCookies.contains(current)) { - //m.remove(current); + // m.remove(current); iter.remove(); } } @@ -420,8 +421,7 @@ public class DeviantartRipper extends AbstractHTMLRipper { } catch (IOException e) { e.printStackTrace(); } - - + } /** @@ -564,13 +564,14 @@ public class DeviantartRipper extends AbstractHTMLRipper { .followRedirects(true).execute(); URL location = download.url(); + System.out.println("----------------> " + url); String[] filetypePart = download.header("Content-Disposition").split("\\."); LOGGER.info("Found Image URL"); LOGGER.info(url); LOGGER.info(location); - addURLToDownload(location, "", "", "", new HashMap(), + addURLToDownload(location, "", "", "", getDACookie(), title + "." + filetypePart[filetypePart.length - 1]); return; } @@ -614,7 +615,14 @@ public class DeviantartRipper extends AbstractHTMLRipper { LOGGER.info("Found Image URL"); LOGGER.info(url); LOGGER.info(parts[0]); - + while (Http.url(parts[0]).connection().execute().statusCode() == 404) { + try { + LOGGER.error("404 on " + url); + Thread.sleep(1000); + } catch (Exception e) { + e.printStackTrace(); + } + } addURLToDownload(new URL(parts[0]), "", "", "", new HashMap(), title + "." + tmpParts[tmpParts.length - 1]); return;