mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 18:56:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Properly add torrent with new tags

Browse source 
First, an attempt is made to add new tags to the Session.
Closes #15105.
This commit is contained in:
Vladimir Golovnev (Glassez) 2021-06-16 19:03:36 +03:00 committed by Vladimir Golovnev
parent 144956a209
commit e25948e737
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/base/bittorrent/session.cpp
View file

@ -857,17 +857,13 @@ bool Session::hasTag(const QString &tag) const
bool Session::addTag(const QString &tag) bool Session::addTag(const QString &tag)
{ {
if (!isValidTag(tag)) if (!isValidTag(tag) || hasTag(tag))
return false; return false;
if (!hasTag(tag)) m_tags.insert(tag);
{ m_storedTags = m_tags.values();
m_tags.insert(tag); emit tagAdded(tag);
m_storedTags = m_tags.values(); return true;
emit tagAdded(tag);
return true;
}
return false;
} }
bool Session::removeTag(const QString &tag) bool Session::removeTag(const QString &tag)
@ -2083,7 +2079,6 @@ LoadTorrentParams Session::initLoadTorrentParams(const AddTorrentParams &addTorr
LoadTorrentParams loadTorrentParams; LoadTorrentParams loadTorrentParams;
loadTorrentParams.name = addTorrentParams.name; loadTorrentParams.name = addTorrentParams.name;
loadTorrentParams.tags = addTorrentParams.tags;
loadTorrentParams.firstLastPiecePriority = addTorrentParams.firstLastPiecePriority; loadTorrentParams.firstLastPiecePriority = addTorrentParams.firstLastPiecePriority;
loadTorrentParams.hasSeedStatus = addTorrentParams.skipChecking; // do not react on 'torrent_finished_alert' when skipping loadTorrentParams.hasSeedStatus = addTorrentParams.skipChecking; // do not react on 'torrent_finished_alert' when skipping
loadTorrentParams.contentLayout = addTorrentParams.contentLayout.value_or(torrentContentLayout()); loadTorrentParams.contentLayout = addTorrentParams.contentLayout.value_or(torrentContentLayout());
@ -2108,6 +2103,12 @@ LoadTorrentParams Session::initLoadTorrentParams(const AddTorrentParams &addTorr
else else
loadTorrentParams.category = addTorrentParams.category; loadTorrentParams.category = addTorrentParams.category;
for (const QString &tag : addTorrentParams.tags)
{
if (hasTag(tag) || addTag(tag))
loadTorrentParams.tags.insert(tag);
}
return loadTorrentParams; return loadTorrentParams;
} }