ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #7850 from Desetude/feature/xdg-open

Browse Source 
Use xdg-open for link browsing on Linux
This commit is contained in:
Tomas Slusny
2019-02-16 20:20:02 +00:00
committed by GitHub
parent bd9dfb1730 19a2f7f565
commit 0fcf5a513e
1 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
runelite-client/src/main/java/net/runelite/client/util/LinkBrowser.java
View File

@@ -43,6 +43,8 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class LinkBrowser
{
private static boolean shouldAttemptXdg = OSType.getOSType() == OSType.Linux;
/**
* Tries to navigate to specified URL in browser. In case operation fails, displays message box with message
* and copies link to clipboard to navigate to.
@@ -56,9 +58,55 @@ public class LinkBrowser
return false;
}
if (attemptDesktopBrowse(url))
{
log.debug("Opened browser through Desktop#browse to {}", url);
return true;
}
if (shouldAttemptXdg && attemptXdgOpen(url))
{
log.debug("Opened browser through xdg-open to {}", url);
return true;
}
showMessageBox("Unable to open link. Press 'OK' and link will be copied to your clipboard.", url);
return false;
}
private static boolean attemptXdgOpen(String url)
{
try
{
final Process exec = Runtime.getRuntime().exec(new String[]{"xdg-open", url});
exec.waitFor();
final int ret = exec.exitValue();
if (ret == 0)
{
return true;
}
log.warn("xdg-open {} returned with error code {}", url, ret);
return false;
}
catch (IOException ex)
{
// xdg-open not found
shouldAttemptXdg = false;
return false;
}
catch (InterruptedException ex)
{
log.warn("Interrupted while waiting for xdg-open {} to execute", url);
return false;
}
}
private static boolean attemptDesktopBrowse(String url)
{
if (!Desktop.isDesktopSupported())
{
showMessageBox("Desktop is not supported. Press 'OK' and link will be copied to your clipboard.", url);
return false;
}
@@ -66,20 +114,17 @@ public class LinkBrowser
if (!desktop.isSupported(Desktop.Action.BROWSE))
{
showMessageBox("Desktop browser is not supported. Press 'OK' and link will be copied to your clipboard.", url);
return false;
}
try
{
desktop.browse(new URI(url));
log.debug("Opened browser to {}", url);
return true;
}
catch (IOException | URISyntaxException ex)
{
log.warn("Unable to open URL {}. Error: {}", url, ex);
showMessageBox("Unable to open a URL. Press 'OK' and link will be copied to your clipboard.", url);
log.warn("Failed to open Desktop#browser {}", url, ex);
return false;
}
}