Add a new "Change engine version" button to the ContainerOverviewPanel #1970

madoar · 2019-06-05T19:39:45Z

This PR adds a new Change engine version button to the container overview panel.
Whenever this button is pressed the new changeVersion method of the used Engine implementation of the container is called. The signature of the new changeVersion method is as follows:

    /**
     * changes the engine version of the given container
     *
     * @param containerName the name of the container
     */
    void changeVersion(String containerName);

@ImperatorS79 do you need anything else to continue on #1832?^^

… panel

ImperatorS79 · 2019-06-05T19:41:53Z

No, I will test this ASAP !

madoar · 2019-06-05T19:43:09Z

Be aware that you will get an exception if you have no changeVersion method in your engines implementation! I haven't tested it yet with such a method available... So if you still get an error feel free to tell me.

ImperatorS79 · 2019-06-05T20:24:37Z

I have "this.kill" is not a function :/

madoar · 2019-06-05T20:34:31Z

Yes, the reason is, that the changeVersion is part of the engine implementation and not the engine object, which is accessible from the scripts.

The engine implementation can be found here:
https://github.com/PhoenicisOrg/scripts/blob/master/Engines/Wine/Engine/Implementation/script.js

The engine object can be found here:
https://github.com/PhoenicisOrg/scripts/blob/master/Engines/Wine/Engine/Object/script.js

Shortterm I think it is best to either check whether it is possible to go without this.kill() or to provide this functionality otherwise. Longterm I think we will change the engine implementation to fuse it with the corresponding engine object. On the Java side we then will most likely need forwarding methods to for the implementation/object methods. The longterm solution is currently blocked by #1857.

ImperatorS79 · 2019-06-05T20:39:39Z

OK, I tried this

changeVersion: function (containerName) {
    	var setupWizard = SetupWizard(InstallationType.ENGINES, "Change container's wine version" ,java.util.Optional.empty());
		
    	//this.kill();
        var workingContainerDirectory = this.getContainerDirectory(this.getWorkingContainer());//EDITED
    	var containerConfiguration = this._configFactory.open(workingContainerDirectory + "/phoenicis.cfg"); //EDITED
    	var architecture = containerConfiguration.readValue("wineArchitecture", "x86");
    	var operatingSystem = this._operatingSystemFetcher.fetchCurrentOperationSystem().getWinePackage();
    	
    	var wineJson = JSON.parse(this.getAvailableVersions());
    	var distributions = new Array();
    	var versions = new Array();
    	print("coucou");
    	wineJson.forEach(function (subPart) {
        	var parts = subPart.split("-");
        	if(parts[2] == architecture) {
            	distributions.push(parts[0]);
            	versions.push(new Array()); 
            	subPart.packages.forEach(function (winePackage) {
        		versions[distributions.size()].push(winePackage.version);
            	});
        	}
    	});
    	
    	print("mazette");
    	var selectedDistribution = wizard.menu(tr("Please select the distribution of wine."), distributions);
    	var selectedVersion = wizard.menu(tr("Please select the version of wine."), versions[distributions.indexOf(selectedDistribution)]);
    	subCategory = selectedDistribution + "-" + operatingSystem + "-" + architecture;
    	
    	this.install(subCategory, version);
	
    	var containerNameCleaned = containerName.replace(this._containerRegex, '');
    	var containerDirectory = this._winePrefixesDirectory + "/" + containerNameCleaned + "/";
	
    	var containerConfiguration = this._configFactory.open(containerDirectory + "/phoenicis.cfg");
	
    	containerConfiguration.writeValue("wineVersion", selectedVersion);
    	containerConfiguration.writeValue("wineDistribution", selectedDistribution);
    	containerConfiguration.writeValue("wineArchitecture", architecture);
    	//this.kill();
    },

and I got this:

