Support HTML blanks and HTML entities in image file names for preview (…

…#328)
asciidoctor · Sep 7, 2019 · a20b4eb · a20b4eb
1 parent 82ccf16
commit a20b4eb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -12,6 +12,7 @@ This document provides a high-level view of the changes introduced by release.
 - support operation block macro in https://docs.spring.io/spring-restdocs/docs/current/reference/html5/[spring-restdoc] and auto-detect the snippets folder (#312)
 - prepended config via plugin shouldn't add blank line that breaks document title (#325)
 - upgrade to asciidoctorj-pdf:1.5.0-beta.4 (#325)
+- Support HTML blanks and HTML entities in image file names for preview (#328)
 
 === 0.30.2 (preview, available from Github releases)
 

diff --git a/src/main/java/org/asciidoc/intellij/editor/browser/BrowserPanel.java b/src/main/java/org/asciidoc/intellij/editor/browser/BrowserPanel.java
@@ -27,6 +27,9 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
@@ -188,6 +191,11 @@ private String prepareHtml(@NotNull String html) {
       if (file.startsWith("image?")) {
         continue;
       }
+      try {
+        file = URLDecoder.decode(file, StandardCharsets.UTF_8.name()); // restore "%20" as " "
+      } catch (UnsupportedEncodingException e) {
+        throw new RuntimeException(e);
+      }
       String tmpFile = findTempImageFile(file);
       String md5;
       String replacement;

diff --git a/src/main/java/org/asciidoc/intellij/editor/javafx/JavaFxHtmlPanel.java b/src/main/java/org/asciidoc/intellij/editor/javafx/JavaFxHtmlPanel.java
@@ -60,8 +60,12 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -531,17 +535,26 @@ private String prepareHtml(@NotNull String html) {
     while (matcher.find()) {
       final MatchResult matchResult = matcher.toMatchResult();
       String file = matchResult.group(1);
+      try {
+        file = URLDecoder.decode(file, StandardCharsets.UTF_8.name()); // restore "%20" as " "
+      } catch (UnsupportedEncodingException e) {
+        throw new RuntimeException(e);
+      }
       String tmpFile = findTempImageFile(file);
       String md5;
       String replacement;
       if (tmpFile != null) {
         md5 = calculateMd5(tmpFile, null);
         tmpFile = tmpFile.replaceAll("\\\\", "/");
-        tmpFile = tmpFile.replaceAll(":", "%3A");
+        try {
+          tmpFile = URLEncoder.encode(tmpFile, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+          throw new RuntimeException(e);
+        }
         if (JavaFxHtmlPanelProvider.isInitialized()) {
           replacement = "<img src=\"localfile://" + md5 + "/" + tmpFile + "\"";
         } else {
-          replacement = "<img src=\"file://" + tmpFile.replaceAll("%3A", ":") + "\"";
+          replacement = "<img src=\"file://" + tmpFile + "\"";
         }
       } else {
         md5 = calculateMd5(file, base);