From 0ea271afbea406a9ebeb24712255a50cbbd5c83d Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 16 Feb 2016 21:29:30 +0000 Subject: Collapse nodes where appropriate --- src/main/java/org/zwobble/mammoth/html/Html.java | 73 +++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/zwobble/mammoth/html/Html.java') diff --git a/src/main/java/org/zwobble/mammoth/html/Html.java b/src/main/java/org/zwobble/mammoth/html/Html.java index 14298b7..c0b234b 100644 --- a/src/main/java/org/zwobble/mammoth/html/Html.java +++ b/src/main/java/org/zwobble/mammoth/html/Html.java @@ -1,10 +1,14 @@ package org.zwobble.mammoth.html; import org.zwobble.mammoth.util.MammothLists; +import org.zwobble.mammoth.util.MammothOptionals; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import static org.zwobble.mammoth.util.Casts.tryCast; +import static org.zwobble.mammoth.util.MammothIterables.tryGetLast; import static org.zwobble.mammoth.util.MammothLists.list; import static org.zwobble.mammoth.util.MammothMaps.map; @@ -37,6 +41,10 @@ public class Html { return new HtmlElement(tagName, attributes, children, false); } + public static HtmlNode collapsibleElement(String tagName) { + return collapsibleElement(tagName, list()); + } + public static HtmlNode collapsibleElement(String tagName, List children) { return collapsibleElement(tagName, map(), children); } @@ -95,6 +103,69 @@ public class Html { } public static List collapse(List nodes) { - return nodes; + List collapsed = new ArrayList<>(); + + for (HtmlNode node : nodes) { + collapsingAdd(collapsed, node); + } + + return collapsed; + } + + private static void collapsingAdd(List collapsed, HtmlNode node) { + HtmlNode collapsedNode = collapse(node); + if (!tryCollapse(collapsed, collapsedNode)) { + collapsed.add(collapsedNode); + } + } + + private static HtmlNode collapse(HtmlNode node) { + return node.accept(new HtmlNode.Mapper() { + @Override + public HtmlNode visit(HtmlElement element) { + return new HtmlElement( + element.getTagName(), + element.getAttributes(), + collapse(element.getChildren()), + element.isCollapsible()); + } + + @Override + public HtmlNode visit(HtmlSelfClosingElement element) { + return element; + } + + @Override + public HtmlNode visit(HtmlTextNode node) { + return node; + } + + @Override + public HtmlNode visit(HtmlForceWrite forceWrite) { + return forceWrite; + } + }); + } + + private static boolean tryCollapse(List collapsed, HtmlNode node) { + return MammothOptionals.map( + tryGetLast(collapsed).flatMap(last -> tryCast(HtmlElement.class, last)), + tryCast(HtmlElement.class, node), + (last, next) -> { + if (next.isCollapsible() && isMatch(last, next)) { + for (HtmlNode child : next.getChildren()) { + collapsingAdd(last.getChildren(), child); + } + return true; + } else { + return false; + } + } + ).orElse(false); + } + + private static boolean isMatch(HtmlElement first, HtmlElement second) { + return first.getTagName().equals(second.getTagName()) && + first.getAttributes().equals(second.getAttributes()); } } -- cgit v1.2.3