Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve error message when trying to create shortcut to executable outside container #2356

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Improve error message when trying to create shortcut to executable outside container #2356

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7dcac4
Improve error message when trying to create shortcut to executable ou…
plata Jan 27, 2021
c3d58b5
Remove debug code
plata Jan 27, 2021
484a7a6
Use if ... else
plata Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 55 additions & 44 deletions ...fx/src/main/java/org/phoenicis/javafx/components/library/control/LibraryFeaturePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,50 +146,61 @@ public void createShortcut(ShortcutCreationDTO shortcutCreationDTO) {
// get container
// TODO: smarter way using container manager
final String executablePath = shortcutCreationDTO.getExecutable().getAbsolutePath();
final String pathInContainers = executablePath.replace(getContainersPath(), "");
final String[] split = pathInContainers.split("/");
final String engineContainer = split[0];
final String engine = StringUtils.capitalize(engineContainer).replace("prefix", "");
// TODO: better way to get engine ID
final String engineId = engine.toLowerCase();
final String container = split[1];

final InteractiveScriptSession interactiveScriptSession = getScriptInterpreter().createInteractiveSession();

final String scriptInclude = "const Shortcut = include(\"engines." + engineId + ".shortcuts." + engineId
+ "\");";

interactiveScriptSession.eval(scriptInclude,
ignored -> interactiveScriptSession.eval("new Shortcut()",
output -> {
final Value shortcutObject = (Value) output;

shortcutObject.invokeMember("name", shortcutCreationDTO.getName());
shortcutObject.invokeMember("category", shortcutCreationDTO.getCategory());
shortcutObject.invokeMember("description", shortcutCreationDTO.getDescription());
shortcutObject.invokeMember("miniature", shortcutCreationDTO.getMiniature());
shortcutObject.invokeMember("search", shortcutCreationDTO.getExecutable().getName());
shortcutObject.invokeMember("prefix", container);
shortcutObject.invokeMember("create");
},
e -> Platform.runLater(() -> {
final ErrorDialog errorDialog = ErrorDialog.builder()
.withMessage(tr("Error while creating shortcut"))
.withException(e)
.withOwner(getScene().getWindow())
.build();

errorDialog.showAndWait();
})),
e -> Platform.runLater(() -> {
final ErrorDialog errorDialog = ErrorDialog.builder()
.withMessage(tr("Error while creating shortcut"))
.withException(e)
.withOwner(getScene().getWindow())
.build();

errorDialog.showAndWait();
}));
if (!executablePath.startsWith(getContainersPath())) {
Platform.runLater(() -> {
final ErrorDialog errorDialog = ErrorDialog.builder()
.withMessage(tr("Creating shortcut to executable outside of a container is not supported"))
.withOwner(getScene().getWindow())
.build();

errorDialog.showAndWait();
});
} else {
final String pathInContainers = executablePath.replace(getContainersPath(), "");
final String[] split = pathInContainers.split("/");
final String engineContainer = split[0];
final String engine = StringUtils.capitalize(engineContainer).replace("prefix", "");
// TODO: better way to get engine ID
final String engineId = engine.toLowerCase();
final String container = split[1];

final InteractiveScriptSession interactiveScriptSession = getScriptInterpreter().createInteractiveSession();

final String scriptInclude = "const Shortcut = include(\"engines." + engineId + ".shortcuts." + engineId
+ "\");";

interactiveScriptSession.eval(scriptInclude,
ignored -> interactiveScriptSession.eval("new Shortcut()",
output -> {
final Value shortcutObject = (Value) output;

shortcutObject.invokeMember("name", shortcutCreationDTO.getName());
shortcutObject.invokeMember("category", shortcutCreationDTO.getCategory());
shortcutObject.invokeMember("description", shortcutCreationDTO.getDescription());
shortcutObject.invokeMember("miniature", shortcutCreationDTO.getMiniature());
shortcutObject.invokeMember("search", shortcutCreationDTO.getExecutable().getName());
shortcutObject.invokeMember("prefix", container);
shortcutObject.invokeMember("create");
},
e -> Platform.runLater(() -> {
final ErrorDialog errorDialog = ErrorDialog.builder()
.withMessage(tr("Error while creating shortcut"))
.withException(e)
.withOwner(getScene().getWindow())
.build();

errorDialog.showAndWait();
})),
e -> Platform.runLater(() -> {
final ErrorDialog errorDialog = ErrorDialog.builder()
.withMessage(tr("Error while creating shortcut"))
.withException(e)
.withOwner(getScene().getWindow())
.build();

errorDialog.showAndWait();
}));
}
}

/**
Expand Down