0ct0pu5/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2025-04-18 10:13:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make desktop open more robust

Browse source
This commit is contained in:
crschnick 2025-03-22 18:37:59 +00:00
parent 3c13cf5e2a
commit 12fe24a695
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
app/src/main/java/io/xpipe/app/util/DesktopHelper.java
View file

@ -1,6 +1,8 @@
package io.xpipe.app.util;
import io.xpipe.app.core.AppDistributionType;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.issue.TrackEvent;
import io.xpipe.core.process.CommandBuilder;
import io.xpipe.core.process.OsType;
import io.xpipe.core.process.ShellControl;
@ -127,47 +129,46 @@ public class DesktopHelper {
return;
}
if (!Desktop.getDesktop().isSupported(Desktop.Action.OPEN)) {
return;
}
if (!Files.exists(file)) {
return;
}
ThreadHelper.runAsync(() -> {
try {
Desktop.getDesktop().open(file.toFile());
} catch (Exception e) {
ErrorEvent.fromThrowable(e).expected().handle();
var xdg = OsType.getLocal() == OsType.LINUX;
if (Desktop.getDesktop().isSupported(Desktop.Action.OPEN) && AppDistributionType.get() != AppDistributionType.WEBTOP) {
try {
Desktop.getDesktop().open(file.toFile());
return;
} catch (Exception e) {
ErrorEvent.fromThrowable(e).expected().omitted(xdg).handle();
}
}
if (xdg) {
LocalExec.readStdoutIfPossible("xdg-open", file.toString());
}
});
}
public static void browseFileInDirectory(Path file) {
if (!Desktop.getDesktop().isSupported(Desktop.Action.BROWSE_FILE_DIR)) {
if (!Desktop.getDesktop().isSupported(Desktop.Action.OPEN)) {
ErrorEvent.fromMessage("Desktop integration unable to open file " + file)
.expected()
.handle();
return;
}
ThreadHelper.runAsync(() -> {
try {
Desktop.getDesktop().open(file.getParent().toFile());
} catch (Exception e) {
ErrorEvent.fromThrowable(e).expected().handle();
}
});
browsePathLocal(file.getParent());
return;
}
ThreadHelper.runAsync(() -> {
try {
Desktop.getDesktop().browseFileDirectory(file.toFile());
} catch (Exception e) {
ErrorEvent.fromThrowable(e).expected().handle();
var xdg = OsType.getLocal() == OsType.LINUX;
if (AppDistributionType.get() != AppDistributionType.WEBTOP) {
try {
Desktop.getDesktop().browseFileDirectory(file.toFile());
return;
} catch (Exception e) {
ErrorEvent.fromThrowable(e).expected().omitted(xdg).handle();
}
}
if (xdg) {
LocalExec.readStdoutIfPossible("xdg-open", file.getParent().toString());
}
});
}