Return -1 if an episode is null.

[rhynodge.git] / src / main / java / net / pterodactylus / rhynodge / triggers / NewComicTrigger.java
diff --git a/src/main/java/net/pterodactylus/rhynodge/triggers/NewComicTrigger.java b/src/main/java/net/pterodactylus/rhynodge/triggers/NewComicTrigger.java

index c8852c7..0f89ddb 100644 (file)
--- a/src/main/java/net/pterodactylus/rhynodge/triggers/NewComicTrigger.java
+++ b/src/main/java/net/pterodactylus/rhynodge/triggers/NewComicTrigger.java
@@ -19,6 +19,8 @@ package net.pterodactylus.rhynodge.triggers;
  
  import static com.google.common.base.Preconditions.*;
  
+import java.util.ArrayList;
+import java.util.Collections;
  import java.util.List;
  
  import net.pterodactylus.rhynodge.Reaction;
@@ -28,9 +30,11 @@ import net.pterodactylus.rhynodge.output.DefaultOutput;
  import net.pterodactylus.rhynodge.output.Output;
  import net.pterodactylus.rhynodge.states.ComicState;
  import net.pterodactylus.rhynodge.states.ComicState.Comic;
+import net.pterodactylus.rhynodge.states.ComicState.Strip;
  
  import com.google.common.collect.Lists;
  import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
  
  /**
   * {@link Trigger} implementation that detects the presence of new {@link
@@ -43,6 +47,9 @@ public class NewComicTrigger implements Trigger {
         /** The new comics. */
         private final List<Comic> newComics = Lists.newArrayList();
  
+       /** The latest comic state. */
+       private ComicState mergedComicState;
+
         @Override
         public State mergeStates(State previousState, State currentState) {
                 checkArgument(previousState instanceof ComicState, "previous state must be a comic state");
@@ -52,7 +59,7 @@ public class NewComicTrigger implements Trigger {
                 ComicState currentComicState = (ComicState) currentState;
  
                 /* copy old state into new state. */
-               ComicState mergedComicState = new ComicState();
+               mergedComicState = new ComicState();
                 for (Comic comic : previousComicState) {
                         mergedComicState.add(comic);
                 }
@@ -97,8 +104,11 @@ public class NewComicTrigger implements Trigger {
  
                 for (Comic newComic : newComics) {
                         text.append("Comic Found: ").append(newComic.title()).append("\n\n");
-                       for (String imageUrl : newComic) {
-                               text.append("Image: ").append(imageUrl).append("\n");
+                       for (Strip strip : newComic) {
+                               text.append("Image: ").append(strip.imageUrl()).append("\n");
+                               if (!StringUtils.isBlank(strip.comment())) {
+                                       text.append("Comment: ").append(strip.comment()).append("\n");
+                               }
                         }
                         text.append("\n\n");
                 }
@@ -116,13 +126,41 @@ public class NewComicTrigger implements Trigger {
                 html.append("<body>");
  
                 for (Comic newComic : newComics) {
-                       html.append("<h1>").append(StringEscapeUtils.escapeHtml4(newComic.title())).append("</h1>\n");
-                       for (String imageUrl : newComic) {
-                               html.append("<div><img src=\"").append(StringEscapeUtils.escapeHtml4(imageUrl)).append("\"></div>\n");
+                       generateComicHtml(html, newComic);
+               }
+
+               List<Comic> latestComics = new ArrayList<Comic>(mergedComicState.comics());
+               Collections.reverse(latestComics);
+               int comicCount = 0;
+               for (Comic comic : latestComics) {
+                       if (newComics.contains(comic)) {
+                               continue;
+                       }
+                       generateComicHtml(html, comic);
+                       if (++comicCount == 7) {
+                               break;
                         }
                 }
  
                 return html.append("</body>").toString();
         }
  
+       /**
+        * Generates the HTML for a single comic.
+        *
+        * @param html
+        *              The string builder to append the HTML to
+        * @param comic
+        *              The comic to render
+        */
+       private void generateComicHtml(StringBuilder html, Comic comic) {
+               html.append("<h1>").append(StringEscapeUtils.escapeHtml4(comic.title())).append("</h1>\n");
+               for (Strip strip : comic) {
+                       html.append("<div><img src=\"").append(StringEscapeUtils.escapeHtml4(strip.imageUrl()));
+                       html.append("\" alt=\"").append(StringEscapeUtils.escapeHtml4(strip.comment()));
+                       html.append("\" title=\"").append(StringEscapeUtils.escapeHtml4(strip.comment()));
+                       html.append("\"></div>\n");
+               }
+       }
+
  }