[ERROR] org.phoenicis.multithreading.ControlledThreadPoolExecutorService (l.63) - engines.wine.engine.implementation:398 TypeError: Cannot read property "readValue" from undefined
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.error(ECMAErrors.java:57)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.typeError(ECMAErrors.java:213)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.typeError(ECMAErrors.java:185)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.typeError(ECMAErrors.java:172)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Undefined.get(Undefined.java:161)
        at jdk.scripting.nashorn.scripts/jdk.nashorn.internal.scripts.Script$Recompilation$369$16067A$\^eval\_$cu1$restOf.changeVersion(engines.wine.engine.implementation:398)
        at jdk.nashorn.javaadapters.org_phoenicis_engines_Engine.changeVersion(Unknown Source)
        at org.phoenicis.javafx.components.container.control.ContainersFeaturePanel.lambda$changeEngineVersion$9(ContainersFeaturePanel.java:172)
        at org.phoenicis.engines.EnginesManager.lambda$getEngine$0(EnginesManager.java:71)
        at org.phoenicis.scripts.nashorn.NashornInteractiveSession.eval(NashornInteractiveSession.java:34)
        at org.phoenicis.scripts.interpreter.BackgroundScriptInterpreter.lambda$createInteractiveSession$1(BackgroundScriptInterpreter.java:43)
        at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
        at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
        at java.base/java.lang.Thread.run(Thread.java:834)

Exception in thread "pool-3-thread-4" engines.wine.engine.implementation:398 TypeError: Cannot read property "readValue" from undefined
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.error(ECMAErrors.java:57)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.typeError(ECMAErrors.java:213)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.typeError(ECMAErrors.java:185)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.ECMAErrors.typeError(ECMAErrors.java:172)
        at jdk.scripting.nashorn/jdk.nashorn.internal.runtime.Undefined.get(Undefined.java:161)
        at jdk.scripting.nashorn.scripts/jdk.nashorn.internal.scripts.Script$Recompilation$369$16067A$\^eval\_$cu1$restOf.changeVersion(engines.wine.engine.implementation:398)
        at jdk.nashorn.javaadapters.org_phoenicis_engines_Engine.changeVersion(Unknown Source)
        at org.phoenicis.javafx.components.container.control.ContainersFeaturePanel.lambda$changeEngineVersion$9(ContainersFeaturePanel.java:172)
        at org.phoenicis.engines.EnginesManager.lambda$getEngine$0(EnginesManager.java:71)
        at org.phoenicis.scripts.nashorn.NashornInteractiveSession.eval(NashornInteractiveSession.java:34)
        at org.phoenicis.scripts.interpreter.BackgroundScriptInterpreter.lambda$createInteractiveSession$1(BackgroundScriptInterpreter.java:43)
        at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
        at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
        at java.base/java.lang.Thread.run(Thread.java:834)

madoar · 2019-06-05T20:43:58Z

Where is containerConfiguration defined? I think the error is thrown in the line:

var architecture = containerConfiguration.readValue("wineArchitecture", "x86");

More information about the source for the error is shown in the Stacktrace line:

 at jdk.scripting.nashorn.scripts/jdk.nashorn.internal.scripts.Script$Recompilation$369$16067A$\^eval\_$cu1$restOf.changeVersion(engines.wine.engine.implementation:398)

I don't have your changes, therefore I can't check, but the error should be because of line 398 in the script engines.wine.engine.implementation.

ImperatorS79 · 2019-06-05T20:48:58Z

Ok it works now, but I will have to look at the wizard step ^^.

ImperatorS79 · 2019-06-05T20:49:36Z

Argh, I have subPart.split is not a function !

madoar · 2019-06-05T20:52:28Z

subPart seems to me like a (json) object, not a string. You can access its content via (object) properties/fields.

ImperatorS79 · 2019-06-05T21:15:16Z

