X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ftriggers%2FNewEpisodeTrigger.java;h=ea15c8757f8280ec52389df18d23691f796c36ca;hb=2b849c4953b9270c2b90bc6f649617e1151d28ea;hp=5fc4537e1c1fc14e37eddb62eeb08b53afde05d7;hpb=d8dfb420bc8944918bfc00107de5ca4825b21493;p=rhynodge.git diff --git a/src/main/java/net/pterodactylus/rhynodge/triggers/NewEpisodeTrigger.java b/src/main/java/net/pterodactylus/rhynodge/triggers/NewEpisodeTrigger.java index 5fc4537..ea15c87 100644 --- a/src/main/java/net/pterodactylus/rhynodge/triggers/NewEpisodeTrigger.java +++ b/src/main/java/net/pterodactylus/rhynodge/triggers/NewEpisodeTrigger.java @@ -67,7 +67,7 @@ public class NewEpisodeTrigger implements Trigger { // /** - * {@inheritDocs} + * {@inheritDoc} */ @Override public State mergeStates(State previousState, State currentState) { @@ -136,7 +136,7 @@ public class NewEpisodeTrigger implements Trigger { } // - // STATIC METHODS + // PRIVATE METHODS // /** @@ -212,59 +212,52 @@ public class NewEpisodeTrigger implements Trigger { private String generateHtmlText(Reaction reaction) { StringBuilder htmlBuilder = new StringBuilder(); htmlBuilder.append("\n"); - htmlBuilder.append("

").append(StringEscapeUtils.escapeHtml4(reaction.name())).append("

\n"); - if (!newEpisodes.isEmpty()) { - htmlBuilder.append("

New Episodes

\n"); - htmlBuilder.append("

Season ").append(episode.season()).append(", Episode ").append(episode.episode()).append("

> seasonEntry : FluentIterable.from(Ordering.natural().reverse().sortedCopy(allEpisodes)).index(Episode.BY_SEASON).asMap().entrySet()) { + for (Episode episode : seasonEntry.getValue()) { for (TorrentFile torrentFile : episode) { - htmlBuilder.append("

").append(StringEscapeUtils.escapeHtml4(torrentFile.name())).append("

\n"); - htmlBuilder.append("

"); - htmlBuilder.append("").append(StringEscapeUtils.escapeHtml4(torrentFile.size())).append(", "); - htmlBuilder.append("").append(torrentFile.fileCount()).append(" file(s), "); - htmlBuilder.append("").append(torrentFile.seedCount()).append(" seed(s), "); - htmlBuilder.append("").append(torrentFile.leechCount()).append(" leecher(s)

\n"); - htmlBuilder.append("

"); - if ((torrentFile.magnetUri() != null) && (torrentFile.magnetUri().length() > 0)) { - htmlBuilder.append("Magnet "); + if (newEpisodes.contains(episode)) { + htmlBuilder.append("

Download

Changed Episodes

Season ").append(episode.season()).append(", Episode ").append(episode.episode()).append("

").append(StringEscapeUtils.escapeHtml4(torrentFile.name())).append("

"); - if ((torrentFile.magnetUri() != null) && (torrentFile.magnetUri().length() > 0)) { - htmlBuilder.append("Magnet "); - } - if ((torrentFile.downloadUri() != null) && (torrentFile.downloadUri().length() > 0)) { - htmlBuilder.append("Download"); + if ((lastEpisode == null) || !lastEpisode.equals(episode)) { + htmlBuilder.append("

All Known Episodes
Season	Episode	Filename	Size	File(s)	Seeds	Leechers	Magnet	Download
").append(episode.season()).append("	").append(episode.episode()).append("		").append(StringEscapeUtils.escapeHtml4(torrentFile.name())).append("	").append(StringEscapeUtils.escapeHtml4(torrentFile.size())).append("	").append(torrentFile.fileCount()).append("	").append(torrentFile.seedCount()).append("	").append(torrentFile.leechCount()).append("	Link	Link