X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fwatchers%2FPirateBayEpisodeWatcher.java;h=eed6c9005538b8bed8b10a93d40d3c39a35229c5;hb=00e49489dcbb093895a9a7bfb252b7392b341138;hp=4fec73013cb0b5f675d59279c626902e2699d653;hpb=b304bea61c03505fea7c288164ead3233ef36655;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 4fec730..eed6c90 100644 --- a/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayEpisodeWatcher.java +++ b/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayEpisodeWatcher.java @@ -25,15 +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; @@ -51,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) { @@ -87,13 +86,4 @@ public class PirateBayEpisodeWatcher extends DefaultWatcher { return ImmutableList.of(new HtmlFilter(), new PirateBayFilter(), createDefaultBlacklistFilter(), new SizeBlacklistFilter(), new EpisodeFilter()); } - /** - * Creates the trigger of the watcher. - * - * @return The trigger of the watcher - */ - private static Trigger createTrigger() { - return new NewEpisodeTrigger(); - } - }