changeVersion: function (containerName) {
    	var wizard = SetupWizard(InstallationType.ENGINES, "Change " + containerName + " container wine version" ,java.util.Optional.empty());
    	this._wizard = wizard;
		
    	//this.kill();
    	var workingContainerDirectory = this.getContainerDirectory(this.getWorkingContainer());
    	var containerConfiguration = this._configFactory.open(workingContainerDirectory + "/phoenicis.cfg");
    	var architecture = containerConfiguration.readValue("wineArchitecture", "x86");
    	var operatingSystem = this._operatingSystemFetcher.fetchCurrentOperationSystem().getWinePackage();
    	
    	var wineJson = JSON.parse(this.getAvailableVersions());
    	var distributions = new Array();
    	var versions = new Array();
    	wineJson.forEach(function (subPart) {
        	var parts = subPart.name.split("-");
        	if(parts[2] == architecture) {
            	distributions.push(parts[0]);
            	versions.push(new Array()); 
            	subPart.packages.forEach(function (winePackage) {
        		versions[distributions.length-1].push(winePackage.version);
            	});
        	}
    	});
    	
    	var selectedDistribution = wizard.menu(tr("Please select the distribution of wine."), distributions);
    	var selectedVersion = wizard.menu(tr("Please select the version of wine."), versions[distributions.indexOf(selectedDistribution)]);
    	subCategory = selectedDistribution + "-" + operatingSystem + "-" + architecture;
    	
    	this.install(subCategory, version);
	
    	var containerNameCleaned = containerName.replace(this._containerRegex, '');
    	var containerDirectory = this._winePrefixesDirectory + "/" + containerNameCleaned + "/";
	
    	var containerConfiguration = this._configFactory.open(containerDirectory + "/phoenicis.cfg");
	
    	containerConfiguration.writeValue("wineVersion", selectedVersion);
    	containerConfiguration.writeValue("wineDistribution", selectedDistribution);
    	containerConfiguration.writeValue("wineArchitecture", architecture);
    },

the only problem is that distributions.indexOf(selectedDistribution) does not seems to work :/

ImperatorS79 · 2019-06-05T21:22:03Z

OK, i got it working, the only "problem" is that the version in the menu are not sorted and it is a bit difficult to choose one ^^.

ImperatorS79 · 2019-06-07T09:40:04Z

As stated in the scripts PR, everything works and the item are sorted.

plata · 2019-06-07T15:38:26Z

.../src/main/java/org/phoenicis/javafx/components/container/control/ContainersFeaturePanel.java

@@ -54,9 +55,15 @@

 /**
 * The container engine controller
+ * TODO: remove and directly use `enginesManager` instead


Is this something you want to fix before merging?

plata · 2019-06-07T15:38:48Z

.../src/main/java/org/phoenicis/javafx/components/container/control/ContainersFeaturePanel.java

@@ -154,6 +162,26 @@ public void deleteContainer(final ContainerDTO container) {
 confirmMessage.showAndCallback();
 }

+ public void changeEngineVersion(final ContainerDTO container) {


Javadoc missing

- rename onChangeEngine to onChangeEngineVersion

- add a new "Change engine version" button to the containers overview…

411da0e

… panel

ImperatorS79 mentioned this pull request Jun 5, 2019

Add method to change container wine version in engine implementation PhoenicisOrg/scripts#964

Merged

plata requested changes Jun 7, 2019

View reviewed changes

- solve review comments

71ed788

- rename onChangeEngine to onChangeEngineVersion

plata approved these changes Jun 9, 2019

View reviewed changes

madoar merged commit 9536490 into PhoenicisOrg:master Jun 9, 2019

madoar deleted the add-change-engine-version-button branch June 9, 2019 18:45

ImperatorS79 mentioned this pull request Jun 9, 2019

Provide a dialog to change the engine version of an existing container #1832

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a new "Change engine version" button to the ContainerOverviewPanel #1970

Add a new "Change engine version" button to the ContainerOverviewPanel #1970

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019 •

edited

Loading

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

ImperatorS79 commented Jun 7, 2019

plata Jun 7, 2019

madoar Jun 9, 2019

plata Jun 7, 2019

madoar Jun 9, 2019

Add a new "Change engine version" button to the ContainerOverviewPanel #1970

Add a new "Change engine version" button to the ContainerOverviewPanel #1970

Conversation

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019 • edited Loading

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

madoar commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

ImperatorS79 commented Jun 5, 2019

ImperatorS79 commented Jun 7, 2019

plata Jun 7, 2019

Choose a reason for hiding this comment

madoar Jun 9, 2019

Choose a reason for hiding this comment

plata Jun 7, 2019

Choose a reason for hiding this comment

madoar Jun 9, 2019

Choose a reason for hiding this comment

ImperatorS79 commented Jun 5, 2019 •

edited

Loading