Update DXVK (fix OS detection, add new versions) #1039

Zemogiter · 2019-06-25T10:45:51Z

Description

Needs confirmation from someone with a MacOS machine that this script will work as intended.

What works

Everything

What was not tested

Trying to execute a script that installs a game that requires DXVK on a MacOS machine. The script should either skip DXVK installation and go with other verbs (if they are) and install the game or shut down the instalation entirely.

Test

Operating system (and linux kernel version): Ubuntu 19.04 x64 5.0.0
Hardware (GPU/CPU):
CPU: i7-7700K
GPU: GTX1080 ti

Ready for review

Script tested as a regular phoenicis user and working (if you have a problem -> create as draft and ask for help).
json-align and eslint run according to the documentation.
Codacy and travis checked.

Engines/Wine/Verbs/DXVK/script.js

Trying to ask the user if they want to continue.

Engines/Wine/Verbs/DXVK/script.js

@ImperatorS79

I'm probably wrong but this is what @ImperatorS79 meant with the big if else instruction.

ImperatorS79 · 2019-06-25T11:48:24Z

I meant

if macos
    macos_info
    do you want to go on ? (=> continue)
else if linux
    linux_info
    continue = true;
if continue
    rest of script

reverting e683104

Zemogiter · 2019-06-25T12:11:28Z

Made this chart:
https://www.lucidchart.com/documents/view/b1be3e36-45f7-4e55-8ecc-e939e7ac4b5f/0
because I think there is a misunderstanding.

ImperatorS79 · 2019-06-25T12:14:56Z

If yes, you install dxvk, if no, you skip dxvk but still install the app.

Zemogiter · 2019-06-25T12:16:13Z

Thats not what the chart says.

ImperatorS79 · 2019-06-25T12:18:09Z

But that is what I asked previously ^^.

Zemogiter · 2019-06-25T12:19:38Z

But that is what I asked previously ^^.

That is more confusing.

madoar · 2019-06-25T18:42:36Z

If you only want to skip the installation of the DXVK verb you can also call return this;.

plata

Can you check if there are other scripts with the same issue?

Engines/Wine/Verbs/DXVK/script.js

@plata

Removed a confusing part of the script, thanks for the heads up @plata

Zemogiter · 2019-06-27T17:31:55Z

We still need someone with Mac os to test if this script will work as intended (pressing yes skips this verb but keep the installation of other verbs and the game itself, pressing no quits everything)

Engines/Wine/Verbs/DXVK/script.js

Using constants instead of variables in beans declaration.

plata · 2019-06-29T14:54:55Z

@qparis can you test on Mac OS as requested by @Zemogiter?

Added new DXVK versions.

Zemogiter · 2019-08-24T12:10:32Z

Blocked until PhoenicisOrg/phoenicis#2067 is merged

Zemogiter · 2019-12-04T10:25:12Z

There is a problem. The script adds an additional v to the part of url where the filename is located which breaks everything.

[ERROR] org.phoenicis.multithreading.ControlledThreadPoolExecutorService (l.64) - Download of https://github.com/doitsujin/dxvk/releases/download/v1.4.6/dxvk-v1.4.6.tar.gz has failed
	at org.phoenicis.tools.http.Downloader.saveConnectionToStream(Downloader.java:307)
	at org.phoenicis.tools.http.Downloader.get(Downloader.java:260)
	at org.phoenicis.tools.http.Downloader.get(Downloader.java:237)
	at org.phoenicis.tools.http.Downloader.get(Downloader.java:101)
	at org.phoenicis.tools.http.Downloader.get(Downloader.java:81)
	at <js> get(Unnamed:135-144:3538-3839)
	at <js> get(Unnamed:110-117:2786-3026)
	at <js> go(Unnamed:70-76:2648-2915)
	at <js> :anonymous(Unnamed:20:661-679)
	at <js> go(Unnamed:83:3245-3279)
	at com.oracle.truffle.polyglot.ObjectProxyHandler.invoke(HostInteropReflect.java:678)
	at com.sun.proxy.$Proxy68.go(Unknown Source)
	at org.phoenicis.javafx.components.application.skin.ApplicationInformationPanelSkin.lambda$installScript$7(ApplicationInformationPanelSkin.java:237)
	at org.phoenicis.scripts.session.PhoenicisInteractiveScriptSession.eval(PhoenicisInteractiveScriptSession.java:35)
	at org.phoenicis.scripts.interpreter.BackgroundScriptInterpreter.lambda$createInteractiveSession$1(BackgroundScriptInterpreter.java:45)
	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)
Caused by host exception: org.phoenicis.tools.http.DownloadException: Download of https://github.com/doitsujin/dxvk/releases/download/v1.4.6/dxvk-v1.4.6.tar.gz has failed

I suspect its because of getGithubReleases function but I've looked at it and cannot find anything. I've already removed an extra v from DXVK script.

