mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-30 08:20:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Utility::showInFileManager(): Substitute valid desktop file parameters

Browse source
This commit is contained in:
Daniel Molkentin 2013-10-03 12:04:08 +02:00
parent 44ed577992
commit 339ed20abc
1 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/mirall/utility.cpp
View file

@ -283,10 +283,8 @@ static QString findDefaultFileManager()
foreach(QString dir, dirs) { foreach(QString dir, dirs) {
foreach(QString subdir, subdirs) { foreach(QString subdir, subdirs) {
fi.setFile(dir + subdir + fileName); fi.setFile(dir + subdir + fileName);
if(fi.exists()) { if (fi.exists()) {
QSettings desktopFile(fi.absoluteFilePath(), QSettings::IniFormat); return fi.absoluteFilePath();
QString exec = desktopFile.value("Desktop Entry/Exec").toString();
return exec;
} }
} }
} }
@ -326,12 +324,15 @@ void Utility::showInFileManager(const QString &localPath)
QString app; QString app;
QStringList args; QStringList args;
QString defaultManager = findDefaultFileManager(); static QString defaultManager = findDefaultFileManager();
QSettings desktopFile(defaultManager, QSettings::IniFormat);
QString exec = desktopFile.value("Desktop Entry/Exec").toString();
QString fileToOpen = QFileInfo(localPath).absoluteFilePath(); QString fileToOpen = QFileInfo(localPath).absoluteFilePath();
QString pathToOpen = QFileInfo(localPath).absolutePath(); QString pathToOpen = QFileInfo(localPath).absolutePath();
bool cannotHandleFile = false; bool canHandleFile = false; // assume dumb fm
args = defaultManager.split(' '); args = exec.split(' ');
if (args.count() > 0) app = args.takeFirst(); if (args.count() > 0) app = args.takeFirst();
QString kdeSelectParam("--select"); QString kdeSelectParam("--select");
@ -339,6 +340,7 @@ void Utility::showInFileManager(const QString &localPath)
if (app.contains("konqueror") && !args.contains(kdeSelectParam)) { if (app.contains("konqueror") && !args.contains(kdeSelectParam)) {
// konq needs '--select' in order not to launch the file // konq needs '--select' in order not to launch the file
args.prepend(kdeSelectParam); args.prepend(kdeSelectParam);
canHandleFile = true;
} }
if (app.contains("dolphin")) if (app.contains("dolphin"))
@ -346,24 +348,40 @@ void Utility::showInFileManager(const QString &localPath)
static bool dolphinCanSelect = checkDolphinCanSelect(); static bool dolphinCanSelect = checkDolphinCanSelect();
if (dolphinCanSelect && !args.contains(kdeSelectParam)) { if (dolphinCanSelect && !args.contains(kdeSelectParam)) {
args.prepend(kdeSelectParam); args.prepend(kdeSelectParam);
} else { canHandleFile = true;
// When passing a file without '--select', dolphin will
// open the file. We don't want that.
cannotHandleFile = true;
} }
} }
if (cannotHandleFile) { // whitelist
std::replace(args.begin(), args.end(), QString::fromLatin1("%u"), pathToOpen); if (app.contains("nautilus") || app.contains("nemo")) {
std::replace(args.begin(), args.end(), QString::fromLatin1("%U"), pathToOpen); canHandleFile = true;
if (args.count() == 0) args << pathToOpen;
} else {
std::replace(args.begin(), args.end(), QString::fromLatin1("%u"), fileToOpen);
std::replace(args.begin(), args.end(), QString::fromLatin1("%U"), fileToOpen);
if (args.count() == 0) args << fileToOpen;
} }
if (app.isEmpty() || args.isEmpty()) { static QString name;
if (name.isEmpty()) {
name = desktopFile.value(QString::fromLatin1("Desktop Entry/Name[%1]").arg(qApp->property("ui_lang").toString())).toString();
if (name.isEmpty()) {
name = desktopFile.value(QString::fromLatin1("Desktop Entry/Name")).toString();
}
}
std::replace(args.begin(), args.end(), QString::fromLatin1("%c"), name);
std::replace(args.begin(), args.end(), QString::fromLatin1("%u"), fileToOpen);
std::replace(args.begin(), args.end(), QString::fromLatin1("%U"), fileToOpen);
std::replace(args.begin(), args.end(), QString::fromLatin1("%f"), fileToOpen);
std::replace(args.begin(), args.end(), QString::fromLatin1("%F"), fileToOpen);
// fixme: needs to append --icon, according to http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
QStringList::iterator it = std::find(args.begin(), args.end(), QString::fromLatin1("%i"));
if (it != args.end()) {
(*it) = desktopFile.value("Desktop Entry/Icon").toString();
args.insert(it, QString::fromLatin1("--icon")); // before
}
if (args.count() == 0) args << fileToOpen;
if (app.isEmpty() || args.isEmpty() || !canHandleFile) {
// fall back: open the default file manager, without ever selecting the file // fall back: open the default file manager, without ever selecting the file
QDesktopServices::openUrl(QUrl::fromLocalFile(pathToOpen)); QDesktopServices::openUrl(QUrl::fromLocalFile(pathToOpen));
} else { } else {