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

fix: 4981 open folder should open selected folder (#5115)

Browse source
This commit is contained in:
Charles Kerr 2023-03-01 15:57:23 -06:00 committed by GitHub
parent a623b50ed0
commit d21a3b622a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
qt/MainWindow.cc
View file

@ -617,28 +617,54 @@ void openSelect(QString const& path)
#endif
// if all torrents in a list have the same top folder, return it
QString getTopFolder(FileList const& files)
[[nodiscard]] QString getTopFolder(FileList const& files)
{
if (std::empty(files))
{
return QString{};
return {};
}
auto const& first_filename = files.at(0).filename;
auto const slash_index = first_filename.indexOf(QLatin1Char{ '/' });
if (slash_index == -1)
{
return QString{};
return {};
}
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 {};
}
return top;
}
[[nodiscard]] bool isTopFolder(QDir const& parent, QString const& child)
{
if (child.isEmpty())
{
return false;
}
auto const info = QFileInfo{ parent, child };
return info.exists() && info.isDir();
}
[[nodiscard]] QString getTopFolder(QDir const& parent, Torrent const* const tor)
{
if (auto top = getTopFolder(tor->files()); isTopFolder(parent, top))
{
return top;
}
if (auto const& top = tor->name(); isTopFolder(parent, top))
{
return top;
}
return {};
}
} // namespace open_folder_helpers
} // namespace
@ -659,18 +685,9 @@ void MainWindow::openFolder()
return;
}
auto path = tor->getPath();
// 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())
{
path += QLatin1Char{ '/' };
path += top;
}
openSelect(path);
auto const parent = QDir{ tor->getPath() };
auto const child = getTopFolder(parent, tor);
openSelect(parent.filePath(child));
}
void MainWindow::copyMagnetLinkToClipboard()