From b8b5cde72833c0dbb800b07ae9af2ff223c6394c Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Fri, 17 Mar 2017 17:33:36 -0400 Subject: [PATCH 1/6] Minor css updates to Furaffinity ripper --- .../com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java index 008a90ad..348a84e4 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java @@ -65,7 +65,7 @@ public class FuraffinityRipper extends AbstractHTMLRipper { return Http.url(url).cookies(cookies).get(); } - + private void login() throws IOException { String user = new String(Base64.decode("cmlwbWU=")); String pass = new String(Base64.decode("cmlwbWVwYXNzd29yZA==")); @@ -113,7 +113,7 @@ public class FuraffinityRipper extends AbstractHTMLRipper { @Override public List getURLsFromPage(Document page) { List urls = new ArrayList(); - Elements urlElements = page.select("b[id^=sid_]"); + Elements urlElements = page.select("figure.t-image > b > u > a"); for (Element e : urlElements) { urls.add(urlBase + e.select("a").first().attr("href")); } From 5b426b4ca3f429135732ba4a27b22550f6880246 Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 19 Mar 2017 18:14:48 -0400 Subject: [PATCH 2/6] Updated getDescriptionsFromPage --- .../com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java index 348a84e4..5311cfe3 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java @@ -122,7 +122,7 @@ public class FuraffinityRipper extends AbstractHTMLRipper { @Override public List getDescriptionsFromPage(Document page) { List urls = new ArrayList(); - Elements urlElements = page.select("b[id^=sid_]"); + Elements urlElements = page.select("figure.t-image > b > u > a"); for (Element e : urlElements) { urls.add(urlBase + e.select("a").first().attr("href")); logger.debug("Desc2 " + urlBase + e.select("a").first().attr("href")); From 48345af6b4c5ec72469ff84c8550d25b2e6d4b7e Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 19 Mar 2017 18:31:17 -0400 Subject: [PATCH 3/6] fur affinity ripper can now save description --- .../com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java index 5311cfe3..9dfbc7a5 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java @@ -157,7 +157,7 @@ public class FuraffinityRipper extends AbstractHTMLRipper { ele.select("p").prepend("\\n\\n"); logger.debug("Returning description at " + page); String tempPage = Jsoup.clean(ele.html().replaceAll("\\\\n", System.getProperty("line.separator")), "", Whitelist.none(), new Document.OutputSettings().prettyPrint(false)); - Elements titles = documentz.select("td[class=\"cat\"][valign=\"top\"] > b"); + Elements titles = documentz.select("meta[property=og:title]"); if (titles.size() == 0) { throw new IOException("No title found"); } From ee949ed487e70a2be9839cf56875963affd44aad Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Thu, 23 Mar 2017 19:23:03 -0400 Subject: [PATCH 4/6] improved file naming --- .../ripper/rippers/FuraffinityRipper.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java index 9dfbc7a5..87ed5634 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java @@ -157,12 +157,8 @@ public class FuraffinityRipper extends AbstractHTMLRipper { ele.select("p").prepend("\\n\\n"); logger.debug("Returning description at " + page); String tempPage = Jsoup.clean(ele.html().replaceAll("\\\\n", System.getProperty("line.separator")), "", Whitelist.none(), new Document.OutputSettings().prettyPrint(false)); - Elements titles = documentz.select("meta[property=og:title]"); - if (titles.size() == 0) { - throw new IOException("No title found"); - } - Element title = titles.get(0); - String tempText = title.text(); + String title = documentz.select("meta[property=og:title]").attr("content"); + String tempText = title; return tempText + "\n" + tempPage; // Overridden saveText takes first line and makes it the file name. } catch (IOException ioe) { logger.info("Failed to get description " + page + " : '" + ioe.getMessage() + "'"); @@ -196,10 +192,7 @@ public class FuraffinityRipper extends AbstractHTMLRipper { workingDir.getCanonicalPath() + subdirectory + File.separator - + getPrefix(index) + saveAs - + " " - + test + ".txt"); // Write the file FileOutputStream out = (new FileOutputStream(saveFileAs)); @@ -255,7 +248,15 @@ public class FuraffinityRipper extends AbstractHTMLRipper { } String link = "http:" + donwloadLink.first().attr("href"); logger.info("Found URL " + link); - addURLToDownload(new URL(link),"","",url.toExternalForm(),cookies); + String[] fileNameSplit = link.split("/"); + String fileName = fileNameSplit[fileNameSplit.length -1]; + File saveAS; + saveAS = new File( + workingDir.getCanonicalPath() + + File.separator + + fileName); + fileName = fileName.replace("[0-9]*\\.", ""); + addURLToDownload(new URL(link),saveAS,"",cookies); } catch (IOException e) { logger.error("[!] Exception while loading/parsing " + this.url, e); } From be093b069a0c1f6d1ae241495b828d5573a7175f Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Thu, 23 Mar 2017 20:40:15 -0400 Subject: [PATCH 5/6] Improved naming --- .../rarchives/ripme/ripper/rippers/FuraffinityRipper.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java index 87ed5634..4622cf30 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java @@ -250,11 +250,17 @@ public class FuraffinityRipper extends AbstractHTMLRipper { logger.info("Found URL " + link); String[] fileNameSplit = link.split("/"); String fileName = fileNameSplit[fileNameSplit.length -1]; + fileName = fileName.replaceAll("[0-9]*\\.", ""); + String[] fileExtSplit = link.split("\\."); + String fileExt = fileExtSplit[fileExtSplit.length -1]; + fileName = fileName.replaceAll(fileExt, ""); File saveAS; saveAS = new File( workingDir.getCanonicalPath() + File.separator - + fileName); + + fileName + + "." + + fileExt); fileName = fileName.replace("[0-9]*\\.", ""); addURLToDownload(new URL(link),saveAS,"",cookies); } catch (IOException e) { From fe3722674c791527befa33932fe39368092d13aa Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Thu, 23 Mar 2017 21:06:22 -0400 Subject: [PATCH 6/6] Improved file naming --- .../com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java index 4622cf30..2a43c60e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java @@ -255,13 +255,13 @@ public class FuraffinityRipper extends AbstractHTMLRipper { String fileExt = fileExtSplit[fileExtSplit.length -1]; fileName = fileName.replaceAll(fileExt, ""); File saveAS; + fileName = fileName.replace("[0-9]*\\.", ""); saveAS = new File( workingDir.getCanonicalPath() + File.separator + fileName + "." + fileExt); - fileName = fileName.replace("[0-9]*\\.", ""); addURLToDownload(new URL(link),saveAS,"",cookies); } catch (IOException e) { logger.error("[!] Exception while loading/parsing " + this.url, e);