From fe24620e473dceb6efdf9c09cdaeeeb2234cc0e2 Mon Sep 17 00:00:00 2001 From: 4pr0n Date: Sat, 7 Jun 2014 18:03:40 -0700 Subject: [PATCH] 1.0.58 - Logs are written to the album's subdirectory Closes #61 --- .../java/com/rarchives/ripme/ripper/AbstractRipper.java | 6 ++++++ .../rarchives/ripme/ripper/rippers/ButttoucherRipper.java | 2 -- .../java/com/rarchives/ripme/ripper/rippers/ChanRipper.java | 3 --- .../rarchives/ripme/ripper/rippers/DeviantartRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/DrawcrowdRipper.java | 3 --- .../com/rarchives/ripme/ripper/rippers/EHentaiRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/EightmusesRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/FapprovedRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/FlickrRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/GifyoRipper.java | 4 +--- .../com/rarchives/ripme/ripper/rippers/GonewildRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/ImagearnRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/ImagefapRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/ImagestashRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/ImgboxRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/ImgurRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/InstagramRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/IrarchivesRipper.java | 4 +--- .../rarchives/ripme/ripper/rippers/KinkyshareRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/MediacrushRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/MinusRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/ModelmayhemRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/MotherlessRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/NfsfwRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/PhotobucketRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/RedditRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/SeeniveRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/SmuttyRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/SupertangasRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/TeenplanetRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/TumblrRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/TwitterRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/VidbleRipper.java | 2 -- .../java/com/rarchives/ripme/ripper/rippers/VineRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/VineboxRipper.java | 2 -- .../java/com/rarchives/ripme/ripper/rippers/VkRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/XhamsterRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/video/BeegRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/video/PornhubRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/video/VineRipper.java | 2 -- .../com/rarchives/ripme/ripper/rippers/video/VkRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/video/XvideosRipper.java | 2 -- .../rarchives/ripme/ripper/rippers/video/YoupornRipper.java | 2 -- 43 files changed, 8 insertions(+), 88 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 80bd32d0..0027576e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Observable; +import org.apache.log4j.FileAppender; import org.apache.log4j.Logger; import org.jsoup.HttpStatusException; @@ -68,6 +69,11 @@ public abstract class AbstractRipper } this.url = sanitizeURL(url); setWorkingDir(url); + Logger rootLogger = Logger.getRootLogger(); + FileAppender fa = (FileAppender) rootLogger.getAppender("FILE"); + fa.setFile(this.workingDir + File.separator + "log.txt"); + fa.activateOptions(); + this.threadPool = new DownloadThreadPool(); } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ButttoucherRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ButttoucherRipper.java index 49c0555a..7ab6ae48 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ButttoucherRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ButttoucherRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -18,7 +17,6 @@ public class ButttoucherRipper extends AlbumRipper { private static final String DOMAIN = "butttoucher.com", HOST = "butttoucher"; - private static final Logger logger = Logger.getLogger(ButttoucherRipper.class); private Document albumDoc = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java index 7f194e79..206024af 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ChanRipper.java @@ -8,7 +8,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -18,8 +17,6 @@ import com.rarchives.ripme.utils.Utils; public class ChanRipper extends AlbumRipper { - private static final Logger logger = Logger.getLogger(ChanRipper.class); - public ChanRipper(URL url) throws IOException { super(url); } 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 0178a5cd..1a7d7d8e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java @@ -11,7 +11,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Connection.Method; import org.jsoup.Connection.Response; import org.jsoup.Jsoup; @@ -30,7 +29,6 @@ public class DeviantartRipper extends AlbumRipper { HOST = "deviantart"; private static final int SLEEP_TIME = 2000; - private static final Logger logger = Logger.getLogger(DeviantartRipper.class); private Map cookies = new HashMap(); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/DrawcrowdRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/DrawcrowdRipper.java index 87ab1901..fd48e5db 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/DrawcrowdRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/DrawcrowdRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -20,7 +19,6 @@ public class DrawcrowdRipper extends AlbumRipper { private static final String DOMAIN = "drawcrowd.com", HOST = "drawcrowd"; - private static final Logger logger = Logger.getLogger(DrawcrowdRipper.class); public DrawcrowdRipper(URL url) throws IOException { super(url); @@ -42,7 +40,6 @@ public class DrawcrowdRipper extends AlbumRipper { public String getGID(URL url) throws MalformedURLException { Pattern p; Matcher m; - p = Pattern.compile("^.*drawcrowd.com/projects/.*$"); m = p.matcher(url.toExternalForm()); if (m.matches()) { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java index 671548cd..3f614d05 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EHentaiRipper.java @@ -7,7 +7,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -25,7 +24,6 @@ public class EHentaiRipper extends AlbumRipper { private static final int IP_BLOCK_SLEEP_TIME = 60 * 1000; private static final String DOMAIN = "g.e-hentai.org", HOST = "e-hentai"; - private static final Logger logger = Logger.getLogger(EHentaiRipper.class); // Thread pool for finding direct image links from "image" pages (html) private DownloadThreadPool ehentaiThreadPool = new DownloadThreadPool("ehentai"); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java index 876d8059..9970047d 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java @@ -7,7 +7,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Connection.Method; import org.jsoup.Connection.Response; import org.jsoup.Jsoup; @@ -22,7 +21,6 @@ public class EightmusesRipper extends AlbumRipper { private static final String DOMAIN = "8muses.com", HOST = "8muses"; - private static final Logger logger = Logger.getLogger(EightmusesRipper.class); private Document albumDoc = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FapprovedRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FapprovedRipper.java index 6725c4bb..80cd96e4 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FapprovedRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FapprovedRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -18,7 +17,6 @@ public class FapprovedRipper extends AlbumRipper { private static final String DOMAIN = "fapproved.com", HOST = "fapproved"; - private static final Logger logger = Logger.getLogger(FapprovedRipper.class); public FapprovedRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java index b92f955f..6c1d9284 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java @@ -10,7 +10,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Connection.Method; import org.jsoup.Connection.Response; import org.jsoup.Jsoup; @@ -27,7 +26,6 @@ public class FlickrRipper extends AlbumRipper { private static final String DOMAIN = "flickr.com", HOST = "flickr"; - private static final Logger logger = Logger.getLogger(FlickrRipper.class); private DownloadThreadPool flickrThreadPool; private Document albumDoc = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/GifyoRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/GifyoRipper.java index c5a9b074..3cbdd105 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/GifyoRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/GifyoRipper.java @@ -8,10 +8,9 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Connection.Method; -import org.jsoup.Jsoup; import org.jsoup.Connection.Response; +import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; @@ -23,7 +22,6 @@ public class GifyoRipper extends AlbumRipper { private static final String DOMAIN = "gifyo.com", HOST = "gifyo"; - private static final Logger logger = Logger.getLogger(GifyoRipper.class); public GifyoRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/GonewildRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/GonewildRipper.java index 40a376ca..cab298db 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/GonewildRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/GonewildRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -17,7 +16,6 @@ import com.rarchives.ripme.utils.Utils; public class GonewildRipper extends AlbumRipper { private static final String HOST = "gonewild"; - private static final Logger logger = Logger.getLogger(GonewildRipper.class); private static final int SLEEP_TIME = 1000; private static String API_DOMAIN; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java index 531edade..5d2a3893 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagearnRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -18,7 +17,6 @@ public class ImagearnRipper extends AlbumRipper { private static final String DOMAIN = "imagearn.com", HOST = "imagearn"; - private static final Logger logger = Logger.getLogger(ImagearnRipper.class); public ImagearnRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java index 1305f2ea..aa41aeb0 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -19,7 +18,6 @@ public class ImagefapRipper extends AlbumRipper { private static final String DOMAIN = "imagefap.com", HOST = "imagefap"; - private static final Logger logger = Logger.getLogger(ImagefapRipper.class); private Document albumDoc = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagestashRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagestashRipper.java index 32177969..c9c7fbfc 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImagestashRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImagestashRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Connection.Method; @@ -20,7 +19,6 @@ public class ImagestashRipper extends AlbumRipper { private static final String DOMAIN = "imagestash.org", HOST = "imagestash"; - private static final Logger logger = Logger.getLogger(ImagestashRipper.class); public ImagestashRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgboxRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgboxRipper.java index e2e05204..d8b584bf 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgboxRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgboxRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -20,7 +19,6 @@ public class ImgboxRipper extends AlbumRipper { private static final String DOMAIN = "imgbox.com", HOST = "imgbox"; - private static final Logger logger = Logger.getLogger(ImgboxRipper.class); public ImgboxRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java index 5adfc42f..42ff8bee 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -26,7 +25,6 @@ public class ImgurRipper extends AlbumRipper { private static final String DOMAIN = "imgur.com", HOST = "imgur"; - private static final Logger logger = Logger.getLogger(ImgurRipper.class); private final int SLEEP_BETWEEN_ALBUMS; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java index 9d0875c2..5b993b40 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -20,7 +19,6 @@ public class InstagramRipper extends AlbumRipper { private static final String DOMAIN = "instagram.com", HOST = "instagram"; - private static final Logger logger = Logger.getLogger(InstagramRipper.class); public InstagramRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/IrarchivesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/IrarchivesRipper.java index 25312480..d84ae193 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/IrarchivesRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/IrarchivesRipper.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -21,8 +20,7 @@ public class IrarchivesRipper extends AlbumRipper { private static final String DOMAIN = "i.rarchives.com", HOST = "irarchives"; - private static final Logger logger = Logger.getLogger(IrarchivesRipper.class); - + public IrarchivesRipper(URL url) throws IOException { super(url); } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/KinkyshareRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/KinkyshareRipper.java index b28faf21..9f824008 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/KinkyshareRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/KinkyshareRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -17,7 +16,6 @@ import com.rarchives.ripme.utils.Utils; public class KinkyshareRipper extends AlbumRipper { private static final String HOST = "kinkyshare"; - private static final Logger logger = Logger.getLogger(KinkyshareRipper.class); public KinkyshareRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MediacrushRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MediacrushRipper.java index c2963733..596197ec 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/MediacrushRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MediacrushRipper.java @@ -13,7 +13,6 @@ import java.util.regex.Pattern; import javax.swing.JOptionPane; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -28,7 +27,6 @@ public class MediacrushRipper extends AlbumRipper { private static final String DOMAIN = "mediacru.sh", HOST = "mediacrush"; - private static final Logger logger = Logger.getLogger(MediacrushRipper.class); /** Ordered list of preferred formats, sorted by preference (low-to-high) */ private static final Map PREFERRED_FORMATS = new HashMap(); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MinusRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MinusRipper.java index d9e0fc08..21fbfc19 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/MinusRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MinusRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Connection.Response; @@ -21,7 +20,6 @@ public class MinusRipper extends AlbumRipper { private static final String DOMAIN = "minus.com", HOST = "minus"; - private static final Logger logger = Logger.getLogger(MinusRipper.class); private Document albumDoc = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ModelmayhemRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ModelmayhemRipper.java index c17dea2e..d660f831 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ModelmayhemRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ModelmayhemRipper.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Connection.Method; @@ -24,7 +23,6 @@ public class ModelmayhemRipper extends AlbumRipper { private static final String DOMAIN = "modelmayhem.com", HOST = "modelmayhem"; - private static final Logger logger = Logger.getLogger(ModelmayhemRipper.class); public ModelmayhemRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java index 77045195..e9364cb3 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -19,7 +18,6 @@ public class MotherlessRipper extends AlbumRipper { private static final String DOMAIN = "motherless.com", HOST = "motherless"; - private static final Logger logger = Logger.getLogger(MotherlessRipper.class); private DownloadThreadPool motherlessThreadPool; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java index 4159bafd..768e2172 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/NfsfwRipper.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -23,7 +22,6 @@ public class NfsfwRipper extends AlbumRipper { private static final String DOMAIN = "nfsfw.com", HOST = "nfsfw"; - private static final Logger logger = Logger.getLogger(NfsfwRipper.class); private Document albumDoc = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/PhotobucketRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/PhotobucketRipper.java index fe94eec4..81962724 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/PhotobucketRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/PhotobucketRipper.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Connection.Response; @@ -23,7 +22,6 @@ public class PhotobucketRipper extends AlbumRipper { private static final String DOMAIN = "photobucket.com", HOST = "photobucket"; - private static final Logger logger = Logger.getLogger(PhotobucketRipper.class); private Response pageResponse = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java index 3c825fa2..1c4a9f3b 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.json.JSONTokener; @@ -28,7 +27,6 @@ public class RedditRipper extends AlbumRipper { private static final String HOST = "reddit"; private static final String DOMAIN = "reddit.com"; - private static final Logger logger = Logger.getLogger(RedditRipper.class); private static final int SLEEP_TIME = 2000; //private static final String USER_AGENT = "ripme by /u/4_pr0n github.com/4pr0n/ripme"; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/SeeniveRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/SeeniveRipper.java index 86c815f1..161832ea 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/SeeniveRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/SeeniveRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONObject; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -19,7 +18,6 @@ public class SeeniveRipper extends AlbumRipper { private static final String DOMAIN = "seenive.com", HOST = "seenive"; - private static final Logger logger = Logger.getLogger(SeeniveRipper.class); private DownloadThreadPool seeniveThreadPool; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/SmuttyRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/SmuttyRipper.java index 2edfd039..9028c9c8 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/SmuttyRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/SmuttyRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -18,7 +17,6 @@ public class SmuttyRipper extends AlbumRipper { private static final String DOMAIN = "smutty.com", HOST = "smutty"; - private static final Logger logger = Logger.getLogger(SmuttyRipper.class); public SmuttyRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/SupertangasRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/SupertangasRipper.java index 6f2faf7d..0e1be085 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/SupertangasRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/SupertangasRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.HttpStatusException; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -20,7 +19,6 @@ public class SupertangasRipper extends AlbumRipper { private static final String DOMAIN = "supertangas.com", HOST = "supertangas"; - private static final Logger logger = Logger.getLogger(SupertangasRipper.class); public SupertangasRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/TeenplanetRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/TeenplanetRipper.java index ea67b908..430def66 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/TeenplanetRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/TeenplanetRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -19,7 +18,6 @@ public class TeenplanetRipper extends AlbumRipper { private static final String DOMAIN = "teenplanet.org", HOST = "teenplanet"; - private static final Logger logger = Logger.getLogger(TeenplanetRipper.class); private Document albumDoc = null; 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 0e495426..2af56c1e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -19,7 +18,6 @@ public class TumblrRipper extends AlbumRipper { private static final String DOMAIN = "tumblr.com", HOST = "tumblr"; - private static final Logger logger = Logger.getLogger(TumblrRipper.class); private enum ALBUM_TYPE { SUBDOMAIN, diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/TwitterRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/TwitterRipper.java index e5cae727..e18f7fc3 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/TwitterRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/TwitterRipper.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -23,7 +22,6 @@ public class TwitterRipper extends AlbumRipper { private static final String DOMAIN = "twitter.com", HOST = "twitter"; - private static final Logger logger = Logger.getLogger(TwitterRipper.class); private static final int MAX_REQUESTS = Utils.getConfigInteger("twitter.max_requests", 10); private static final int WAIT_TIME = 2000; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java index d5baab85..728c7f78 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/VidbleRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; @@ -19,7 +18,6 @@ public class VidbleRipper extends AlbumRipper { private static final String DOMAIN = "vidble.com", HOST = "vidble"; - private static final Logger logger = Logger.getLogger(VidbleRipper.class); private Document albumDoc = null; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VineRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VineRipper.java index 6a645c1b..eaac39a7 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/VineRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/VineRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.HttpStatusException; @@ -20,7 +19,6 @@ public class VineRipper extends AlbumRipper { private static final String DOMAIN = "vine.co", HOST = "vine"; - private static final Logger logger = Logger.getLogger(VineRipper.class); public VineRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java index 8ddb2e3c..66bc99eb 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.HttpStatusException; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -18,7 +17,6 @@ public class VineboxRipper extends AlbumRipper { private static final String DOMAIN = "vinebox.co", HOST = "vinebox"; - private static final Logger logger = Logger.getLogger(VineboxRipper.class); public VineboxRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java index b8c06868..e3777e6f 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java @@ -11,7 +11,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -25,7 +24,6 @@ public class VkRipper extends AlbumRipper { private static final String DOMAIN = "vk.com", HOST = "vk"; - private static final Logger logger = Logger.getLogger(SeeniveRipper.class); public VkRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java index 5f12bead..b6d57cde 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/XhamsterRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -18,7 +17,6 @@ public class XhamsterRipper extends AlbumRipper { private static final String DOMAIN = "xhamster.com", HOST = "xhamster"; - private static final Logger logger = Logger.getLogger(XhamsterRipper.class); public XhamsterRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/BeegRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/BeegRipper.java index d6be0d4c..02fab55e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/BeegRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/BeegRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -17,7 +16,6 @@ import com.rarchives.ripme.ripper.VideoRipper; public class BeegRipper extends VideoRipper { private static final String HOST = "beeg"; - private static final Logger logger = Logger.getLogger(BeegRipper.class); public BeegRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java index 76e8ef41..c2f79a45 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/PornhubRipper.java @@ -7,7 +7,6 @@ import java.net.URLDecoder; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -19,7 +18,6 @@ import com.rarchives.ripme.utils.AES; public class PornhubRipper extends VideoRipper { private static final String HOST = "pornhub"; - private static final Logger logger = Logger.getLogger(PornhubRipper.class); public PornhubRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/VineRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/VineRipper.java index 62b901b3..ca75e523 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/VineRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/VineRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.select.Elements; @@ -16,7 +15,6 @@ import com.rarchives.ripme.ripper.VideoRipper; public class VineRipper extends VideoRipper { private static final String HOST = "vine"; - private static final Logger logger = Logger.getLogger(VineRipper.class); public VineRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/VkRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/VkRipper.java index 93b51323..8e108be5 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/VkRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/VkRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -15,7 +14,6 @@ import com.rarchives.ripme.ripper.VideoRipper; public class VkRipper extends VideoRipper { private static final String HOST = "vk"; - private static final Logger logger = Logger.getLogger(VkRipper.class); public VkRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/XvideosRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/XvideosRipper.java index e70095eb..752872c6 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/XvideosRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/XvideosRipper.java @@ -7,7 +7,6 @@ import java.net.URLDecoder; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -18,7 +17,6 @@ import com.rarchives.ripme.ripper.VideoRipper; public class XvideosRipper extends VideoRipper { private static final String HOST = "xvideos"; - private static final Logger logger = Logger.getLogger(XvideosRipper.class); public XvideosRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/YoupornRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/YoupornRipper.java index d00ea84b..d4613856 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/YoupornRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/YoupornRipper.java @@ -6,7 +6,6 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -17,7 +16,6 @@ import com.rarchives.ripme.ripper.VideoRipper; public class YoupornRipper extends VideoRipper { private static final String HOST = "youporn"; - private static final Logger logger = Logger.getLogger(YoupornRipper.class); public YoupornRipper(URL url) throws IOException { super(url);