mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-10-22 10:46:04 +03:00
Properly add torrent with new tags
First, an attempt is made to add new tags to the Session. Closes #15105.
This commit is contained in:
parent
144956a209
commit
e25948e737
1 changed files with 11 additions and 10 deletions
|
@ -857,18 +857,14 @@ bool Session::hasTag(const QString &tag) const
|
|||
|
||||
bool Session::addTag(const QString &tag)
|
||||
{
|
||||
if (!isValidTag(tag))
|
||||
if (!isValidTag(tag) || hasTag(tag))
|
||||
return false;
|
||||
|
||||
if (!hasTag(tag))
|
||||
{
|
||||
m_tags.insert(tag);
|
||||
m_storedTags = m_tags.values();
|
||||
emit tagAdded(tag);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Session::removeTag(const QString &tag)
|
||||
{
|
||||
|
@ -2083,7 +2079,6 @@ LoadTorrentParams Session::initLoadTorrentParams(const AddTorrentParams &addTorr
|
|||
LoadTorrentParams loadTorrentParams;
|
||||
|
||||
loadTorrentParams.name = addTorrentParams.name;
|
||||
loadTorrentParams.tags = addTorrentParams.tags;
|
||||
loadTorrentParams.firstLastPiecePriority = addTorrentParams.firstLastPiecePriority;
|
||||
loadTorrentParams.hasSeedStatus = addTorrentParams.skipChecking; // do not react on 'torrent_finished_alert' when skipping
|
||||
loadTorrentParams.contentLayout = addTorrentParams.contentLayout.value_or(torrentContentLayout());
|
||||
|
@ -2108,6 +2103,12 @@ LoadTorrentParams Session::initLoadTorrentParams(const AddTorrentParams &addTorr
|
|||
else
|
||||
loadTorrentParams.category = addTorrentParams.category;
|
||||
|
||||
for (const QString &tag : addTorrentParams.tags)
|
||||
{
|
||||
if (hasTag(tag) || addTag(tag))
|
||||
loadTorrentParams.tags.insert(tag);
|
||||
}
|
||||
|
||||
return loadTorrentParams;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue