Browse Source

Cleanup code

Also remove redundant code, it is already handled correctly in subsequent function calls.
adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
6759446639
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 11
      src/base/bittorrent/session.cpp
  2. 2
      src/base/bittorrent/session.h
  3. 30
      src/gui/addnewtorrentdialog.cpp
  4. 4
      src/gui/addnewtorrentdialog.h
  5. 7
      src/gui/mainwindow.cpp

11
src/base/bittorrent/session.cpp

@ -2090,12 +2090,9 @@ TorrentStatusReport Session::torrentStatusReport() const @@ -2090,12 +2090,9 @@ TorrentStatusReport Session::torrentStatusReport() const
return m_torrentStatusReport;
}
// source - .torrent file path/url or magnet uri
bool Session::addTorrent(QString source, const AddTorrentParams &params)
bool Session::addTorrent(const QString &source, const AddTorrentParams &params)
{
MagnetUri magnetUri(source);
if (magnetUri.isValid())
return addTorrent_impl(CreateTorrentParams(params), magnetUri);
// `source`: .torrent file path/url or magnet uri
if (Utils::Misc::isUrl(source)) {
LogMsg(tr("Downloading '%1', please wait...", "e.g: Downloading 'xxx.torrent', please wait...").arg(source));
@ -2110,6 +2107,10 @@ bool Session::addTorrent(QString source, const AddTorrentParams &params) @@ -2110,6 +2107,10 @@ bool Session::addTorrent(QString source, const AddTorrentParams &params)
return true;
}
const MagnetUri magnetUri {source};
if (magnetUri.isValid())
return addTorrent_impl(CreateTorrentParams(params), magnetUri);
TorrentFileGuard guard(source);
if (addTorrent_impl(CreateTorrentParams(params)
, MagnetUri(), TorrentInfo::loadFromFile(source))) {

2
src/base/bittorrent/session.h

@ -469,7 +469,7 @@ namespace BitTorrent @@ -469,7 +469,7 @@ namespace BitTorrent
void banIP(const QString &ip);
bool isKnownTorrent(const InfoHash &hash) const;
bool addTorrent(QString source, const AddTorrentParams &params = AddTorrentParams());
bool addTorrent(const QString &source, const AddTorrentParams &params = AddTorrentParams());
bool addTorrent(const TorrentInfo &torrentInfo, const AddTorrentParams &params = AddTorrentParams());
bool deleteTorrent(const QString &hash, bool deleteLocalFiles = false);
bool loadMetadata(const MagnetUri &magnetUri);

30
src/gui/addnewtorrentdialog.cpp

@ -227,7 +227,7 @@ void AddNewTorrentDialog::saveState() @@ -227,7 +227,7 @@ void AddNewTorrentDialog::saveState()
settings()->storeValue(KEY_EXPANDED, m_ui->toolButtonAdvanced->isChecked());
}
void AddNewTorrentDialog::show(QString source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent)
void AddNewTorrentDialog::show(const QString &source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent)
{
AddNewTorrentDialog *dlg = new AddNewTorrentDialog(inParams, parent);
@ -240,27 +240,27 @@ void AddNewTorrentDialog::show(QString source, const BitTorrent::AddTorrentParam @@ -240,27 +240,27 @@ void AddNewTorrentDialog::show(QString source, const BitTorrent::AddTorrentParam
, dlg, &AddNewTorrentDialog::handleDownloadFinished);
connect(handler, &Net::DownloadHandler::downloadFailed, dlg, &AddNewTorrentDialog::handleDownloadFailed);
connect(handler, &Net::DownloadHandler::redirectedToMagnet, dlg, &AddNewTorrentDialog::handleRedirectedToMagnet);
return;
}
else {
bool ok = false;
BitTorrent::MagnetUri magnetUri(source);
if (magnetUri.isValid())
ok = dlg->loadMagnet(magnetUri);
else
ok = dlg->loadTorrent(source);
if (ok)
const BitTorrent::MagnetUri magnetUri(source);
const bool isLoaded = magnetUri.isValid()
? dlg->loadMagnet(magnetUri)
: dlg->loadTorrent(source);
if (isLoaded) {
#ifdef Q_OS_MAC
dlg->exec();
dlg->exec();
#else
dlg->open();
dlg->open();
#endif
else
delete dlg;
}
else {
delete dlg;
}
}
void AddNewTorrentDialog::show(QString source, QWidget *parent)
void AddNewTorrentDialog::show(const QString &source, QWidget *parent)
{
show(source, BitTorrent::AddTorrentParams(), parent);
}

4
src/gui/addnewtorrentdialog.h

@ -68,8 +68,8 @@ public: @@ -68,8 +68,8 @@ public:
static int savePathHistoryLength();
static void setSavePathHistoryLength(int value);
static void show(QString source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent);
static void show(QString source, QWidget *parent);
static void show(const QString &source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent);
static void show(const QString &source, QWidget *parent);
private slots:
void showAdvancedSettings(bool show);

7
src/gui/mainwindow.cpp

@ -38,7 +38,6 @@ @@ -38,7 +38,6 @@
#include <QMimeData>
#include <QProcess>
#include <QPushButton>
#include <QRegularExpression>
#include <QScrollBar>
#include <QShortcut>
#include <QSplitter>
@ -1628,11 +1627,7 @@ void MainWindow::showNotificationBaloon(QString title, QString msg) const @@ -1628,11 +1627,7 @@ void MainWindow::showNotificationBaloon(QString title, QString msg) const
void MainWindow::downloadFromURLList(const QStringList &urlList)
{
const bool useTorrentAdditionDialog = AddNewTorrentDialog::isEnabled();
for (QString url : urlList) {
if (((url.size() == 40) && !url.contains(QRegularExpression("[^0-9A-Fa-f]")))
|| ((url.size() == 32) && !url.contains(QRegularExpression("[^2-7A-Za-z]"))))
url = "magnet:?xt=urn:btih:" + url;
for (const QString &url : urlList) {
if (useTorrentAdditionDialog)
AddNewTorrentDialog::show(url, this);
else

Loading…
Cancel
Save