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

Don't use extra variable to distinguish restored torrents

Browse Source 
PR #17984.
This commit is contained in:
Vladimir Golovnev 2022-11-06 14:24:49 +03:00 committed by GitHub
parent 6a560016dd
commit c80238d66f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/base/bittorrent/bencoderesumedatastorage.cpp
View File

@ -210,7 +210,6 @@ BitTorrent::LoadResumeDataResult BitTorrent::BencodeResumeDataStorage::loadTorre
return nonstd::make_unexpected(tr("Cannot parse resume data: invalid format")); return nonstd::make_unexpected(tr("Cannot parse resume data: invalid format"));
LoadTorrentParams torrentParams; LoadTorrentParams torrentParams;
torrentParams.restored = true;
torrentParams.category = fromLTString(resumeDataRoot.dict_find_string_value("qBt-category")); torrentParams.category = fromLTString(resumeDataRoot.dict_find_string_value("qBt-category"));
torrentParams.name = fromLTString(resumeDataRoot.dict_find_string_value("qBt-name")); torrentParams.name = fromLTString(resumeDataRoot.dict_find_string_value("qBt-name"));
torrentParams.hasSeedStatus = resumeDataRoot.dict_find_int_value("qBt-seedStatus"); torrentParams.hasSeedStatus = resumeDataRoot.dict_find_int_value("qBt-seedStatus");

1
src/base/bittorrent/dbresumedatastorage.cpp
View File

@ -196,7 +196,6 @@ namespace BitTorrent
LoadTorrentParams parseQueryResultRow(const QSqlQuery &query) LoadTorrentParams parseQueryResultRow(const QSqlQuery &query)
{ {
LoadTorrentParams resumeData; LoadTorrentParams resumeData;
resumeData.restored = true;
resumeData.name = query.value(DB_COLUMN_NAME.name).toString(); resumeData.name = query.value(DB_COLUMN_NAME.name).toString();
resumeData.category = query.value(DB_COLUMN_CATEGORY.name).toString(); resumeData.category = query.value(DB_COLUMN_CATEGORY.name).toString();
const QString tagsData = query.value(DB_COLUMN_TAGS.name).toString(); const QString tagsData = query.value(DB_COLUMN_TAGS.name).toString();

2
src/base/bittorrent/loadtorrentparams.h
View File

@ -58,7 +58,5 @@ namespace BitTorrent
qreal ratioLimit = Torrent::USE_GLOBAL_RATIO; qreal ratioLimit = Torrent::USE_GLOBAL_RATIO;
int seedingTimeLimit = Torrent::USE_GLOBAL_SEEDING_TIME; int seedingTimeLimit = Torrent::USE_GLOBAL_SEEDING_TIME;
bool restored = false; // is existing torrent job?
}; };
} }

4
src/base/bittorrent/sessionimpl.cpp
View File

@ -5219,7 +5219,7 @@ TorrentImpl *SessionImpl::createTorrent(const lt::torrent_handle &nativeHandle,
if (const InfoHash infoHash = torrent->infoHash(); infoHash.isHybrid()) if (const InfoHash infoHash = torrent->infoHash(); infoHash.isHybrid())
m_hybridTorrentsByAltID.insert(TorrentID::fromSHA1Hash(infoHash.v1()), torrent); m_hybridTorrentsByAltID.insert(TorrentID::fromSHA1Hash(infoHash.v1()), torrent);
if (!params.restored) if (isRestored())
{ {
m_resumeDataStorage->store(torrent->id(), params); m_resumeDataStorage->store(torrent->id(), params);
@ -5237,7 +5237,7 @@ TorrentImpl *SessionImpl::createTorrent(const lt::torrent_handle &nativeHandle,
m_seedingLimitTimer->start(); m_seedingLimitTimer->start();
} }
if (params.restored) if (!isRestored())
{ {
LogMsg(tr("Restored torrent. Torrent: \"%1\"").arg(torrent->name())); LogMsg(tr("Restored torrent. Torrent: \"%1\"").arg(torrent->name()));
} }