X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fwatchers%2FPirateBayWatcher.java;h=2254fba4bbcb870f202e03eb95978bca01e0e66b;hb=131acd50b152128f19f9a59329faa1532e5f8e5f;hp=e390fd4f940e5abc591e1c45af792de859ef675b;hpb=db8bb9de2adb37c25ab59e6b576fd66de86a4dbf;p=rhynodge.git
diff --git a/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayWatcher.java b/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayWatcher.java
index e390fd4..2254fba 100644
--- a/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayWatcher.java
+++ b/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayWatcher.java
@@ -17,22 +17,26 @@
package net.pterodactylus.rhynodge.watchers;
+import static net.pterodactylus.rhynodge.filters.BlacklistFilter.createDefaultBlacklistFilter;
+
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.List;
import net.pterodactylus.rhynodge.Filter;
import net.pterodactylus.rhynodge.Query;
-import net.pterodactylus.rhynodge.Trigger;
+import net.pterodactylus.rhynodge.Watcher;
import net.pterodactylus.rhynodge.filters.HtmlFilter;
+import net.pterodactylus.rhynodge.filters.SizeBlacklistFilter;
import net.pterodactylus.rhynodge.filters.torrents.PirateBayFilter;
+import net.pterodactylus.rhynodge.mergers.TorrentMerger;
+import net.pterodactylus.rhynodge.queries.FallbackQuery;
import net.pterodactylus.rhynodge.queries.HttpQuery;
-import net.pterodactylus.rhynodge.triggers.NewTorrentTrigger;
import com.google.common.collect.ImmutableList;
/**
- * {@Watcher} implementation that watches The Pirate Bay for new files.
+ * {@link Watcher} implementation that watches The Pirate Bay for new files.
*
* @author David âBombeâ Roden
*/
@@ -44,8 +48,16 @@ public class PirateBayWatcher extends DefaultWatcher {
* @param searchTerms
* The terms to search for
*/
- public PirateBayWatcher(String searchTerms) {
- super(createHttpQuery(searchTerms), createFilters(), createTrigger());
+ public PirateBayWatcher(String searchTerms, String proxy) {
+ super(createHttpQuery(searchTerms, extractProxyHost(proxy), extractProxyPort(proxy)), createFilters(), new TorrentMerger());
+ }
+
+ private static String extractProxyHost(String proxy) {
+ return proxy.split(":")[0];
+ }
+
+ private static int extractProxyPort(String proxy) {
+ return Integer.valueOf(proxy.split(":")[1]);
}
//
@@ -59,9 +71,12 @@ public class PirateBayWatcher extends DefaultWatcher {
* The search terms of the query
* @return The query of the watcher
*/
- private static Query createHttpQuery(String searchTerms) {
+ private static Query createHttpQuery(String searchTerms, String proxyHost, int proxyPort) {
try {
- return new HttpQuery("http://thepiratebay.se/search/" + URLEncoder.encode(searchTerms, "UTF-8") + "/0/3/0");
+ HttpQuery hiddenServiceQuery = new HttpQuery("http://uj3wazyk5u4hnvtk.onion/search/" + URLEncoder.encode(searchTerms, "UTF-8") + "/0/3/0", proxyHost, proxyPort);
+ HttpQuery torQuery = new HttpQuery("http://thepiratebay.org/search/" + URLEncoder.encode(searchTerms, "UTF-8") + "/0/3/0", proxyHost, proxyPort);
+ HttpQuery plainInternetQuery = new HttpQuery("http://thepiratebay.org/search/" + URLEncoder.encode(searchTerms, "UTF-8") + "/0/3/0");
+ return new FallbackQuery(hiddenServiceQuery, torQuery, plainInternetQuery);
} catch (UnsupportedEncodingException uee1) {
/* will not happen. */
return null;
@@ -74,16 +89,7 @@ public class PirateBayWatcher extends DefaultWatcher {
* @return The filters of the watcher
*/
private static List createFilters() {
- return ImmutableList.of(new HtmlFilter(), new PirateBayFilter());
- }
-
- /**
- * Creates the trigger of the watcher.
- *
- * @return The trigger of the watcher
- */
- private static Trigger createTrigger() {
- return new NewTorrentTrigger();
+ return ImmutableList.of(new HtmlFilter(), new PirateBayFilter(), createDefaultBlacklistFilter(), new SizeBlacklistFilter());
}
}