mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-11-29 13:58:51 +03:00
Merge pull request #16268 from glassez/fix-15955
Store hybrid torrents using "torrent ID" as basename
This commit is contained in:
commit
adf7c4ffb6
4 changed files with 139 additions and 53 deletions
|
@ -36,6 +36,13 @@ BitTorrent::InfoHash::InfoHash(const WrappedType &nativeHash)
|
|||
{
|
||||
}
|
||||
|
||||
#ifdef QBT_USES_LIBTORRENT2
|
||||
BitTorrent::InfoHash::InfoHash(const SHA1Hash &v1, const SHA256Hash &v2)
|
||||
: InfoHash {WrappedType(v1, v2)}
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
bool BitTorrent::InfoHash::isValid() const
|
||||
{
|
||||
return m_valid;
|
||||
|
|
|
@ -65,6 +65,9 @@ namespace BitTorrent
|
|||
|
||||
InfoHash() = default;
|
||||
InfoHash(const WrappedType &nativeHash);
|
||||
#ifdef QBT_USES_LIBTORRENT2
|
||||
InfoHash(const SHA1Hash &v1, const SHA256Hash &v2);
|
||||
#endif
|
||||
|
||||
bool isValid() const;
|
||||
SHA1Hash v1() const;
|
||||
|
@ -85,3 +88,6 @@ namespace BitTorrent
|
|||
}
|
||||
|
||||
Q_DECLARE_METATYPE(BitTorrent::TorrentID)
|
||||
// We can declare it as Q_MOVABLE_TYPE to improve performance
|
||||
// since base type uses QSharedDataPointer as the only member
|
||||
Q_DECLARE_TYPEINFO(BitTorrent::TorrentID, Q_MOVABLE_TYPE);
|
||||
|
|
|
@ -4346,53 +4346,114 @@ void Session::startUpTorrents()
|
|||
const QVector<TorrentID> torrents = startupStorage->registeredTorrents();
|
||||
int resumedTorrentsCount = 0;
|
||||
QVector<TorrentID> queue;
|
||||
for (const TorrentID &torrentID : torrents)
|
||||
#ifdef QBT_USES_LIBTORRENT2
|
||||
const QSet<TorrentID> indexedTorrents {torrents.cbegin(), torrents.cend()};
|
||||
QSet<TorrentID> skippedIDs;
|
||||
#endif
|
||||
for (TorrentID torrentID : torrents)
|
||||
{
|
||||
#ifdef QBT_USES_LIBTORRENT2
|
||||
if (skippedIDs.contains(torrentID))
|
||||
continue;
|
||||
#endif
|
||||
|
||||
const std::optional<LoadTorrentParams> loadResumeDataResult = startupStorage->load(torrentID);
|
||||
if (loadResumeDataResult)
|
||||
{
|
||||
LoadTorrentParams resumeData = *loadResumeDataResult;
|
||||
bool needStore = false;
|
||||
|
||||
if (m_resumeDataStorage != startupStorage)
|
||||
{
|
||||
needStore = true;
|
||||
if (isQueueingSystemEnabled() && !resumeData.hasSeedStatus)
|
||||
queue.append(torrentID);
|
||||
}
|
||||
|
||||
// TODO: Remove the following upgrade code in v4.5
|
||||
// == BEGIN UPGRADE CODE ==
|
||||
if (m_needUpgradeDownloadPath && isDownloadPathEnabled())
|
||||
{
|
||||
if (!resumeData.useAutoTMM)
|
||||
{
|
||||
resumeData.downloadPath = downloadPath();
|
||||
needStore = true;
|
||||
}
|
||||
}
|
||||
// == END UPGRADE CODE ==
|
||||
|
||||
if (needStore)
|
||||
m_resumeDataStorage->store(torrentID, resumeData);
|
||||
|
||||
qDebug() << "Starting up torrent" << torrentID.toString() << "...";
|
||||
if (!loadTorrent(resumeData))
|
||||
{
|
||||
LogMsg(tr("Unable to resume torrent '%1'.", "e.g: Unable to resume torrent 'hash'.")
|
||||
.arg(torrentID.toString()), Log::CRITICAL);
|
||||
}
|
||||
|
||||
// process add torrent messages before message queue overflow
|
||||
if ((resumedTorrentsCount % 100) == 0) readAlerts();
|
||||
|
||||
++resumedTorrentsCount;
|
||||
}
|
||||
else
|
||||
if (!loadResumeDataResult)
|
||||
{
|
||||
LogMsg(tr("Unable to resume torrent '%1'.", "e.g: Unable to resume torrent 'hash'.")
|
||||
.arg(torrentID.toString()), Log::CRITICAL);
|
||||
continue;
|
||||
}
|
||||
|
||||
LoadTorrentParams resumeData = *loadResumeDataResult;
|
||||
bool needStore = false;
|
||||
|
||||
#ifdef QBT_USES_LIBTORRENT2
|
||||
const lt::info_hash_t infoHash = (resumeData.ltAddTorrentParams.ti
|
||||
? resumeData.ltAddTorrentParams.ti->info_hashes()
|
||||
: resumeData.ltAddTorrentParams.info_hashes);
|
||||
if (infoHash.has_v1() && infoHash.has_v2())
|
||||
{
|
||||
const auto torrentIDv1 = TorrentID::fromInfoHash(lt::info_hash_t(infoHash.v1));
|
||||
const auto torrentIDv2 = TorrentID::fromInfoHash(infoHash);
|
||||
if (torrentID == torrentIDv2)
|
||||
{
|
||||
if (indexedTorrents.contains(torrentIDv1))
|
||||
{
|
||||
// if we has no metadata trying to find it in alternative "resume data"
|
||||
if (!resumeData.ltAddTorrentParams.ti)
|
||||
{
|
||||
const std::optional<LoadTorrentParams> loadAltResumeDataResult = startupStorage->load(torrentIDv1);
|
||||
if (loadAltResumeDataResult)
|
||||
{
|
||||
LoadTorrentParams altResumeData = *loadAltResumeDataResult;
|
||||
resumeData.ltAddTorrentParams.ti = altResumeData.ltAddTorrentParams.ti;
|
||||
}
|
||||
}
|
||||
|
||||
// remove alternative "resume data" and skip the attempt to load it
|
||||
m_resumeDataStorage->remove(torrentIDv1);
|
||||
skippedIDs.insert(torrentIDv1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
torrentID = torrentIDv2;
|
||||
needStore = true;
|
||||
m_resumeDataStorage->remove(torrentIDv1);
|
||||
|
||||
if (indexedTorrents.contains(torrentID))
|
||||
{
|
||||
skippedIDs.insert(torrentID);
|
||||
|
||||
const std::optional<LoadTorrentParams> loadPreferredResumeDataResult = startupStorage->load(torrentID);
|
||||
if (loadPreferredResumeDataResult)
|
||||
{
|
||||
LoadTorrentParams preferredResumeData = *loadPreferredResumeDataResult;
|
||||
std::shared_ptr<lt::torrent_info> ti = resumeData.ltAddTorrentParams.ti;
|
||||
if (!preferredResumeData.ltAddTorrentParams.ti)
|
||||
preferredResumeData.ltAddTorrentParams.ti = ti;
|
||||
|
||||
resumeData = preferredResumeData;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (m_resumeDataStorage != startupStorage)
|
||||
{
|
||||
needStore = true;
|
||||
if (isQueueingSystemEnabled() && !resumeData.hasSeedStatus)
|
||||
queue.append(torrentID);
|
||||
}
|
||||
|
||||
// TODO: Remove the following upgrade code in v4.6
|
||||
// == BEGIN UPGRADE CODE ==
|
||||
if (m_needUpgradeDownloadPath && isDownloadPathEnabled())
|
||||
{
|
||||
if (!resumeData.useAutoTMM)
|
||||
{
|
||||
resumeData.downloadPath = downloadPath();
|
||||
needStore = true;
|
||||
}
|
||||
}
|
||||
// == END UPGRADE CODE ==
|
||||
|
||||
if (needStore)
|
||||
m_resumeDataStorage->store(torrentID, resumeData);
|
||||
|
||||
qDebug() << "Starting up torrent" << torrentID.toString() << "...";
|
||||
if (!loadTorrent(resumeData))
|
||||
{
|
||||
LogMsg(tr("Unable to resume torrent '%1'.", "e.g: Unable to resume torrent 'hash'.")
|
||||
.arg(torrentID.toString()), Log::CRITICAL);
|
||||
}
|
||||
|
||||
// process add torrent messages before message queue overflow
|
||||
if ((resumedTorrentsCount % 100) == 0) readAlerts();
|
||||
|
||||
++resumedTorrentsCount;
|
||||
}
|
||||
|
||||
if (m_resumeDataStorage != startupStorage)
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
|
||||
#include <QByteArray>
|
||||
#include <QHash>
|
||||
#include <QSharedData>
|
||||
#include <QSharedDataPointer>
|
||||
#include <QString>
|
||||
|
||||
template <int N>
|
||||
|
@ -41,13 +43,15 @@ public:
|
|||
using UnderlyingType = lt::digest32<N>;
|
||||
|
||||
Digest32() = default;
|
||||
Digest32(const Digest32 &other) = default;
|
||||
Digest32(Digest32 &&other) = default;
|
||||
|
||||
Digest32(const UnderlyingType &nativeDigest)
|
||||
: m_valid {true}
|
||||
, m_nativeDigest {nativeDigest}
|
||||
{
|
||||
m_dataPtr->valid = true;
|
||||
m_dataPtr->nativeDigest = nativeDigest;
|
||||
const QByteArray raw = QByteArray::fromRawData(nativeDigest.data(), length());
|
||||
m_hashString = QString::fromLatin1(raw.toHex());
|
||||
m_dataPtr->hashString = QString::fromLatin1(raw.toHex());
|
||||
}
|
||||
|
||||
static constexpr int length()
|
||||
|
@ -57,12 +61,15 @@ public:
|
|||
|
||||
bool isValid() const
|
||||
{
|
||||
return m_valid;
|
||||
return m_dataPtr->valid;
|
||||
}
|
||||
|
||||
Digest32 &operator=(const Digest32 &other) = default;
|
||||
Digest32 &operator=(Digest32 &&other) = default;
|
||||
|
||||
operator UnderlyingType() const
|
||||
{
|
||||
return m_nativeDigest;
|
||||
return m_dataPtr->nativeDigest;
|
||||
}
|
||||
|
||||
static Digest32 fromString(const QString &digestString)
|
||||
|
@ -75,22 +82,27 @@ public:
|
|||
return {};
|
||||
|
||||
Digest32 result;
|
||||
result.m_valid = true;
|
||||
result.m_hashString = digestString;
|
||||
result.m_nativeDigest.assign(raw.constData());
|
||||
result.m_dataPtr->valid = true;
|
||||
result.m_dataPtr->hashString = digestString;
|
||||
result.m_dataPtr->nativeDigest.assign(raw.constData());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
QString toString() const
|
||||
{
|
||||
return m_hashString;
|
||||
return m_dataPtr->hashString;
|
||||
}
|
||||
|
||||
private:
|
||||
bool m_valid = false;
|
||||
UnderlyingType m_nativeDigest;
|
||||
QString m_hashString;
|
||||
struct Data : public QSharedData
|
||||
{
|
||||
bool valid = false;
|
||||
UnderlyingType nativeDigest;
|
||||
QString hashString;
|
||||
};
|
||||
|
||||
QSharedDataPointer<Data> m_dataPtr {new Data};
|
||||
};
|
||||
|
||||
template <int N>
|
||||
|
|
Loading…
Reference in a new issue