plata · 2019-12-04T17:26:38Z

The approach is wrong. The script assumes that the download URL is formed in a certain way based on the release version. It would be better to return the complete json and then use tarball_url directly.

Zemogiter · 2019-12-04T19:05:28Z

So how do we need to modify getGithubReleases utility?

plata · 2019-12-05T17:59:08Z

see #1148

Zemogiter · 2019-12-24T15:49:32Z

Blocked until #1148 is fixed.

Using an array

Script update in accord to PhoenicisOrg#1154

Zemogiter · 2019-12-29T15:35:17Z

For some reason the script adds an v between dxvk- and 1.5 while the folder in TMP dosen't have it, thus I'm getting a org.graalvm.polyglot.PolyglotException: Path "/home/jonasz/.Phoenicis/containers//wineprefix//Space Engineers//TMP/dxvk-v1.5/x32" does not exist error.

Fix for the issue mentioned in my last comment.

plata · 2020-01-01T18:23:56Z

Engines/Wine/Verbs/DXVK/script.js

-            );
+        if (operatingSystemFetcher.fetchCurrentOperationSystem().getFullName() !== "Linux")
+        {
+            const question = tr("DXVK is currently unsupported on non-Linux operating systems due to MoltenVK implementation being incomplete. Select how do you want to approach this situation.")


I still believe that this decision is too complicated for many users.

And I still thing otherwise.

Zemogiter · 2020-01-02T09:48:51Z

Now I'm getting this error. Happens before version list shows up:

[ERROR] org.phoenicis.multithreading.ControlledThreadPoolExecutorService (l.64) - TypeError: (intermediate value).withWizard is not a function
	at <js> install(Unnamed:112-113:3950-4029)
	at org.graalvm.polyglot.Value.invokeMember(Value.java:459)
	at org.phoenicis.engines.VerbsManager.lambda$installVerb$0(VerbsManager.java:71)
	at org.phoenicis.scripts.session.PhoenicisInteractiveScriptSession.eval(PhoenicisInteractiveScriptSession.java:35)
	at org.phoenicis.scripts.interpreter.BackgroundScriptInterpreter.lambda$createInteractiveSession$1(BackgroundScriptInterpreter.java:45)
	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)

[WARNING] 
org.graalvm.polyglot.PolyglotException: TypeError: (intermediate value).withWizard is not a function
    at <js>.install (Unnamed:112)
    at org.graalvm.polyglot.Value.invokeMember (Value.java:459)
    at org.phoenicis.engines.VerbsManager.lambda$installVerb$0 (VerbsManager.java:71)
    at org.phoenicis.scripts.session.PhoenicisInteractiveScriptSession.eval (PhoenicisInteractiveScriptSession.java:35)
    at org.phoenicis.scripts.interpreter.BackgroundScriptInterpreter.lambda$createInteractiveSession$1 (BackgroundScriptInterpreter.java:45)
    at java.util.concurrent.ThreadPoolExecutor.runWorker (ThreadPoolExecutor.java:1128)
    at java.util.concurrent.ThreadPoolExecutor$Worker.run (ThreadPoolExecutor.java:628)
    at java.lang.Thread.run (Thread.java:834)

Engines/Wine/Verbs/DXVK/script.js

madoar · 2020-01-03T11:09:29Z

Now the big question: Is the script working? :)

Zemogiter · 2020-01-03T11:15:39Z

Yes 😄

plata · 2020-01-03T11:22:28Z

@madoar you should merge directly. @Zemogiter doesn't have permission to do so.

* Update script.js * Replaced version list with getGithubReleases function. * Code cleanup

Update script.js

a442c9c

ImperatorS79 reviewed Jun 25, 2019

View reviewed changes

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

Update script.js

2b4f53f

Trying to ask the user if they want to continue.

ImperatorS79 reviewed Jun 25, 2019

View reviewed changes

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

Zemogiter added 2 commits June 25, 2019 13:39

Update script.js

f61b7cb

Update script.js

e683104

I'm probably wrong but this is what @ImperatorS79 meant with the big if else instruction.

Zemogiter added 2 commits June 25, 2019 13:50

Update script.js

fcd8791

Update script.js

bccd621

reverting e683104

Update script.js

94db172

plata requested changes Jun 26, 2019

View reviewed changes

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

plata changed the title ~~Update DXVK, fixed OS detection~~ Update DXVK (fix OS detection) Jun 26, 2019

Update script.js

71834c2

Removed a confusing part of the script, thanks for the heads up @plata

plata approved these changes Jun 27, 2019

View reviewed changes

madoar requested changes Jun 28, 2019

View reviewed changes

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

Update script.js

afb866f

Using constants instead of variables in beans declaration.

Zemogiter added 2 commits July 3, 2019 21:55

Merge branch 'master' into patch-1

f47a4b6

Update script.js

ad637d0

Added new DXVK versions.

Zemogiter changed the title ~~Update DXVK (fix OS detection)~~ Update DXVK (fix OS detection, add new versions) Jul 28, 2019

plata assigned qparis Jul 29, 2019

Update script.js

ea5f89c

madoar approved these changes Nov 29, 2019

View reviewed changes

madoar requested a review from plata November 29, 2019 18:38

Update script.js

5d9a2b9

plata mentioned this pull request Dec 8, 2019

Change GitHub releases utility #1148

Closed

Zemogiter added 3 commits December 29, 2019 11:25

Update script.js

2d3e9dc

Using an array

Update script.js

b93aca9

Script update in accord to PhoenicisOrg#1154

Update script.js

e80cc99

Zemogiter mentioned this pull request Dec 30, 2019

Return Github "version" Objects instead of the tag Strings #1154

Merged

Update script.js

330fb7d

Fix for the issue mentioned in my last comment.

Zemogiter mentioned this pull request Jan 1, 2020

Travis: GitHub pages build fails PhoenicisOrg/phoenicis#2157

Closed

plata reviewed Jan 1, 2020

View reviewed changes

plata reviewed Jan 2, 2020

View reviewed changes

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

Zemogiter added 2 commits January 2, 2020 16:18

Update script.js

62b7adf

Update script.js

099d538

madoar requested changes Jan 3, 2020

View reviewed changes

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

Engines/Wine/Verbs/DXVK/script.js Outdated Show resolved Hide resolved

Update script.js

a025528

madoar approved these changes Jan 3, 2020

View reviewed changes

madoar merged commit a37a173 into PhoenicisOrg:master Jan 3, 2020

Zemogiter deleted the patch-1 branch January 3, 2020 11:26

petermetz pushed a commit to petermetz/scripts that referenced this pull request Jun 7, 2020

Update DXVK (fix OS detection, add new versions) (PhoenicisOrg#1039)

2baeb2a

* Update script.js * Replaced version list with getGithubReleases function. * Code cleanup

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update DXVK (fix OS detection, add new versions) #1039

Update DXVK (fix OS detection, add new versions) #1039

Zemogiter commented Jun 25, 2019 •

edited

Loading

ImperatorS79 commented Jun 25, 2019

Zemogiter commented Jun 25, 2019 •

edited

Loading

ImperatorS79 commented Jun 25, 2019

Zemogiter commented Jun 25, 2019

ImperatorS79 commented Jun 25, 2019

Zemogiter commented Jun 25, 2019 •

edited

Loading

madoar commented Jun 25, 2019

plata left a comment

Zemogiter commented Jun 27, 2019

plata commented Jun 29, 2019

Zemogiter commented Aug 24, 2019

Zemogiter commented Dec 4, 2019 •

edited

Loading

plata commented Dec 4, 2019

Zemogiter commented Dec 4, 2019

plata commented Dec 5, 2019

Zemogiter commented Dec 24, 2019

Zemogiter commented Dec 29, 2019

plata Jan 1, 2020

Zemogiter Jan 1, 2020

Zemogiter commented Jan 2, 2020

madoar commented Jan 3, 2020

Zemogiter commented Jan 3, 2020

plata commented Jan 3, 2020

Update DXVK (fix OS detection, add new versions) #1039

Update DXVK (fix OS detection, add new versions) #1039

Conversation

Zemogiter commented Jun 25, 2019 • edited Loading

Description

What works

What was not tested

Test

Ready for review

ImperatorS79 commented Jun 25, 2019

Zemogiter commented Jun 25, 2019 • edited Loading

ImperatorS79 commented Jun 25, 2019

Zemogiter commented Jun 25, 2019

ImperatorS79 commented Jun 25, 2019

Zemogiter commented Jun 25, 2019 • edited Loading

madoar commented Jun 25, 2019

plata left a comment

Choose a reason for hiding this comment

Zemogiter commented Jun 27, 2019

plata commented Jun 29, 2019

Zemogiter commented Aug 24, 2019

Zemogiter commented Dec 4, 2019 • edited Loading

plata commented Dec 4, 2019

Zemogiter commented Dec 4, 2019

plata commented Dec 5, 2019

Zemogiter commented Dec 24, 2019

Zemogiter commented Dec 29, 2019

plata Jan 1, 2020

Choose a reason for hiding this comment

Zemogiter Jan 1, 2020

Choose a reason for hiding this comment

Zemogiter commented Jan 2, 2020

madoar commented Jan 3, 2020

Zemogiter commented Jan 3, 2020

plata commented Jan 3, 2020

Zemogiter commented Jun 25, 2019 •

edited

Loading

Zemogiter commented Jun 25, 2019 •

edited

Loading

Zemogiter commented Jun 25, 2019 •

edited

Loading

Zemogiter commented Dec 4, 2019 •

edited

Loading