X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ftriggers%2FNewTorrentTrigger.java;h=7b28fee851d9a16ba0487f1452b2e50fc8aedf39;hb=48da379d3e08c7eb76550598f3b4dd9e637060d7;hp=872349e06b32f13427b07c94d28a97727b5a996b;hpb=f43798b2b09447fadb82b6019029b5e6fa609ba2;p=rhynodge.git diff --git a/src/main/java/net/pterodactylus/rhynodge/triggers/NewTorrentTrigger.java b/src/main/java/net/pterodactylus/rhynodge/triggers/NewTorrentTrigger.java index 872349e..7b28fee 100644 --- a/src/main/java/net/pterodactylus/rhynodge/triggers/NewTorrentTrigger.java +++ b/src/main/java/net/pterodactylus/rhynodge/triggers/NewTorrentTrigger.java @@ -33,6 +33,7 @@ import net.pterodactylus.rhynodge.states.TorrentState.TorrentFile; import org.apache.commons.lang3.StringEscapeUtils; import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; import com.google.common.collect.Sets; /** @@ -54,7 +55,7 @@ public class NewTorrentTrigger implements Trigger { // /** - * {@inheritDocs} + * {@inheritDoc} */ @Override public State mergeStates(State previousState, State currentState) { @@ -95,7 +96,7 @@ public class NewTorrentTrigger implements Trigger { } // - // STATIC METHODS + // PRIVATE METHODS // /** @@ -131,24 +132,63 @@ public class NewTorrentTrigger implements Trigger { * @return The generated HTML */ private String getHtmlTextList(Reaction reaction) { - StringBuilder htmlText = new StringBuilder(); - htmlText.append("\n"); - htmlText.append("

New Torrents

\n"); - htmlText.append("

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

Size: ").append(StringEscapeUtils.escapeHtml4(torrentFile.size())).append(" in ").append(torrentFile.fileCount()).append(" file(s)

").append(torrentFile.seedCount()).append(" seed(s), ").append(torrentFile.leechCount()).append(" leecher(s)

Magnet URI

Download URI

All Known Torrents
Filename	Size	File(s)	Seeds	Leechers	Magnet	Download
").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

sortNewFirst() { + return new Ordering() { + + @Override + public int compare(TorrentFile leftTorrentFile, TorrentFile rightTorrentFile) { + if (newTorrentFiles.contains(leftTorrentFile) && !newTorrentFiles.contains(rightTorrentFile)) { + return -1; + } + if (!newTorrentFiles.contains(leftTorrentFile) && newTorrentFiles.contains(rightTorrentFile)) { + return 1; + } + return 0; + } + }; } }