d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-25 14:04:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6699 from fbriere/issue/6265-top-dirname-while-adding

Browse Source 
Use actual top-level dirname to look for incomplete files in new torrent
This commit is contained in:
Vladimir Golovnev 2017-05-11 15:23:16 +03:00 committed by GitHub
commit f3658daf72
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QDirIterator>
#include <QHostAddress> #include <QHostAddress>
#include <QNetworkAddressEntry> #include <QNetworkAddressEntry>
#include <QNetworkInterface> #include <QNetworkInterface>
@ -156,16 +155,6 @@ namespace
return expanded; return expanded;
} }
QStringList findAllFiles(const QString &dirPath)
{
QStringList files;
QDirIterator it(dirPath, QDir::Files, QDirIterator::Subdirectories);
while (it.hasNext())
files << it.next();
return files;
}
template <typename T> template <typename T>
struct LowerLimited struct LowerLimited
{ {
@ -1731,35 +1720,19 @@ bool Session::findIncompleteFiles(TorrentInfo &torrentInfo, QString &savePath) c
{ {
auto findInDir = [](const QString &dirPath, TorrentInfo &torrentInfo) -> bool auto findInDir = [](const QString &dirPath, TorrentInfo &torrentInfo) -> bool
{ {
const QDir dir(dirPath);
bool found = false; bool found = false;
if (torrentInfo.filesCount() == 1) {
const QString filePath = dirPath + torrentInfo.filePath(0);
if (QFile(filePath).exists()) {
found = true;
}
else if (QFile(filePath + QB_EXT).exists()) {
found = true;
torrentInfo.renameFile(0, torrentInfo.filePath(0) + QB_EXT);
}
}
else {
QSet<QString> allFiles;
int dirPathSize = dirPath.size();
foreach (const QString &file, findAllFiles(dirPath + torrentInfo.name()))
allFiles << file.mid(dirPathSize);
for (int i = 0; i < torrentInfo.filesCount(); ++i) { for (int i = 0; i < torrentInfo.filesCount(); ++i) {
QString filePath = torrentInfo.filePath(i); const QString filePath = torrentInfo.filePath(i);
if (allFiles.contains(filePath)) { if (dir.exists(filePath)) {
found = true; found = true;
} }
else { else if (dir.exists(filePath + QB_EXT)) {
filePath += QB_EXT;
if (allFiles.contains(filePath)) {
found = true; found = true;
torrentInfo.renameFile(i, filePath); torrentInfo.renameFile(i, filePath + QB_EXT);
}
}
} }
if ((i % 100) == 0)
qApp->processEvents();
} }
return found; return found;