FileBrowser: "Open containing folder" automatically selects file in the OS's file manager

include/FileBrowser.h

@@ -140,7 +140,7 @@ private slots:
 } ;
 
 
-
+class Directory;
 
 class FileBrowserTreeWidget : public QTreeWidget
 {
@@ -195,8 +195,8 @@ private slots:
 	bool openInNewSampleTrack( lmms::gui::FileItem* item );
 	void sendToActiveInstrumentTrack( lmms::gui::FileItem* item );
 	void updateDirectory( QTreeWidgetItem * item );
+	void openDirectory( Directory* directory );
 	void openContainingFolder( lmms::gui::FileItem* item );
-
 } ;
 
 

src/gui/FileBrowser.cpp

@@ -35,6 +35,7 @@
 #include <QMdiSubWindow>
 #include <QMenu>
 #include <QMessageBox>
+#include <QProcess>
 #include <QPushButton>
 #include <QShortcut>
 #include <QStringList>
@@ -68,9 +69,16 @@
 #include "ThreadPool.h"
 #include "embed.h"
 
+#if !defined(_WIN32) && !defined(__APPLE__)
+#include <QHash>
+#endif
+
 namespace lmms::gui
 {
 
+#if !defined(_WIN32) && !defined(__APPLE__)
+QHash<QString, bool> selectOptionCache;
+#endif
 
 enum TreeWidgetItemTypes
 {
@@ -629,37 +637,63 @@
 
 void FileBrowserTreeWidget::contextMenuEvent(QContextMenuEvent * e )
 {
-	auto file = dynamic_cast<FileItem*>(itemAt(e->pos()));
-	if( file != nullptr && file->isTrack() )
-	{
-		QMenu contextMenu( this );
+#ifdef LMMS_BUILD_APPLE
+	QString fileManager = tr("Finder");
+#elif defined(LMMS_BUILD_WIN32)
+	QString fileManager = tr("File Explorer");
+#else
+	QString fileManager = tr("file manager");
+#endif
 
-		contextMenu.addAction(
-			tr( "Send to active instrument-track" ),
-			[=, this]{ sendToActiveInstrumentTrack(file); }
-		);
+   QTreeWidgetItem* item = itemAt(e->pos());
 
-		contextMenu.addSeparator();
+   auto file = dynamic_cast<FileItem*>(item);
 
-		contextMenu.addAction(
-			QIcon(embed::getIconPixmap("folder")),
-			tr("Open containing folder"),
-			[=, this]{ openContainingFolder(file); }
-		);
+   QMenu contextMenu( this );
 
-		auto songEditorHeader = new QAction(tr("Song Editor"), nullptr);
-		songEditorHeader->setDisabled(true);
-		contextMenu.addAction( songEditorHeader );
-		contextMenu.addActions( getContextActions(file, true) );
+   auto dir = dynamic_cast<Directory*>(item); // TODO: this might not be a great way to check if it's a directory
 
-		auto patternEditorHeader = new QAction(tr("Pattern Editor"), nullptr);
-		patternEditorHeader->setDisabled(true);
-		contextMenu.addAction(patternEditorHeader);
-		contextMenu.addActions( getContextActions(file, false) );
 
-		// We should only show the menu if it contains items
-		if (!contextMenu.isEmpty()) { contextMenu.exec( e->globalPos() ); }
-	}
+   if( file != nullptr)
+   {
+	   if (file->isTrack()) {
+		   contextMenu.addAction(
+			   tr( "Send to active instrument-track" ),
+			   [=, this]{ sendToActiveInstrumentTrack(file); }
+		   );
+
+		   contextMenu.addSeparator();
+	   }
+
+	   contextMenu.addAction(
+		   QIcon(embed::getIconPixmap("folder")),
+
+		   tr("Show in") + " " +fileManager,
+		   [=, this]{ openContainingFolder(file); }
+	   );
+
+
+	   auto songEditorHeader = new QAction(tr("Song Editor"), nullptr);
+	   songEditorHeader->setDisabled(true);
+	   contextMenu.addAction( songEditorHeader );
+	   contextMenu.addActions( getContextActions(file, true) );
+
+	   auto patternEditorHeader = new QAction(tr("Pattern Editor"), nullptr);
+	   patternEditorHeader->setDisabled(true);
+	   contextMenu.addAction(patternEditorHeader);
+	   contextMenu.addActions( getContextActions(file, false) );
+
+   } else if (dir) {
+
+	   contextMenu.addAction(
+		   QIcon(embed::getIconPixmap("folder")),
+		   tr("Open in") + " " + fileManager,
+		   [=, this]{ openDirectory(dir); }
+	   );
+   }
+
+   // We should only show the menu if it contains items
+   if (!contextMenu.isEmpty()) { contextMenu.exec( e->globalPos() ); }
 }
 
 
@@ -910,7 +944,7 @@
 			it->replaceInstrument(dataFile);
 			break;
 		}
 		case FileItem::FileHandling::ImportAsProject:
 			ImportFilter::import( f->fullName(),
 							Engine::getSong() );
 			break;
@@ -992,21 +1026,96 @@
 
 
 
+void FileBrowserTreeWidget::openDirectory(Directory* directory) {
+   QDesktopServices::openUrl(QUrl::fromLocalFile(directory->fullName()));
+}
+
+#if !defined(_WIN32) && !defined(__APPLE__)
+
+bool supportsSelectOption(const QString &fileManager) {
+	if (selectOptionCache.contains(fileManager)) {
+		return selectOptionCache[fileManager];
+	}
+
+	QProcess process;
+	process.start(fileManager, {"--help"});
+
+	// Ensure we don't block forever
+	if (!process.waitForFinished(1000)) {
+		selectOptionCache[fileManager] = false;
+		return false;
+	}
+
+	// Capture both stdout and stderr (some apps print help to stderr)
+	QString output = QString::fromUtf8(process.readAllStandardOutput() + process.readAllStandardError());
+
+	// Some file managers return non-zero exit codes for --help, so we ignore it
+	bool supportsSelect = output.contains("--select", Qt::CaseInsensitive);
+
+	selectOptionCache[fileManager] = supportsSelect; // Cache the result
+	return supportsSelect;
+}
+
+
+static QString getDefaultFileManager() {
+	QProcess process;
+	process.start("xdg-mime", {"query", "default", "inode/directory"});
+	process.waitForFinished();
+
+	QString fileManager = QString::fromUtf8(process.readAllStandardOutput()).trimmed();
+
+	if (fileManager.isEmpty()) {
+		fileManager = qgetenv("FILE_MANAGER");
+		if (fileManager.isEmpty()) {
+			fileManager = qgetenv("XDG_FILE_MANAGER");
+		}
+	}
+
+	return fileManager;
+}
+#endif
+
 void FileBrowserTreeWidget::openContainingFolder(FileItem* item)
 {
-	// Delegate to QDesktopServices::openUrl with the directory of the selected file. Please note that
-	// this will only open the directory but not select the file as this is much more complicated due
-	// to different implementations that are needed for different platforms (Linux/Windows/MacOS).
-
-	// Using QDesktopServices::openUrl seems to be the most simple cross platform way which uses
-	// functionality that's already available in Qt.
-	QFileInfo fileInfo(item->fullName());
-	QDesktopServices::openUrl(QUrl::fromLocalFile(fileInfo.dir().path()));
+   QFileInfo fileInfo(item->fullName());
+   QString path = QDir::toNativeSeparators(fileInfo.canonicalFilePath());
+   QString directory = QDir::toNativeSeparators(fileInfo.canonicalFilePath());
+
+#ifdef _WIN32
+   // Windows
+	QStringList param;
+	if (!fileInfo.isDir())
+		param += QLatin1String("/select,");
+	param += path;
+	QProcess::startDetached("explorer", param);
+
+#elif __APPLE__
+   // macOS
+	QProcess::startDetached("open", {"-R", path});
+#else
+	// Linux & BSD
+	// there are a lot of potential file managers on these systems so we need to figure out what to use.
+
+	QString fileManager = getDefaultFileManager();
+
+	if (fileManager.isEmpty()) {
+		QDesktopServices::openUrl(QUrl::fromLocalFile(QFileInfo(path).absolutePath()));
+		return;
+	}
+
+	// If the file manager supports --select, use it. Otherwise, open the directory.
+	if (supportsSelectOption(fileManager)) {
+		QProcess::startDetached(fileManager, {"--select", path});
+	} else {
+		QDesktopServices::openUrl(QUrl::fromLocalFile(QFileInfo(path).absolutePath()));
+	}
+#endif
 }
 
 
 
 
+
 void FileBrowserTreeWidget::sendToActiveInstrumentTrack( FileItem* item )
 {
 	// get all windows opened in the workspace