SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'bugfix/markdown' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m28s
Details
Build Docker Image / Clean-Registry (push) Successful in -1s
Details

Browse Source
This commit is contained in:
Stephan Richter
2026-01-22 20:47:42 +01:00
parent d7d2505847 1059164b4a
commit 63bc54fd1b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/de/srsoftware/umbrella/core/Util.java
View File

@@ -35,7 +35,7 @@ import org.json.JSONObject;
public class Util {
public static final System.Logger LOG = System.getLogger("Util");
private static final Pattern UML_PATTERN = Pattern.compile("@start(\\w+)(.*)@end(\\1)",Pattern.DOTALL);
private static final Pattern UML_PATTERN = Pattern.compile("@start(\\w+)(.*?)@end(\\1)",Pattern.DOTALL);
private static File plantumlJar = null;
private static final JParsedown MARKDOWN = new JParsedown();
public static final String SHA1 = "SHA-1";
@@ -79,7 +79,7 @@ public class Util {
try {
if (plantumlJar != null && plantumlJar.exists()) {
var matcher = UML_PATTERN.matcher(source);
if (matcher.find()) {
while (matcher.find()) {
var uml = matcher.group(0).trim();
var start = matcher.start(0);
var end = matcher.end(0);
@@ -96,6 +96,7 @@ public class Util {
byte[] out = is.readAllBytes();
var svg = new String(out, UTF_8);
source = source.substring(0, start) + svg + source.substring(end);
matcher = UML_PATTERN.matcher(source);
}
}
}