From 8ec3db180751a1d068ff155eb3b15ec37e3001b7 Mon Sep 17 00:00:00 2001 From: Vladimir Golovnev Date: Fri, 19 Jan 2024 20:34:40 +0300 Subject: [PATCH] Change "metadata received" stop condition behavior PR #20283. Closes #20122. --- src/base/bittorrent/sessionimpl.cpp | 8 ++++++++ src/gui/addnewtorrentdialog.cpp | 38 +++++++++++++++++++++++++++---------- src/gui/addnewtorrentdialog.ui | 18 ------------------ src/gui/optionsdialog.cpp | 2 +- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/base/bittorrent/sessionimpl.cpp b/src/base/bittorrent/sessionimpl.cpp index 5ac91e319..ff57f6646 100644 --- a/src/base/bittorrent/sessionimpl.cpp +++ b/src/base/bittorrent/sessionimpl.cpp @@ -2749,6 +2749,14 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr if (hasMetadata) { + // Torrent that is being added with metadata is considered to be added as stopped + // if "metadata received" stop condition is set for it. + if (loadTorrentParams.stopCondition == Torrent::StopCondition::MetadataReceived) + { + loadTorrentParams.stopped = true; + loadTorrentParams.stopCondition = Torrent::StopCondition::None; + } + const TorrentInfo &torrentInfo = *source.info(); Q_ASSERT(addTorrentParams.filePaths.isEmpty() || (addTorrentParams.filePaths.size() == torrentInfo.filesCount())); diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp index 5a02d3df7..a6f82288d 100644 --- a/src/gui/addnewtorrentdialog.cpp +++ b/src/gui/addnewtorrentdialog.cpp @@ -304,18 +304,28 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::TorrentDescriptor &to m_ui->downloadPath->setMaxVisibleItems(20); m_ui->addToQueueTopCheckBox->setChecked(m_torrentParams.addToQueueTop.value_or(session->isAddTorrentToQueueTop())); - m_ui->startTorrentCheckBox->setChecked(!m_torrentParams.addPaused.value_or(session->isAddTorrentPaused())); + m_ui->stopConditionComboBox->setToolTip( u"

" + tr("None") + u" - " + tr("No stop condition is set.") + u"

" + tr("Metadata received") + u" - " + tr("Torrent will stop after metadata is received.") + - u" " + tr("Torrents that have metadata initially aren't affected.") + u"

" + + u" " + tr("Torrents that have metadata initially will be added as stopped.") + u"

" + tr("Files checked") + u" - " + tr("Torrent will stop after files are initially checked.") + u" " + tr("This will also download metadata if it wasn't there initially.") + u"

"); - m_ui->stopConditionComboBox->setItemData(0, QVariant::fromValue(BitTorrent::Torrent::StopCondition::None)); - m_ui->stopConditionComboBox->setItemData(1, QVariant::fromValue(BitTorrent::Torrent::StopCondition::MetadataReceived)); - m_ui->stopConditionComboBox->setItemData(2, QVariant::fromValue(BitTorrent::Torrent::StopCondition::FilesChecked)); - m_ui->stopConditionComboBox->setCurrentIndex(m_ui->stopConditionComboBox->findData( - QVariant::fromValue(m_torrentParams.stopCondition.value_or(session->torrentStopCondition())))); + m_ui->stopConditionComboBox->addItem(tr("None"), QVariant::fromValue(BitTorrent::Torrent::StopCondition::None)); + if (!hasMetadata()) + m_ui->stopConditionComboBox->addItem(tr("Metadata received"), QVariant::fromValue(BitTorrent::Torrent::StopCondition::MetadataReceived)); + m_ui->stopConditionComboBox->addItem(tr("Files checked"), QVariant::fromValue(BitTorrent::Torrent::StopCondition::FilesChecked)); + const auto stopCondition = m_torrentParams.stopCondition.value_or(session->torrentStopCondition()); + if (hasMetadata() && (stopCondition == BitTorrent::Torrent::StopCondition::MetadataReceived)) + { + m_ui->startTorrentCheckBox->setChecked(false); + m_ui->stopConditionComboBox->setCurrentIndex(m_ui->stopConditionComboBox->findData(QVariant::fromValue(BitTorrent::Torrent::StopCondition::None))); + } + else + { + m_ui->startTorrentCheckBox->setChecked(!m_torrentParams.addPaused.value_or(session->isAddTorrentPaused())); + m_ui->stopConditionComboBox->setCurrentIndex(m_ui->stopConditionComboBox->findData(QVariant::fromValue(stopCondition))); + } m_ui->stopConditionLabel->setEnabled(m_ui->startTorrentCheckBox->isChecked()); m_ui->stopConditionComboBox->setEnabled(m_ui->startTorrentCheckBox->isChecked()); connect(m_ui->startTorrentCheckBox, &QCheckBox::toggled, this, [this](const bool checked) @@ -744,14 +754,22 @@ void AddNewTorrentDialog::updateMetadata(const BitTorrent::TorrentInfo &metadata m_torrentDescr.setTorrentInfo(metadata); setMetadataProgressIndicator(true, tr("Parsing metadata...")); - const auto stopCondition = m_ui->stopConditionComboBox->currentData().value(); - if (stopCondition == BitTorrent::Torrent::StopCondition::MetadataReceived) - m_ui->startTorrentCheckBox->setChecked(false); // Update UI setupTreeview(); setMetadataProgressIndicator(false, tr("Metadata retrieval complete")); + if (const auto stopCondition = m_ui->stopConditionComboBox->currentData().value() + ; stopCondition == BitTorrent::Torrent::StopCondition::MetadataReceived) + { + m_ui->startTorrentCheckBox->setChecked(false); + + const auto index = m_ui->stopConditionComboBox->currentIndex(); + m_ui->stopConditionComboBox->setCurrentIndex(m_ui->stopConditionComboBox->findData( + QVariant::fromValue(BitTorrent::Torrent::StopCondition::None))); + m_ui->stopConditionComboBox->removeItem(index); + } + m_ui->buttonSave->setVisible(true); if (m_torrentDescr.infoHash().v2().isValid()) { diff --git a/src/gui/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui index 0c9a96e1f..9d2fc3e5f 100644 --- a/src/gui/addnewtorrentdialog.ui +++ b/src/gui/addnewtorrentdialog.ui @@ -261,24 +261,6 @@ - - 0 - - - - None - - - - - Metadata received - - - - - Files checked - - diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 53331c224..d0643688d 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -523,7 +523,7 @@ void OptionsDialog::loadDownloadsTabOptions() m_ui->stopConditionComboBox->setToolTip( u"
" + tr("None") + u" - " + tr("No stop condition is set.") + u"
" + tr("Metadata received") + u" - " + tr("Torrent will stop after metadata is received.") + - u" " + tr("Torrents that have metadata initially aren't affected.") + u"
" + + u" " + tr("Torrents that have metadata initially will be added as stopped.") + u"
" + tr("Files checked") + u" - " + tr("Torrent will stop after files are initially checked.") + u" " + tr("This will also download metadata if it wasn't there initially.") + u"
"); m_ui->stopConditionComboBox->setItemData(0, QVariant::fromValue(BitTorrent::Torrent::StopCondition::None)); -- 2.11.4.GIT