From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 24 Oct 2021 12:23:06 +0000 (+0200)
Subject: 🎨 Replace CAD filter with Kotlin version
X-Git-Tag: v2~64
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e21a36cef7d1cc08445923ecf2dd6846f2764263;p=rhynodge.git

🎨 Replace CAD filter with Kotlin version
---

diff --git a/src/main/java/net/pterodactylus/rhynodge/filters/comics/CtrlAltDelComicFilter.java b/src/main/java/net/pterodactylus/rhynodge/filters/comics/CtrlAltDelComicFilter.java
deleted file mode 100644
index dd52894..0000000
--- a/src/main/java/net/pterodactylus/rhynodge/filters/comics/CtrlAltDelComicFilter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * rhynodge - CtrlAltDelComicFilter.java - Copyright © 2013 David Roden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.rhynodge.filters.comics;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import net.pterodactylus.rhynodge.filters.ComicSiteFilter;
-
-import com.google.common.base.Optional;
-import org.jsoup.nodes.Document;
-import org.jsoup.select.Elements;
-
-/**
- * {@link ComicSiteFilter} implementation that can parse Ctrl Alt Del comics.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class CtrlAltDelComicFilter extends ComicSiteFilter {
-
-	@Override
-	protected Optional<String> extractTitle(Document document) {
-		return Optional.fromNullable(document.select("article.comic div#comicblog h3.title-display").text());
-	}
-
-	@Override
-	protected List<String> extractImageUrls(Document document) {
-		Elements imageTags = document.select("article.comic div.comicpage img.comic-display");
-		return imageTags.stream().map(input -> input.attr("src")).collect(Collectors.toList());
-	}
-
-	@Override
-	protected List<String> extractImageComments(Document document) {
-		return Collections.emptyList();
-	}
-
-}
diff --git a/src/main/kotlin/net/pterodactylus/rhynodge/filters/comics/CtrlAltDelComicFilter.kt b/src/main/kotlin/net/pterodactylus/rhynodge/filters/comics/CtrlAltDelComicFilter.kt
new file mode 100644
index 0000000..a4cf18a
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/rhynodge/filters/comics/CtrlAltDelComicFilter.kt
@@ -0,0 +1,39 @@
+/*
+ * rhynodge - CtrlAltDelComicFilter.java - Copyright © 2013–2021 David Roden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.pterodactylus.rhynodge.filters.comics
+
+import com.google.common.base.Optional
+import net.pterodactylus.rhynodge.filters.ComicSiteFilter
+import net.pterodactylus.rhynodge.utils.asOptional
+import org.jsoup.nodes.Document
+
+/**
+ * [ComicSiteFilter] implementation that can parse Ctrl Alt Del comics.
+ */
+class CtrlAltDelComicFilter : ComicSiteFilter() {
+
+	override fun extractTitle(document: Document): Optional<String> =
+		document.select("article.comic div#comicblog h3.title-display").text().asOptional()
+
+	override fun extractImageUrls(document: Document): List<String> =
+		document.select("article.comic div.comicpage img.comic-display")
+			.map { it.attr("src") }
+
+	override fun extractImageComments(document: Document): List<String> =
+		emptyList()
+
+}