mirror of
https://github.com/octoleo/plantuml.git
synced 2024-12-25 04:06:08 +00:00
Merge pull request #1472 from travkin79/patch/1470
Add reading remote style files from URLs (Fix #1470)
This commit is contained in:
commit
ebeea26ecb
@ -5,12 +5,12 @@
|
||||
* (C) Copyright 2009-2024, Arnaud Roques
|
||||
*
|
||||
* Project Info: https://plantuml.com
|
||||
*
|
||||
*
|
||||
* If you like this project or if you find it useful, you can support us at:
|
||||
*
|
||||
*
|
||||
* https://plantuml.com/patreon (only 1$ per month!)
|
||||
* https://plantuml.com/paypal
|
||||
*
|
||||
*
|
||||
* This file is part of PlantUML.
|
||||
*
|
||||
* PlantUML is free software; you can redistribute it and/or modify it
|
||||
@ -30,13 +30,15 @@
|
||||
*
|
||||
*
|
||||
* Original Author: Arnaud Roques
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
package net.sourceforge.plantuml.style;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
|
||||
import net.sourceforge.plantuml.FileSystem;
|
||||
import net.sourceforge.plantuml.TitledDiagram;
|
||||
@ -47,6 +49,7 @@ import net.sourceforge.plantuml.regex.RegexConcat;
|
||||
import net.sourceforge.plantuml.regex.RegexLeaf;
|
||||
import net.sourceforge.plantuml.regex.RegexResult;
|
||||
import net.sourceforge.plantuml.security.SFile;
|
||||
import net.sourceforge.plantuml.security.SURL;
|
||||
import net.sourceforge.plantuml.style.parser.StyleParser;
|
||||
import net.sourceforge.plantuml.style.parser.StyleParsingException;
|
||||
import net.sourceforge.plantuml.utils.BlocLines;
|
||||
@ -80,23 +83,32 @@ public class CommandStyleImport extends SingleLineCommand2<TitledDiagram> {
|
||||
protected CommandExecutionResult executeArg(TitledDiagram diagram, LineLocation location, RegexResult arg) {
|
||||
final String path = arg.get("PATH", 0);
|
||||
try {
|
||||
final SFile f = FileSystem.getInstance().getFile(path);
|
||||
BlocLines lines = null;
|
||||
if (f.exists()) {
|
||||
lines = BlocLines.load(f, location);
|
||||
if (path.startsWith("http")) {
|
||||
SURL url = SURL.create (path);
|
||||
try (InputStream remoteInputStream = url.openStream()) {
|
||||
lines = BlocLines.load(remoteInputStream, location);
|
||||
}
|
||||
} else {
|
||||
final InputStream internalIs = StyleLoader.class.getResourceAsStream("/skin/" + path);
|
||||
if (internalIs != null)
|
||||
lines = BlocLines.load(internalIs, location);
|
||||
|
||||
final SFile styleFile = FileSystem.getInstance().getFile(path);
|
||||
if (styleFile.exists()) {
|
||||
lines = BlocLines.load(styleFile, location);
|
||||
} else {
|
||||
final InputStream internalIs = StyleLoader.class.getResourceAsStream("/skin/" + path);
|
||||
if (internalIs != null)
|
||||
lines = BlocLines.load(internalIs, location);
|
||||
}
|
||||
}
|
||||
if (lines == null)
|
||||
|
||||
if (lines == null || lines.size() == 0)
|
||||
return CommandExecutionResult.error("Cannot read: " + path);
|
||||
|
||||
final StyleBuilder styleBuilder = diagram.getSkinParam().getCurrentStyleBuilder();
|
||||
for (Style modifiedStyle : StyleParser.parse(lines, styleBuilder))
|
||||
diagram.getSkinParam().muteStyle(modifiedStyle);
|
||||
|
||||
} catch (MalformedURLException e) {
|
||||
return CommandExecutionResult.error("Invalid URL to style definition: " + e.getMessage());
|
||||
} catch (StyleParsingException e) {
|
||||
return CommandExecutionResult.error("Error in style definition: " + e.getMessage());
|
||||
} catch (IOException e) {
|
||||
|
Loading…
Reference in New Issue
Block a user