X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fwatchers%2FPirateBayWatcher.java;h=2254fba4bbcb870f202e03eb95978bca01e0e66b;hb=00e49489dcbb093895a9a7bfb252b7392b341138;hp=1a62e8053e19b3c8b0c5b70e2dd4f2d0a514f87e;hpb=b304bea61c03505fea7c288164ead3233ef36655;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 1a62e80..2254fba 100644 --- a/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayWatcher.java +++ b/src/main/java/net/pterodactylus/rhynodge/watchers/PirateBayWatcher.java @@ -25,14 +25,13 @@ 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; @@ -50,7 +49,7 @@ public class PirateBayWatcher extends DefaultWatcher { * The terms to search for */ public PirateBayWatcher(String searchTerms, String proxy) { - super(createHttpQuery(searchTerms, extractProxyHost(proxy), extractProxyPort(proxy)), createFilters(), createTrigger()); + super(createHttpQuery(searchTerms, extractProxyHost(proxy), extractProxyPort(proxy)), createFilters(), new TorrentMerger()); } private static String extractProxyHost(String proxy) { @@ -93,13 +92,4 @@ public class PirateBayWatcher extends DefaultWatcher { return ImmutableList.of(new HtmlFilter(), new PirateBayFilter(), createDefaultBlacklistFilter(), new SizeBlacklistFilter()); } - /** - * Creates the trigger of the watcher. - * - * @return The trigger of the watcher - */ - private static Trigger createTrigger() { - return new NewTorrentTrigger(); - } - }