mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-03 05:25:52 +00:00
Code Issues Releases Wiki Activity

fix: open-folder does not work in qt client (#4963)

Browse source
This commit is contained in:
Charles Kerr 2023-02-20 14:41:47 -06:00 committed by GitHub
parent c5b1df0daa
commit 6a185634b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
qt/MainWindow.cc
View file

@ -582,17 +582,9 @@ void MainWindow::setLocation()
namespace namespace
{ {
namespace open_folder_helpers
// Open Folder & select torrent's file or top folder {
#ifdef HAVE_OPEN_SELECT
#undef HAVE_OPEN_SELECT
#endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#define HAVE_OPEN_SELECT
void openSelect(QString const& path) void openSelect(QString const& path)
{ {
auto const explorer = QStringLiteral("explorer"); auto const explorer = QStringLiteral("explorer");
@ -606,11 +598,7 @@ void openSelect(QString const& path)
param += QDir::toNativeSeparators(path); param += QDir::toNativeSeparators(path);
QProcess::startDetached(explorer, QStringList(param)); QProcess::startDetached(explorer, QStringList(param));
} }
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
#define HAVE_OPEN_SELECT
void openSelect(QString const& path) void openSelect(QString const& path)
{ {
QStringList script_args; QStringList script_args;
@ -621,54 +609,68 @@ void openSelect(QString const& path)
script_args << QStringLiteral("-e") << QStringLiteral("tell application \"Finder\" to activate"); script_args << QStringLiteral("-e") << QStringLiteral("tell application \"Finder\" to activate");
QProcess::execute(QStringLiteral("/usr/bin/osascript"), script_args); QProcess::execute(QStringLiteral("/usr/bin/osascript"), script_args);
} }
#else
void openSelect(QString const& path)
{
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
}
#endif #endif
// if all torrents in a list have the same top folder, return it
QString getTopFolder(FileList const& files)
{
if (std::empty(files))
{
return QString{};
}
auto const& first_filename = files.at(0).filename;
auto const slash_index = first_filename.indexOf(QLatin1Char{ '/' });
if (slash_index == -1)
{
return QString{};
}
auto top = first_filename.left(slash_index);
if (!std::all_of(std::begin(files), std::end(files), [&top](auto const& file) { return file.filename.startsWith(top); }))
{
return QString{};
}
return top;
}
} // namespace open_folder_helpers
} // namespace } // namespace
void MainWindow::openFolder() void MainWindow::openFolder()
{ {
auto const selected_torrents = getSelectedTorrents(); using namespace open_folder_helpers;
if (selected_torrents.size() != 1) auto const selected_torrents = getSelectedTorrents();
if (std::size(selected_torrents) != 1U)
{ {
return; return;
} }
int const torrent_id(*selected_torrents.begin()); auto const torrent_id = *selected_torrents.begin();
Torrent const* tor(model_.getTorrentFromId(torrent_id)); auto const* const tor = model_.getTorrentFromId(torrent_id);
if (tor == nullptr) if (tor == nullptr)
{ {
return; return;
} }
QString path(tor->getPath()); auto path = tor->getPath();
FileList const& files = tor->files();
if (files.empty()) // TODO(ckerr): this is arguably an antifeature? Seems useful to me
// but can cause the folder to be less predictable, i.e. sometimes
// using the download folder and sometimes the torrent's top-level.
if (auto const top = getTopFolder(tor->files()); !top.isEmpty())
{ {
return; path += QLatin1Char{ '/' };
path += top;
} }
QString const first_file = files.at(0).filename; openSelect(path);
if (int const slash_index = first_file.indexOf(QLatin1Char('/')); slash_index > -1)
{
path = path + QLatin1Char('/') + first_file.left(slash_index);
}
#ifdef HAVE_OPEN_SELECT
else
{
openSelect(path + QLatin1Char('/') + first_file);
return;
}
#endif
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
} }
void MainWindow::copyMagnetLinkToClipboard() void MainWindow::copyMagnetLinkToClipboard()