X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ffilters%2FComicSiteFilter.java;h=6bc67cd1441952f861911de9579df534465f8998;hb=1d11733f6ca219009e407a7762a32584cf3c24e1;hp=9b3dfcd6978b2198154fb8f61fb10ba0a5d7fbce;hpb=e371f97ebb6eaa268326bfc678013dfc96378918;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java b/src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java
index 9b3dfcd..6bc67cd 100644
--- a/src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java
+++ b/src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java
@@ -17,8 +17,11 @@
 
 package net.pterodactylus.rhynodge.filters;
 
-import static com.google.common.base.Preconditions.*;
+import static com.google.common.base.Preconditions.checkArgument;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collections;
 import java.util.List;
 
 import net.pterodactylus.rhynodge.Filter;
@@ -26,9 +29,11 @@ import net.pterodactylus.rhynodge.State;
 import net.pterodactylus.rhynodge.states.ComicState;
 import net.pterodactylus.rhynodge.states.ComicState.Comic;
 import net.pterodactylus.rhynodge.states.ComicState.Strip;
+import net.pterodactylus.rhynodge.states.FailedState;
 import net.pterodactylus.rhynodge.states.HtmlState;
 
 import com.google.common.base.Optional;
+import org.jetbrains.annotations.NotNull;
 import org.jsoup.nodes.Document;
 
 /**
@@ -39,13 +44,13 @@ import org.jsoup.nodes.Document;
  */
 public abstract class ComicSiteFilter implements Filter {
 
+	@NotNull
 	@Override
-	public State filter(State state) {
+	public State filter(@NotNull State state) {
 		checkArgument(state instanceof HtmlState, "state must be an HTML state");
 
 		/* initialize states: */
 		HtmlState htmlState = (HtmlState) state;
-		ComicState comicState = new ComicState();
 
 		/* extract comics. */
 		Optional<String> title = extractTitle(htmlState.document());
@@ -53,19 +58,25 @@ public abstract class ComicSiteFilter implements Filter {
 		List<String> imageComments = extractImageComments(htmlState.document());
 
 		/* store comic, if found, into state. */
-		if (title.isPresent() && !imageUrls.isEmpty()) {
-			Comic comic = new Comic(title.get());
-			int imageCounter = 0;
-			for (String imageUrl : imageUrls) {
-				String imageComment = (imageCounter < imageComments.size()) ? imageComments.get(imageCounter) : "";
-				Strip strip = new Strip(imageUrl, imageComment);
+		if (imageUrls.isEmpty()) {
+			return new FailedState();
+		}
+
+		Comic comic = new Comic(title.or(""));
+		int imageCounter = 0;
+		for (String imageUrl : imageUrls) {
+			String imageComment = (imageCounter < imageComments.size()) ? imageComments.get(imageCounter) : "";
+			try {
+				URI stripUri = new URI(htmlState.uri()).resolve(imageUrl.replaceAll(" ", "%20"));
+				Strip strip = new Strip(stripUri.toString(), imageComment);
 				imageCounter++;
 				comic.add(strip);
+			} catch (URISyntaxException use1) {
+				throw new IllegalStateException(String.format("Could not resolve image URL “%s” against base URL “%s”.", imageUrl, htmlState.uri()), use1);
 			}
-			comicState.add(comic);
 		}
 
-		return comicState;
+		return new ComicState(Collections.singletonList(comic));
 	}
 
 	//