From 3d452da1aeb4e667f57cc67181729acced0549ef Mon Sep 17 00:00:00 2001 From: Frank Becker Date: Wed, 17 Oct 2018 23:32:35 +0200 Subject: [PATCH] refactor HtmlUtil --- .../main/java/org/jbake/util/HtmlUtil.java | 56 +++++++++++-------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java b/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java index 7a411cfd3..cbafe6674 100644 --- a/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java +++ b/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java @@ -14,6 +14,9 @@ */ public class HtmlUtil { + private HtmlUtil() { + } + /** * Image paths are specified as w.r.t. assets folder. This function prefix site host to all img src except * the ones that starts with http://, https://. @@ -24,11 +27,23 @@ public class HtmlUtil { * @param configuration Configuration object */ public static void fixImageSourceUrls(Map fileContents, JBakeConfiguration configuration) { - String htmlContent = fileContents.get(Attributes.BODY).toString(); - boolean prependSiteHost = configuration.getImgPathPrependHost(); String siteHost = configuration.getSiteHost(); + String uri = getDocumentUri(fileContents); + + Document document = Jsoup.parseBodyFragment(htmlContent); + Elements allImgs = document.getElementsByTag("img"); + + for (Element img : allImgs) { + transformImageSource(img, uri, siteHost, prependSiteHost); + } + + //Use body().html() to prevent adding from parsed fragment. + fileContents.put(Attributes.BODY, document.body().html()); + } + + private static String getDocumentUri(Map fileContents) { String uri = fileContents.get(Attributes.URI).toString(); if (fileContents.get(Attributes.NO_EXTENSION_URI) != null) { @@ -39,37 +54,32 @@ public static void fixImageSourceUrls(Map fileContents, JBakeCon if (uri.contains("/")) { uri = removeFilename(uri); } + return uri; + } - Document document = Jsoup.parseBodyFragment(htmlContent); - Elements allImgs = document.getElementsByTag("img"); - - for (Element img : allImgs) { - String source = img.attr("src"); + private static void transformImageSource(Element img, String uri, String siteHost, boolean prependSiteHost) { + String source = img.attr("src"); - // Now add the root path - if (!source.startsWith("http://") && !source.startsWith("https://")) { + // Now add the root path + if (!source.startsWith("http://") && !source.startsWith("https://")) { - if (isRelative(source)) { - source = uri + source.replaceFirst("\\./", ""); - } + if (isRelative(source)) { + source = uri + source.replaceFirst("\\./", ""); + } - if (prependSiteHost) { - if (!siteHost.endsWith("/") && isRelative(source)) { - siteHost = siteHost.concat("/"); - } - source = siteHost + source; + if (prependSiteHost) { + if (!siteHost.endsWith("/") && isRelative(source)) { + siteHost = siteHost.concat("/"); } - - img.attr("src", source); + source = siteHost + source; } - } - //Use body().html() to prevent adding from parsed fragment. - fileContents.put(Attributes.BODY, document.body().html()); + img.attr("src", source); + } } private static String removeFilename(String uri) { - uri = uri.substring(0, uri.lastIndexOf("/") + 1); + uri = uri.substring(0, uri.lastIndexOf('/') + 1); return uri; }