projects
/
rhynodge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
šØ Replace Sinfest filter with Kotlin version
[rhynodge.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
rhynodge
/
filters
/
ComicSiteFilter.java
diff --git
a/src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java
b/src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java
index
39da74d
..
6bc67cd
100644
(file)
--- a/
src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java
+++ b/
src/main/java/net/pterodactylus/rhynodge/filters/ComicSiteFilter.java
@@
-21,6
+21,7
@@
import static com.google.common.base.Preconditions.checkArgument;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Collections;
import java.util.List;
import net.pterodactylus.rhynodge.Filter;
import java.util.List;
import net.pterodactylus.rhynodge.Filter;
@@
-32,6
+33,7
@@
import net.pterodactylus.rhynodge.states.FailedState;
import net.pterodactylus.rhynodge.states.HtmlState;
import com.google.common.base.Optional;
import net.pterodactylus.rhynodge.states.HtmlState;
import com.google.common.base.Optional;
+import org.jetbrains.annotations.NotNull;
import org.jsoup.nodes.Document;
/**
import org.jsoup.nodes.Document;
/**
@@
-42,8
+44,9
@@
import org.jsoup.nodes.Document;
*/
public abstract class ComicSiteFilter implements Filter {
*/
public abstract class ComicSiteFilter implements Filter {
+ @NotNull
@Override
@Override
- public State filter(State state) {
+ public State filter(
@NotNull
State state) {
checkArgument(state instanceof HtmlState, "state must be an HTML state");
/* initialize states: */
checkArgument(state instanceof HtmlState, "state must be an HTML state");
/* initialize states: */
@@
-55,12
+58,11
@@
public abstract class ComicSiteFilter implements Filter {
List<String> imageComments = extractImageComments(htmlState.document());
/* store comic, if found, into state. */
List<String> imageComments = extractImageComments(htmlState.document());
/* store comic, if found, into state. */
- if (
!title.isPresent() ||
imageUrls.isEmpty()) {
+ if (imageUrls.isEmpty()) {
return new FailedState();
}
return new FailedState();
}
- ComicState comicState = new ComicState();
- Comic comic = new Comic(title.get());
+ Comic comic = new Comic(title.or(""));
int imageCounter = 0;
for (String imageUrl : imageUrls) {
String imageComment = (imageCounter < imageComments.size()) ? imageComments.get(imageCounter) : "";
int imageCounter = 0;
for (String imageUrl : imageUrls) {
String imageComment = (imageCounter < imageComments.size()) ? imageComments.get(imageCounter) : "";
@@
-73,9
+75,8
@@
public abstract class ComicSiteFilter implements Filter {
throw new IllegalStateException(String.format("Could not resolve image URL ā%sā against base URL ā%sā.", imageUrl, htmlState.uri()), 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))
;
}
//
}
//