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.

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

Support remembering previously completed Verb Installations #2070

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions phoenicis-engines/src/main/java/org/phoenicis/engines/Engine.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,21 @@ String run(String executable, String[] args, String workingDir, boolean captureO
* @param wizard setup wizard
*/
void setWizard(SetupWizard wizard);

/**
* Registers as verb as being "installed"
*
* @param verbId The ID of the verb
* @param container The container where the verb has been installed
*/
void registerVerb(String verbId, String container);

/**
* Checks whether a given verb has been registered as being "installed"
*
* @param verbId The ID of the verb
* @param container The container where the verb has been installed
* @return True if the verb has been registered as being "installed", false otherwise
*/
boolean isVerbRegistered(String verbId, String container);
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ public EngineSettingsManager engineSettingsManager() {

@Bean
public VerbsManager verbsManager() {
return new VerbsManager(scriptsConfiguration.scriptInterpreter());
return new VerbsManager(scriptsConfiguration.scriptInterpreter(),
scriptsConfiguration.graalScriptEngineFactory());
}

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import org.phoenicis.repository.dto.CategoryDTO;
import org.phoenicis.repository.dto.RepositoryDTO;
import org.phoenicis.repository.dto.TypeDTO;
import org.phoenicis.scripts.engine.PhoenicisScriptEngineFactory;
import org.phoenicis.scripts.engine.implementation.PhoenicisScriptEngine;
import org.phoenicis.scripts.exceptions.ScriptException;
import org.phoenicis.scripts.interpreter.ScriptInterpreter;
import org.phoenicis.scripts.session.InteractiveScriptSession;
Expand All @@ -39,13 +41,17 @@
public class VerbsManager {
private final ScriptInterpreter scriptInterpreter;

private final PhoenicisScriptEngineFactory scriptEngineFactory;

/**
* Constructor
*
* @param scriptInterpreter The underlying script interpreter
* @param scriptEngineFactory
*/
public VerbsManager(ScriptInterpreter scriptInterpreter) {
public VerbsManager(ScriptInterpreter scriptInterpreter, PhoenicisScriptEngineFactory scriptEngineFactory) {
this.scriptInterpreter = scriptInterpreter;
this.scriptEngineFactory = scriptEngineFactory;
}

/**
Expand Down Expand Up @@ -129,4 +135,17 @@ public void fetchAvailableVerbs(RepositoryDTO repositoryDTO, Consumer<Map<String
}
callback.accept(verbs);
}

public boolean isVerbInstalled(String engineId, String verbId, String container) {
final PhoenicisScriptEngine scriptEngine = scriptEngineFactory.createEngine();

final String include = String.format("include(\"engines.%s.engine.implementation\");", engineId);

final Value engineClass = (Value) scriptEngine.evalAndReturn(include, exception -> {
});

final Engine engine = engineClass.newInstance().as(Engine.class);

return engine.isVerbRegistered(verbId, container);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,34 @@ private HBox createVerbManagementButtons(final GridPane verbs) {
private void updateVerbs(final GridPane verbs) {
verbs.getChildren().clear();

String engineId = getControl().getContainer().getEngine();
String container = getControl().getContainer().getName();

for (ScriptDTO verb : getControl().getVerbScripts()) {
final boolean alreadyInstalled = getControl().getVerbsManager()
.isVerbInstalled(engineId, verb.getId(), container);

final int row = verbs.getRowCount();

final CheckBox verbCheck = new CheckBox();
verbCheck.disableProperty().bind(getControl().lockVerbsProperty());
if (alreadyInstalled) {
verbCheck.setDisable(true);
} else {
verbCheck.disableProperty().bind(getControl().lockVerbsProperty());
}

final Label verbName = new Label(verb.getScriptName());
// select the associated checkbox if the label has been clicked
verbName.setOnMouseClicked(event -> verbCheck.fire());

GridPane.setHgrow(verbName, Priority.ALWAYS);
final Label installedLabel = new Label();
if (alreadyInstalled) {
installedLabel.setText(tr("Already Installed"));
}

GridPane.setHgrow(installedLabel, Priority.ALWAYS);

verbs.addRow(row, verbCheck, verbName);
verbs.addRow(row, verbCheck, verbName, installedLabel);
}
}
}