X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fwatchers%2FKickAssTorrentsEpisodeWatcher.java;h=0fec686484beee2400b7540838eba8220ae4cc39;hb=15e9d53a33f0b1b6070243d7d3f1aba4c647f38c;hp=e8a8574bca5a0edb16646209fb6657325d2875ad;hpb=2cfb47378cd3a35030c659e516825e90b36269d0;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/watchers/KickAssTorrentsEpisodeWatcher.java b/src/main/java/net/pterodactylus/rhynodge/watchers/KickAssTorrentsEpisodeWatcher.java
index e8a8574..0fec686 100644
--- a/src/main/java/net/pterodactylus/rhynodge/watchers/KickAssTorrentsEpisodeWatcher.java
+++ b/src/main/java/net/pterodactylus/rhynodge/watchers/KickAssTorrentsEpisodeWatcher.java
@@ -17,19 +17,21 @@
 
 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.EpisodeFilter;
 import net.pterodactylus.rhynodge.filters.HtmlFilter;
+import net.pterodactylus.rhynodge.filters.SizeBlacklistFilter;
 import net.pterodactylus.rhynodge.filters.torrents.KickAssTorrentsFilter;
+import net.pterodactylus.rhynodge.mergers.EpisodeMerger;
 import net.pterodactylus.rhynodge.queries.HttpQuery;
-import net.pterodactylus.rhynodge.triggers.NewEpisodeTrigger;
 
 import com.google.common.collect.ImmutableList;
 
@@ -48,7 +50,7 @@ public class KickAssTorrentsEpisodeWatcher extends DefaultWatcher {
 	 *            The terms to search for
 	 */
 	public KickAssTorrentsEpisodeWatcher(String searchTerms) {
-		super(createHttpQuery(searchTerms), createFilters(), createTrigger());
+		super(createHttpQuery(searchTerms), createFilters(), new EpisodeMerger());
 	}
 
 	//
@@ -64,7 +66,7 @@ public class KickAssTorrentsEpisodeWatcher extends DefaultWatcher {
 	 */
 	private static Query createHttpQuery(String searchTerms) {
 		try {
-			return new HttpQuery("http://kat.ph/usearch/" + URLEncoder.encode(searchTerms, "UTF-8") + "/?field=time_add&sorder=desc");
+			return new HttpQuery("https://kat.cr/usearch/" + URLEncoder.encode(searchTerms, "UTF-8") + "/?field=time_add&sorder=desc");
 		} catch (UnsupportedEncodingException uee1) {
 			/* will not happen. */
 			return null;
@@ -77,16 +79,7 @@ public class KickAssTorrentsEpisodeWatcher extends DefaultWatcher {
 	 * @return The filters of the watcher
 	 */
 	private static List<Filter> createFilters() {
-		return ImmutableList.<Filter> of(new HtmlFilter(), new KickAssTorrentsFilter(), 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 KickAssTorrentsFilter(), createDefaultBlacklistFilter(), new SizeBlacklistFilter(), new EpisodeFilter());
 	}
 
 }