d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactor

adaptive-webui-19844
Chocobo1 8 years ago
parent
8742d7aa45
commit
bb956b8453
1 changed files with 48 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      src/base/utils/misc.cpp

103
src/base/utils/misc.cpp
Unescape View File

@ -572,65 +572,58 @@ void Utils::Misc::openPath(const QString &absolutePath)
void Utils::Misc::openFolderSelect(const QString &absolutePath) void Utils::Misc::openFolderSelect(const QString &absolutePath)
{ {
const QString path = Utils::Fs::fromNativePath(absolutePath); const QString path = Utils::Fs::fromNativePath(absolutePath);
#ifdef Q_OS_WIN // If the item to select doesn't exist, try to open its parent
if (QFileInfo(path).exists()) { if (!QFileInfo(path).exists()) {
// Syntax is: explorer /select, "C:\Folder1\Folder2\file_to_select"
// Dir separators MUST be win-style slashes
// QProcess::startDetached() has an obscure bug. If the path has
// no spaces and a comma(and maybe other special characters) it doesn't
// get wrapped in quotes. So explorer.exe can't find the correct path and
// displays the default one. If we wrap the path in quotes and pass it to
// QProcess::startDetached() explorer.exe still shows the default path. In
// this case QProcess::startDetached() probably puts its own quotes around ours.
STARTUPINFO startupInfo;
::ZeroMemory(&startupInfo, sizeof(startupInfo));
startupInfo.cb = sizeof(startupInfo);
PROCESS_INFORMATION processInfo;
::ZeroMemory(&processInfo, sizeof(processInfo));
QString cmd = QString("explorer.exe /select,\"%1\"").arg(Utils::Fs::toNativePath(absolutePath));
LPWSTR lpCmd = new WCHAR[cmd.size() + 1];
cmd.toWCharArray(lpCmd);
lpCmd[cmd.size()] = 0;
bool ret = ::CreateProcessW(NULL, lpCmd, NULL, NULL, FALSE, 0, NULL, NULL, &startupInfo, &processInfo);
delete [] lpCmd;
if (ret) {
::CloseHandle(processInfo.hProcess);
::CloseHandle(processInfo.hThread);
}
}
else {
// If the item to select doesn't exist, try to open its parent
openPath(path.left(path.lastIndexOf("/"))); openPath(path.left(path.lastIndexOf("/")));
return;
} }
#elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #ifdef Q_OS_WIN
if (QFileInfo(path).exists()) { // Syntax is: explorer /select, "C:\Folder1\Folder2\file_to_select"
QProcess proc; // Dir separators MUST be win-style slashes
proc.start("xdg-mime", QStringList() << "query" << "default" << "inode/directory");
proc.waitForFinished(); // QProcess::startDetached() has an obscure bug. If the path has
QString output = proc.readLine().simplified(); // no spaces and a comma(and maybe other special characters) it doesn't
if ((output == "dolphin.desktop") || (output == "org.kde.dolphin.desktop")) // get wrapped in quotes. So explorer.exe can't find the correct path and
proc.startDetached("dolphin", QStringList() << "--select" << Utils::Fs::toNativePath(path)); // displays the default one. If we wrap the path in quotes and pass it to
else if ((output == "nautilus.desktop") || (output == "org.gnome.Nautilus.desktop") // QProcess::startDetached() explorer.exe still shows the default path. In
|| (output == "nautilus-folder-handler.desktop")) // this case QProcess::startDetached() probably puts its own quotes around ours.
proc.startDetached("nautilus", QStringList() << "--no-desktop" << Utils::Fs::toNativePath(path));
else if (output == "nemo.desktop") STARTUPINFO startupInfo;
proc.startDetached("nemo", QStringList() << "--no-desktop" << Utils::Fs::toNativePath(path)); ::ZeroMemory(&startupInfo, sizeof(startupInfo));
else if ((output == "konqueror.desktop") || (output == "kfmclient_dir.desktop")) startupInfo.cb = sizeof(startupInfo);
proc.startDetached("konqueror", QStringList() << "--select" << Utils::Fs::toNativePath(path));
else PROCESS_INFORMATION processInfo;
// "caja" manager can't pinpoint the file, see: https://github.com/qbittorrent/qBittorrent/issues/5003 ::ZeroMemory(&processInfo, sizeof(processInfo));
openPath(path.left(path.lastIndexOf("/")));
QString cmd = QString("explorer.exe /select,\"%1\"").arg(Utils::Fs::toNativePath(absolutePath));
LPWSTR lpCmd = new WCHAR[cmd.size() + 1];
cmd.toWCharArray(lpCmd);
lpCmd[cmd.size()] = 0;
bool ret = ::CreateProcessW(NULL, lpCmd, NULL, NULL, FALSE, 0, NULL, NULL, &startupInfo, &processInfo);
delete [] lpCmd;
if (ret) {
::CloseHandle(processInfo.hProcess);
::CloseHandle(processInfo.hThread);
} }
else { #elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
// If the item to select doesn't exist, try to open its parent QProcess proc;
proc.start("xdg-mime", QStringList() << "query" << "default" << "inode/directory");
proc.waitForFinished();
QString output = proc.readLine().simplified();
if ((output == "dolphin.desktop") || (output == "org.kde.dolphin.desktop"))
proc.startDetached("dolphin", QStringList() << "--select" << Utils::Fs::toNativePath(path));
else if ((output == "nautilus.desktop") || (output == "org.gnome.Nautilus.desktop")
|| (output == "nautilus-folder-handler.desktop"))
proc.startDetached("nautilus", QStringList() << "--no-desktop" << Utils::Fs::toNativePath(path));
else if (output == "nemo.desktop")
proc.startDetached("nemo", QStringList() << "--no-desktop" << Utils::Fs::toNativePath(path));
else if ((output == "konqueror.desktop") || (output == "kfmclient_dir.desktop"))
proc.startDetached("konqueror", QStringList() << "--select" << Utils::Fs::toNativePath(path));
else
// "caja" manager can't pinpoint the file, see: https://github.com/qbittorrent/qBittorrent/issues/5003
openPath(path.left(path.lastIndexOf("/"))); openPath(path.left(path.lastIndexOf("/")));
}
#else #else
openPath(path.left(path.lastIndexOf("/"))); openPath(path.left(path.lastIndexOf("/")));
#endif #endif

Write Preview
Loading…
Cancel
Save