squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-20 15:37:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make meaning of "torrent root path" consistent

Browse Source 
PR #15816.
This commit is contained in:
Vladimir Golovnev
2021-12-09 06:12:47 +03:00
committed by GitHub
parent 28f2def21f
commit 3d7ff9765a
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/base/bittorrent/torrentimpl.cpp
View File

@@ -397,12 +397,11 @@ QString TorrentImpl::rootPath(bool actual) const
if (!hasMetadata())
return {};
const QString firstFilePath = filePath(0);
const int slashIndex = firstFilePath.indexOf('/');
if (slashIndex >= 0)
return QDir(savePath(actual)).absoluteFilePath(firstFilePath.left(slashIndex));
else
return QDir(savePath(actual)).absoluteFilePath(firstFilePath);
const QString relativeRootPath = m_torrentInfo.rootFolder();
if (relativeRootPath.isEmpty())
return {};
return QDir(savePath(actual)).absoluteFilePath(relativeRootPath);
}
QString TorrentImpl::contentPath(const bool actual) const
@@ -413,10 +412,8 @@ QString TorrentImpl::contentPath(const bool actual) const
if (filesCount() == 1)
return QDir(savePath(actual)).absoluteFilePath(filePath(0));
if (m_torrentInfo.hasRootFolder())
return rootPath(actual);
return savePath(actual);
const QString rootPath = this->rootPath(actual);
return (rootPath.isEmpty() ? savePath(actual) : rootPath);
}
bool TorrentImpl::isAutoTMMEnabled() const