github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 13:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: As advised, move logic away from the settings window into session.

Browse source
This commit is contained in:
Stiliyan Tonev (Bark) 2025-05-12 12:59:48 +03:00
commit 5567d029cf
3 changed files with 6 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/base/bittorrent/sessionimpl.cpp
View file

@ -4105,6 +4105,11 @@ void SessionImpl::updateTrackersFromURL()
{ {
if (result.status == Net::DownloadStatus::Success) if (result.status == Net::DownloadStatus::Success)
{ {
if (!result.contentType.contains(u"text/plain"_s, Qt::CaseInsensitive))
{
LogMsg(tr("Cannot add trackers from URL, expected Content-Type is \'text/plain\' received \"%1\"").arg(result.contentType), Log::WARNING);
return;
}
setAdditionalTrackersFromURL(QString::fromUtf8(result.data)); setAdditionalTrackersFromURL(QString::fromUtf8(result.data));
LogMsg(tr("Tracker list updated"), Log::INFO); LogMsg(tr("Tracker list updated"), Log::INFO);
return; return;

34
src/gui/optionsdialog.cpp
View file

@ -53,6 +53,7 @@
#include "base/bittorrent/sharelimitaction.h" #include "base/bittorrent/sharelimitaction.h"
#include "base/exceptions.h" #include "base/exceptions.h"
#include "base/global.h" #include "base/global.h"
#include "base/net/downloadmanager.h"
#include "base/net/portforwarder.h" #include "base/net/portforwarder.h"
#include "base/net/proxyconfigurationmanager.h" #include "base/net/proxyconfigurationmanager.h"
#include "base/path.h" #include "base/path.h"
@ -1227,42 +1228,9 @@ void OptionsDialog::saveBittorrentTabOptions() const
BitTorrent::ShareLimitAction::EnableSuperSeeding BitTorrent::ShareLimitAction::EnableSuperSeeding
}; };
session->setShareLimitAction(actIndex.value(m_ui->comboRatioLimitAct->currentIndex())); session->setShareLimitAction(actIndex.value(m_ui->comboRatioLimitAct->currentIndex()));
session->setAddTrackersEnabled(m_ui->checkEnableAddTrackers->isChecked()); session->setAddTrackersEnabled(m_ui->checkEnableAddTrackers->isChecked());
session->setAdditionalTrackers(m_ui->textTrackers->toPlainText()); session->setAdditionalTrackers(m_ui->textTrackers->toPlainText());
const bool isAddTrackersEnabled = m_ui->checkAddTrackersFromURL->isChecked();
const QString url = m_ui->textTrackersURL->text();
if (isAddTrackersEnabled && !url.isEmpty())
{
Net::DownloadManager::instance()->download(url, Preferences::instance()->useProxyForGeneralPurposes()
, this, &OptionsDialog::onAdditionalTrackersDownload);
}
else
{
session->setAddTrackersFromURLEnabled(isAddTrackersEnabled);
session->setAdditionalTrackersURL(url);
}
}
void OptionsDialog::onAdditionalTrackersDownload(const Net::DownloadResult &result)
{
if (result.status != Net::DownloadStatus::Success)
{
QMessageBox::warning(this, tr("Download trackers list error")
, tr("Error occurred when downloading the trackers list. Reason: \"%1\"").arg(result.errorString));
return;
}
if (!result.contentType.contains(u"text/plain"_s, Qt::CaseInsensitive))
{
QMessageBox::warning(this, tr("Download trackers list error")
, tr("The content type of the downloaded file is not plain text. Content-Type: \"%1\"").arg(result.contentType));
return;
}
auto *session = BitTorrent::Session::instance();
session->setAddTrackersFromURLEnabled(m_ui->checkAddTrackersFromURL->isChecked()); session->setAddTrackersFromURLEnabled(m_ui->checkAddTrackersFromURL->isChecked());
session->setAdditionalTrackersURL(m_ui->textTrackersURL->text()); session->setAdditionalTrackersURL(m_ui->textTrackersURL->text());
} }

3
src/gui/optionsdialog.h
View file

@ -31,7 +31,6 @@
#include <QDialog> #include <QDialog>
#include "base/net/downloadmanager.h"
#include "base/pathfwd.h" #include "base/pathfwd.h"
#include "base/settingvalue.h" #include "base/settingvalue.h"
#include "guiapplicationcomponent.h" #include "guiapplicationcomponent.h"
@ -138,8 +137,6 @@ private:
void loadRSSTabOptions(); void loadRSSTabOptions();
void saveRSSTabOptions() const; void saveRSSTabOptions() const;
void onAdditionalTrackersDownload(const Net::DownloadResult &result);
void loadSearchTabOptions(); void loadSearchTabOptions();
void saveSearchTabOptions() const; void saveSearchTabOptions() const;