X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fwatchers%2FPirateBayEpisodeWatcher.java;h=eed6c9005538b8bed8b10a93d40d3c39a35229c5;hb=131acd50b152128f19f9a59329faa1532e5f8e5f;hp=9ef3d795f58408b4dd23f56485397aeefc565a99;hpb=b1c7de25c9ce6b9ced6a659539bb2dab68c09866;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayEpisodeWatcher.java b/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayEpisodeWatcher.java
index 9ef3d79..eed6c90 100644
--- a/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayEpisodeWatcher.java
+++ b/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayEpisodeWatcher.java
@@ -25,13 +25,14 @@ 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.EpisodeFilter;
 import net.pterodactylus.rhynodge.filters.HtmlFilter;
+import net.pterodactylus.rhynodge.filters.SizeBlacklistFilter;
 import net.pterodactylus.rhynodge.filters.torrents.PirateBayFilter;
+import net.pterodactylus.rhynodge.mergers.EpisodeMerger;
+import net.pterodactylus.rhynodge.queries.FallbackQuery;
 import net.pterodactylus.rhynodge.queries.HttpQuery;
-import net.pterodactylus.rhynodge.triggers.NewEpisodeTrigger;
 
 import com.google.common.collect.ImmutableList;
 
@@ -49,7 +50,7 @@ public class PirateBayEpisodeWatcher extends DefaultWatcher {
 	 *            The terms to search for
 	 */
 	public PirateBayEpisodeWatcher(String searchTerms, String proxy) {
-		super(createHttpQuery(searchTerms, extractProxyHost(proxy), extractProxyPort(proxy)), createFilters(), createTrigger());
+		super(createHttpQuery(searchTerms, extractProxyHost(proxy), extractProxyPort(proxy)), createFilters(), new EpisodeMerger());
 	}
 
 	private static String extractProxyHost(String proxy) {
@@ -66,7 +67,10 @@ public class PirateBayEpisodeWatcher extends DefaultWatcher {
 
 	private static Query createHttpQuery(String searchTerms, String proxyHost, int proxyPort) {
 		try {
-			return new HttpQuery("http://thepiratebay.org/search/" + URLEncoder.encode(searchTerms, "UTF-8") + "/0/3/0", proxyHost, proxyPort);
+			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;
@@ -79,16 +83,7 @@ public class PirateBayEpisodeWatcher extends DefaultWatcher {
 	 * @return The filters of the watcher
 	 */
 	private static List<Filter> createFilters() {
-		return ImmutableList.of(new HtmlFilter(), new PirateBayFilter(), createDefaultBlacklistFilter(), new EpisodeFilter());
-	}
-
-	/**
-	 * Creates the trigger of the watcher.
-	 *
-	 * @return The trigger of the watcher
-	 */
-	private static Trigger createTrigger() {
-		return new NewEpisodeTrigger();
+		return ImmutableList.of(new HtmlFilter(), new PirateBayFilter(), createDefaultBlacklistFilter(), new SizeBlacklistFilter(), new EpisodeFilter());
 	}
 
 }