dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Base warning for show in file browser on unique directories

Browse Source 
Fixes #484
This commit is contained in:
Jonas Kvinge
2020-07-26 15:10:00 +02:00
parent 797196f7fc
commit a31eac1426
1 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/core/utilities.cpp
View File

@@ -337,8 +337,10 @@ QString ColorToRgba(const QColor &c) {
} }
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
void OpenInFileManager(const QString &path); void OpenInFileManager(const QString path, const QUrl &url);
void OpenInFileManager(const QString &path) { void OpenInFileManager(const QString path, const QUrl &url) {
if (!url.isLocalFile()) return;
QProcess proc; QProcess proc;
proc.start("xdg-mime", QStringList() << "query" << "default" << "inode/directory"); proc.start("xdg-mime", QStringList() << "query" << "default" << "inode/directory");
@@ -376,29 +378,22 @@ void OpenInFileManager(const QString &path) {
} }
if (command.isEmpty() || command == "exo-open") { if (command.isEmpty() || command == "exo-open") {
QFileInfo info(path); QDesktopServices::openUrl(QUrl::fromLocalFile(path));
if (!info.exists()) return;
QString directory = info.dir().path();
if (directory.isEmpty()) return;
QDesktopServices::openUrl(QUrl::fromLocalFile(directory));
} }
else if (command.startsWith("nautilus")) { else if (command.startsWith("nautilus")) {
proc.startDetached(command, QStringList() << command_params << "--select" << path); proc.startDetached(command, QStringList() << command_params << "--select" << url.toLocalFile());
} }
else if (command.startsWith("dolphin") || command.startsWith("konqueror") || command.startsWith("kfmclient")) { else if (command.startsWith("dolphin") || command.startsWith("konqueror") || command.startsWith("kfmclient")) {
proc.startDetached(command, QStringList() << command_params << "--select" << "--new-window" << path); proc.startDetached(command, QStringList() << command_params << "--select" << "--new-window" << url.toLocalFile());
} }
else if (command.startsWith("caja")) { else if (command.startsWith("caja")) {
QFileInfo info(path); proc.startDetached(command, QStringList() << command_params << "--no-desktop" << path);
if (!info.exists()) return;
QString directory = info.dir().path();
proc.startDetached(command, QStringList() << command_params << "--no-desktop" << directory);
} }
else if (command.startsWith("pcmanfm")) { else if (command.startsWith("pcmanfm")) {
proc.startDetached(command, QStringList() << command_params << QFileInfo(path).dir().path()); proc.startDetached(command, QStringList() << command_params << path);
} }
else { else {
proc.startDetached(command, QStringList() << command_params << path); proc.startDetached(command, QStringList() << command_params << url.toLocalFile());
} }
} }
@@ -406,28 +401,42 @@ void OpenInFileManager(const QString &path) {
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
// Better than openUrl(dirname(path)) - also highlights file at path // Better than openUrl(dirname(path)) - also highlights file at path
void RevealFileInFinder(QString const &path) { void RevealFileInFinder(const QString &path) {
QProcess::execute("/usr/bin/open", QStringList() << "-R" << path); QProcess::execute("/usr/bin/open", QStringList() << "-R" << path);
} }
#endif // Q_OS_MACOS #endif // Q_OS_MACOS
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
void ShowFileInExplorer(QString const &path); void ShowFileInExplorer(const QString &path);
void ShowFileInExplorer(QString const &path) { void ShowFileInExplorer(const QString &path) {
QProcess::execute("explorer.exe", QStringList() << "/select," << QDir::toNativeSeparators(path)); QProcess::execute("explorer.exe", QStringList() << "/select," << QDir::toNativeSeparators(path));
} }
#endif #endif
void OpenInFileBrowser(const QList<QUrl> &urls) { void OpenInFileBrowser(const QList<QUrl> &urls) {
if (urls.count() > 50) { QMap<QString, QUrl> dirs;
for (const QUrl &url : urls) {
if (!url.isLocalFile()) {
continue;
}
QString path = url.toLocalFile();
if (!QFile::exists(path)) continue;
const QString directory = QFileInfo(path).dir().path();
if (dirs.contains(directory)) continue;
dirs.insert(directory, url);
}
if (dirs.count() > 50) {
QMessageBox messagebox(QMessageBox::Critical, tr("Show in file browser"), tr("Too many songs selected.")); QMessageBox messagebox(QMessageBox::Critical, tr("Show in file browser"), tr("Too many songs selected."));
messagebox.exec(); messagebox.exec();
return; return;
} }
if (urls.count() > 5) { if (dirs.count() > 5) {
QMessageBox messagebox(QMessageBox::Information, tr("Show in file browser"), tr("%1 songs selected, are you sure you want to open them all?").arg(urls.count()), QMessageBox::Open|QMessageBox::Cancel); QMessageBox messagebox(QMessageBox::Information, tr("Show in file browser"), tr("%1 songs in %2 different directories selected, are you sure you want to open them all?").arg(urls.count()).arg(dirs.count()), QMessageBox::Open|QMessageBox::Cancel);
messagebox.setTextFormat(Qt::RichText); messagebox.setTextFormat(Qt::RichText);
int result = messagebox.exec(); int result = messagebox.exec();
switch (result) { switch (result) {
@@ -439,27 +448,15 @@ void OpenInFileBrowser(const QList<QUrl> &urls) {
} }
} }
QSet<QString> dirs; QMap<QString, QUrl>::iterator i;
for (i = dirs.begin(); i != dirs.end(); ++i) {
for (const QUrl &url : urls) {
if (!url.isLocalFile()) {
continue;
}
QString path = url.toLocalFile();
if (!QFile::exists(path)) continue;
const QString directory = QFileInfo(path).dir().path();
if (dirs.contains(directory)) continue;
dirs.insert(directory);
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
OpenInFileManager(path); OpenInFileManager(i.key(), i.value());
#elif defined(Q_OS_MACOS) #elif defined(Q_OS_MACOS)
// Revealing multiple files in the finder only opens one window, so it also makes sense to reveal at most one per directory // Revealing multiple files in the finder only opens one window, so it also makes sense to reveal at most one per directory
RevealFileInFinder(path); RevealFileInFinder(i.value().toLocalFile());
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
ShowFileInExplorer(path); ShowFileInExplorer(i.value().toLocalFile());
#endif #endif
} }