mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-27 08:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename torrent if content was initially renamed

Browse Source 
Closes #8910.
This commit is contained in:
Vladimir Golovnev (Glassez) 2018-05-19 09:41:33 +03:00
parent e157ca2430
commit a54f57611c
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/base/bittorrent/session.cpp
View File

@ -2149,12 +2149,26 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri
p = magnetUri.addTorrentParams(); p = magnetUri.addTorrentParams();
} }
else if (torrentInfo.isValid()) { else if (torrentInfo.isValid()) {
if (!addData.resumed && !addData.hasRootFolder) if (!addData.resumed) {
if (!addData.hasRootFolder)
torrentInfo.stripRootFolder(); torrentInfo.stripRootFolder();
// Metadata // Metadata
if (!addData.resumed && !addData.hasSeedStatus) if (!addData.hasSeedStatus)
findIncompleteFiles(torrentInfo, savePath); findIncompleteFiles(torrentInfo, savePath);
// if torrent name wasn't explicitly set we handle the case of
// initial renaming of torrent content and rename torrent accordingly
if (addData.name.isEmpty()) {
QString contentName = torrentInfo.rootFolder();
if (contentName.isEmpty() && (torrentInfo.filesCount() == 1))
contentName = torrentInfo.fileName(0);
if (!contentName.isEmpty() && (contentName != torrentInfo.name()))
addData.name = contentName;
}
}
p.ti = torrentInfo.nativeInfo(); p.ti = torrentInfo.nativeInfo();
hash = torrentInfo.hash(); hash = torrentInfo.hash();
} }

21
src/base/bittorrent/torrentinfo.cpp
View File

@ -362,24 +362,29 @@ int BitTorrent::TorrentInfo::fileIndex(const QString& fileName) const
return -1; return -1;
} }
bool TorrentInfo::hasRootFolder() const QString TorrentInfo::rootFolder() const
{ {
QString testRootFolder; QString rootFolder;
for (int i = 0; i < filesCount(); ++i) { for (int i = 0; i < filesCount(); ++i) {
const QString filePath = this->filePath(i); const QString filePath = this->filePath(i);
if (QDir::isAbsolutePath(filePath)) continue; if (QDir::isAbsolutePath(filePath)) continue;
const auto filePathElements = filePath.splitRef('/'); const auto filePathElements = filePath.splitRef('/');
// if at least one file has no root folder, no common root folder exists // if at least one file has no root folder, no common root folder exists
if (filePathElements.count() <= 1) return false; if (filePathElements.count() <= 1) return "";
if (testRootFolder.isEmpty()) if (rootFolder.isEmpty())
testRootFolder = filePathElements.at(0).toString(); rootFolder = filePathElements.at(0).toString();
else if (testRootFolder != filePathElements.at(0)) else if (rootFolder != filePathElements.at(0))
return false; return "";
} }
return true; return rootFolder;
}
bool TorrentInfo::hasRootFolder() const
{
return !rootFolder().isEmpty();
} }
void TorrentInfo::stripRootFolder() void TorrentInfo::stripRootFolder()

1
src/base/bittorrent/torrentinfo.h
View File

@ -104,6 +104,7 @@ namespace BitTorrent
void renameFile(uint index, const QString &newPath); void renameFile(uint index, const QString &newPath);
QString rootFolder() const;
bool hasRootFolder() const; bool hasRootFolder() const;
void stripRootFolder(); void stripRootFolder();