X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fwatchers%2FTorrentzEuEpisodeWatcher.java;h=a212359ca419ea2ecb008c5d0500a4ceb2a62c72;hb=131acd50b152128f19f9a59329faa1532e5f8e5f;hp=1c8f048a983b30bd779b7f6d3b84670a6ff94a72;hpb=5e686b0270f96d3d25772a9dc7ab9c752f397e98;p=rhynodge.git diff --git a/src/main/java/net/pterodactylus/rhynodge/watchers/TorrentzEuEpisodeWatcher.java b/src/main/java/net/pterodactylus/rhynodge/watchers/TorrentzEuEpisodeWatcher.java index 1c8f048..a212359 100644 --- a/src/main/java/net/pterodactylus/rhynodge/watchers/TorrentzEuEpisodeWatcher.java +++ b/src/main/java/net/pterodactylus/rhynodge/watchers/TorrentzEuEpisodeWatcher.java @@ -25,12 +25,12 @@ import java.util.List; import net.pterodactylus.rhynodge.Filter; import net.pterodactylus.rhynodge.Query; -import net.pterodactylus.rhynodge.Trigger; import net.pterodactylus.rhynodge.filters.EpisodeFilter; import net.pterodactylus.rhynodge.filters.HtmlFilter; +import net.pterodactylus.rhynodge.filters.SizeBlacklistFilter; import net.pterodactylus.rhynodge.filters.torrents.TorrentzEuFilter; +import net.pterodactylus.rhynodge.mergers.EpisodeMerger; import net.pterodactylus.rhynodge.queries.HttpQuery; -import net.pterodactylus.rhynodge.triggers.NewEpisodeTrigger; import com.google.common.collect.ImmutableList; @@ -49,7 +49,7 @@ public class TorrentzEuEpisodeWatcher extends DefaultWatcher { * The terms to search for */ public TorrentzEuEpisodeWatcher(String searchTerms) { - super(createHttpQuery(searchTerms), createFilters(), createTrigger()); + super(createHttpQuery(searchTerms), createFilters(), new EpisodeMerger()); } // @@ -78,16 +78,7 @@ public class TorrentzEuEpisodeWatcher extends DefaultWatcher { * @return The filters of the watcher */ private static List createFilters() { - return ImmutableList.of(new HtmlFilter(), new TorrentzEuFilter(), 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 TorrentzEuFilter(), createDefaultBlacklistFilter(), new SizeBlacklistFilter(), new EpisodeFilter()); } }