Simplify conversion to string

PR #22036.
This commit is contained in:
Chocobo1 2024-12-23 22:59:01 +08:00 committed by GitHub
commit 879c6bf9ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2845,38 +2845,26 @@ QString TorrentImpl::createMagnetURI() const
const SHA1Hash infoHash1 = infoHash().v1(); const SHA1Hash infoHash1 = infoHash().v1();
if (infoHash1.isValid()) if (infoHash1.isValid())
{
ret += u"xt=urn:btih:" + infoHash1.toString(); ret += u"xt=urn:btih:" + infoHash1.toString();
}
const SHA256Hash infoHash2 = infoHash().v2(); if (const SHA256Hash infoHash2 = infoHash().v2(); infoHash2.isValid())
if (infoHash2.isValid())
{ {
if (infoHash1.isValid()) if (infoHash1.isValid())
ret += u'&'; ret += u'&';
ret += u"xt=urn:btmh:1220" + infoHash2.toString(); ret += u"xt=urn:btmh:1220" + infoHash2.toString();
} }
const QString displayName = name(); if (const QString displayName = name(); displayName != id().toString())
if (displayName != id().toString())
{
ret += u"&dn=" + QString::fromLatin1(QUrl::toPercentEncoding(displayName)); ret += u"&dn=" + QString::fromLatin1(QUrl::toPercentEncoding(displayName));
}
if (hasMetadata()) if (hasMetadata())
{
ret += u"&xl=" + QString::number(totalSize()); ret += u"&xl=" + QString::number(totalSize());
}
for (const TrackerEntryStatus &tracker : asConst(trackers())) for (const TrackerEntryStatus &tracker : asConst(trackers()))
{
ret += u"&tr=" + QString::fromLatin1(QUrl::toPercentEncoding(tracker.url)); ret += u"&tr=" + QString::fromLatin1(QUrl::toPercentEncoding(tracker.url));
}
for (const QUrl &urlSeed : asConst(urlSeeds())) for (const QUrl &urlSeed : asConst(urlSeeds()))
{ ret += u"&ws=" + urlSeed.toString(QUrl::FullyEncoded);
ret += u"&ws=" + QString::fromLatin1(urlSeed.toEncoded());
}
return ret; return ret;
} }