Skip to content

Commit

Permalink
Linux: Improve directory opening logic by prioritizing xdg-open and a…
Browse files Browse the repository at this point in the history
…dding fallback mechanisms (#1420)

- Use xdg-open as the primary method for opening directories, ensuring compatibility with most Linux environments.
- Implemented fallback logic to try other known file managers (e.g., nautilus, dolphin, caja, thunar) if xdg-open is unavailable or fails.

Based on proposal by @bugtracker2019
  • Loading branch information
idrassi committed Sep 24, 2024
1 parent ba8dd51 commit 92ad97e
Showing 1 changed file with 52 additions and 46 deletions.
98 changes: 52 additions & 46 deletions src/Main/UserInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,14 @@ namespace VeraCrypt
ShowWarning (e.mException);
}

#if !defined(TC_WINDOWS) && !defined(TC_MACOSX)
// Function to check if a given executable exists and is executable
static bool IsExecutable(const string& exe) {
return wxFileName::IsFileExecutable("/usr/bin/" + exe) ||
wxFileName::IsFileExecutable("/usr/local/bin/" + exe);
}
#endif

void UserInterface::OpenExplorerWindow (const DirectoryPath &path)
{
if (path.IsEmpty())
Expand All @@ -897,60 +905,58 @@ namespace VeraCrypt
catch (exception &e) { ShowError (e); }

#else
// MIME handler for directory seems to be unavailable through wxWidgets
wxString desktop = GetTraits()->GetDesktopEnvironment();
bool xdgOpenPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open")) || wxFileName::IsFileExecutable (wxT("/usr/local/bin/xdg-open"));
bool nautilusPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/nautilus")) || wxFileName::IsFileExecutable (wxT("/usr/local/bin/nautilus"));

if (desktop == L"GNOME" || (desktop.empty() && !xdgOpenPresent && nautilusPresent))
{
// args.push_back ("--no-default-window"); // This option causes nautilus not to launch under FreeBSD 11
args.push_back ("--no-desktop");
args.push_back (string (path));
try
{
Process::Execute ("nautilus", args, 2000);
string directoryPath = string(path);
// Primary attempt: Use xdg-open
if (IsExecutable("xdg-open")) {
try {
args.push_back(directoryPath);
Process::Execute("xdg-open", args, 2000);
return;
}
catch (TimeOut&) { }
catch (exception &e) { ShowError (e); }
catch (exception&) {}
}
else if (desktop == L"KDE")
{
try
{
args.push_back (string (path));
Process::Execute ("dolphin", args, 2000);
}
catch (TimeOut&) { }
catch (exception&)
{

// Fallback attempts: Try known file managers
const char* fallbackFileManagers[] = { "gio", "kioclient5", "kfmclient", "exo-open", "nautilus", "dolphin", "caja", "thunar", "pcmanfm" };
const size_t numFileManagers = sizeof(fallbackFileManagers) / sizeof(fallbackFileManagers[0]);

for (size_t i = 0; i < numFileManagers; ++i) {
const char* fm = fallbackFileManagers[i];
if (IsExecutable(fm)) {
args.clear();
args.push_back ("openURL");
args.push_back (string (path));
try
{
Process::Execute ("kfmclient", args, 2000);
if (strcmp(fm, "gio") == 0) {
args.push_back("open");
args.push_back(directoryPath);
}
else if (strcmp(fm, "kioclient5") == 0) {
args.push_back("exec");
args.push_back(directoryPath);
}
else if (strcmp(fm, "kfmclient") == 0) {
args.push_back("openURL");
args.push_back(directoryPath);
}
else if (strcmp(fm, "exo-open") == 0) {
args.push_back("--launch");
args.push_back("FileManager");
args.push_back(directoryPath);
}
else {
args.push_back(directoryPath);
}

try {
Process::Execute(fm, args, 2000);
return; // Success
}
catch (TimeOut&) { }
catch (exception &e) { ShowError (e); }
}
}
else if (xdgOpenPresent)
{
// Fallback on the standard xdg-open command
// which is not always available by default
args.push_back (string (path));
try
{
Process::Execute ("xdg-open", args, 2000);
catch (exception &) {}
}
catch (TimeOut&) { }
catch (exception &e) { ShowError (e); }
}
else
{
ShowWarning (wxT("Unable to find a file manager to open the mounted volume"));
}

ShowWarning(wxT("Unable to find a file manager to open the mounted volume.\n"
"Please install xdg-utils or set a default file manager."));
#endif
}

Expand Down

0 comments on commit 92ad97e

Please sign in to comment.