github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-16 02:03:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add multiple peers in Peers addition dialog. Closes #1563, #2245, #3133, #1419, #3287, #1419

Browse source
This commit is contained in:
ngosang 2015-06-06 07:07:08 +02:00
parent 5281593bb6
commit cef3c9a34d
7 changed files with 212 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

109
src/gui/properties/peer.ui
View file

@ -1,109 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>addPeerDialog</class>
<widget class="QDialog" name="addPeerDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>112</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Peer addition</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>IP</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineIP"/>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Port</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinPort">
<property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>6881</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

81
src/gui/properties/peeraddition.cpp
View file

@ -1,81 +0,0 @@
/*
* Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2006 Christophe Dumez
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give permission to
* link this program with the OpenSSL project's "OpenSSL" library (or with
* modified versions of it that use the same license as the "OpenSSL" library),
* and distribute the linked executables. You must obey the GNU General Public
* License in all respects for all of the code used other than "OpenSSL". If you
* modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/
#include <QRegExp>
#include <QMessageBox>
#include "core/bittorrent/peerinfo.h"
#include "peeraddition.h"
PeerAdditionDlg::PeerAdditionDlg(QWidget *parent)
: QDialog(parent)
{
setupUi(this);
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(buttonBox, SIGNAL(accepted()), this, SLOT(validateInput()));
}
QHostAddress PeerAdditionDlg::getAddress() const
{
return QHostAddress(lineIP->text());
}
ushort PeerAdditionDlg::getPort() const
{
return spinPort->value();
}
BitTorrent::PeerAddress PeerAdditionDlg::askForPeerAddress()
{
BitTorrent::PeerAddress addr;
PeerAdditionDlg dlg;
if (dlg.exec() == QDialog::Accepted) {
addr.ip = dlg.getAddress();
if (addr.ip.isNull())
qDebug("Unable to parse the provided IP.");
else
qDebug("Provided IP is correct");
addr.port = dlg.getPort();
}
return addr;
}
void PeerAdditionDlg::validateInput()
{
if (getAddress().isNull())
QMessageBox::warning(this, tr("Invalid IP"), tr("The IP you provided is invalid."), QMessageBox::Ok);
else
accept();
}

31
src/gui/properties/peerlistwidget.cpp
View file

@ -43,7 +43,7 @@
#include "core/logger.h" #include "core/logger.h"
#include "propertieswidget.h" #include "propertieswidget.h"
#include "geoipmanager.h" #include "geoipmanager.h"
#include "peeraddition.h" #include "peersadditiondlg.h"
#include "speedlimitdlg.h" #include "speedlimitdlg.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
#include "peerlistdelegate.h" #include "peerlistdelegate.h"
@ -159,7 +159,10 @@ void PeerListWidget::showPeerListMenu(const QPoint&)
QString myip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString(); QString myip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString();
QString myport = m_listModel->data(m_listModel->index(row, PeerListDelegate::PORT)).toString(); QString myport = m_listModel->data(m_listModel->index(row, PeerListDelegate::PORT)).toString();
selectedPeerIPs << myip; selectedPeerIPs << myip;
selectedPeerIPPort << myip + ":" + myport; if (myip.indexOf(".") == -1) // IPv6
selectedPeerIPPort << "[" + myip + "]:" + myport;
else // IPv4
selectedPeerIPPort << myip + ":" + myport;
} }
// Add Peer Action // Add Peer Action
QAction *addPeerAct = 0; QAction *addPeerAct = 0;
@ -179,16 +182,22 @@ void PeerListWidget::showPeerListMenu(const QPoint&)
QAction *act = menu.exec(QCursor::pos()); QAction *act = menu.exec(QCursor::pos());
if (act == 0) return; if (act == 0) return;
if (act == addPeerAct) { if (act == addPeerAct) {
BitTorrent::PeerAddress addr = PeerAdditionDlg::askForPeerAddress(); QList<BitTorrent::PeerAddress> peersList = PeersAdditionDlg::askForPeers();
if (!addr.ip.isNull()) { int peerCount = 0;
if (torrent->connectPeer(addr)) foreach (const BitTorrent::PeerAddress &addr, peersList) {
QMessageBox::information(0, tr("Peer addition"), tr("The peer was added to this torrent.")); if (torrent->connectPeer(addr)) {
else qDebug("Adding peer %s...", qPrintable(addr.ip.toString()));
QMessageBox::critical(0, tr("Peer addition"), tr("The peer could not be added to this torrent.")); Logger::instance()->addMessage(tr("Manually adding peer %1...").arg(addr.ip.toString()));
} peerCount++;
else { }
qDebug("No peer was added"); else {
Logger::instance()->addMessage(tr("The peer %1 could not be added to this torrent.").arg(addr.ip.toString()), Log::WARNING);
}
} }
if (peerCount < peersList.length())
QMessageBox::information(0, tr("Peer addition"), tr("Some peers could not be added. Check the Log for details."));
else if (peerCount > 0)
QMessageBox::information(0, tr("Peer addition"), tr("The peers were added to this torrent."));
return; return;
} }
if (act == banAct) { if (act == banAct) {

103
src/gui/properties/peersadditiondlg.cpp Normal file
View file

@ -0,0 +1,103 @@
/*
* Bittorrent Client using Qt4 and libtorrent.
* Copyright (C) 2006 Christophe Dumez
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give permission to
* link this program with the OpenSSL project's "OpenSSL" library (or with
* modified versions of it that use the same license as the "OpenSSL" library),
* and distribute the linked executables. You must obey the GNU General Public
* License in all respects for all of the code used other than "OpenSSL". If you
* modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/
#include <QMessageBox>
#include <QHostAddress>
#include "peersadditiondlg.h"
PeersAdditionDlg::PeersAdditionDlg(QWidget *parent)
: QDialog(parent)
{
setupUi(this);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(validateInput()));
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
label_format->hide();
peers_txt->setPlaceholderText("Format: IPv4:port / [IPv6]:port");
#endif
}
QList<BitTorrent::PeerAddress> PeersAdditionDlg::askForPeers()
{
PeersAdditionDlg dlg;
dlg.exec();
return dlg.m_peersList;
}
void PeersAdditionDlg::validateInput()
{
if (peers_txt->toPlainText().trimmed().isEmpty()) {
QMessageBox::warning(this, tr("No peer entered"),
tr("Please type at least one peer."),
QMessageBox::Ok);
return;
}
foreach (const QString &peer, peers_txt->toPlainText().trimmed().split("\n")) {
BitTorrent::PeerAddress addr = parsePeer(peer);
if (!addr.ip.isNull()) {
m_peersList.append(addr);
}
else {
QMessageBox::warning(this, tr("Invalid peer"),
tr("The peer %1 is invalid.").arg(peer),
QMessageBox::Ok);
m_peersList.clear();
return;
}
}
accept();
}
BitTorrent::PeerAddress PeersAdditionDlg::parsePeer(QString peer)
{
BitTorrent::PeerAddress addr;
QStringList ipPort;
if (peer[0] == '[' && peer.indexOf("]:") != -1) // IPv6
ipPort = peer.remove(QChar('[')).split("]:");
else if (peer.indexOf(":") != -1) // IPv4
ipPort = peer.split(":");
else
return addr;
QHostAddress ip(ipPort[0]);
if (ip.isNull())
return addr;
bool ok;
int port = ipPort[1].toInt(&ok);
if (!ok || port < 1 || port > 65535)
return addr;
addr.ip = ip;
addr.port = port;
return addr;
}

23
src/gui/properties/peeraddition.h → src/gui/properties/peersadditiondlg.h
View file

@ -32,29 +32,26 @@
#define PEERADDITION_H #define PEERADDITION_H
#include <QDialog> #include <QDialog>
#include "ui_peer.h"
class QHostAddress; #include "core/bittorrent/peerinfo.h"
#include "ui_peersadditiondlg.h"
namespace BitTorrent class PeersAdditionDlg: public QDialog, private Ui::addPeersDialog
{
struct PeerAddress;
}
class PeerAdditionDlg : public QDialog, private Ui::addPeerDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
PeerAdditionDlg(QWidget *parent = 0); PeersAdditionDlg(QWidget *parent = 0);
QHostAddress getAddress() const; static QList<BitTorrent::PeerAddress> askForPeers();
ushort getPort() const;
static BitTorrent::PeerAddress askForPeerAddress();
protected slots: protected slots:
void validateInput(); void validateInput();
private:
BitTorrent::PeerAddress parsePeer(QString peer);
QList<BitTorrent::PeerAddress> m_peersList;
}; };
#endif // PEERADDITION_H #endif // PEERADDITION_H

75
src/gui/properties/peersadditiondlg.ui Normal file
View file

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>addPeersDialog</class>
<widget class="QDialog" name="addPeersDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>367</width>
<height>274</height>
</rect>
</property>
<property name="windowTitle">
<string>Add Peers</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>List of peers to add (one per line):</string>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="peers_txt">
<property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum>
</property>
<property name="acceptRichText">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_format">
<property name="text">
<string>Format: IPv4:port / [IPv6]:port</string>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>addPeersDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>183</x>
<y>251</y>
</hint>
<hint type="destinationlabel">
<x>183</x>
<y>136</y>
</hint>
</hints>
</connection>
</connections>
</ui>

8
src/gui/properties/properties.pri
View file

@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD
FORMS += $$PWD/propertieswidget.ui \ FORMS += $$PWD/propertieswidget.ui \
$$PWD/trackersadditiondlg.ui \ $$PWD/trackersadditiondlg.ui \
$$PWD/peer.ui $$PWD/peersadditiondlg.ui
HEADERS += $$PWD/propertieswidget.h \ HEADERS += $$PWD/propertieswidget.h \
$$PWD/peerlistwidget.h \ $$PWD/peerlistwidget.h \
@ -11,7 +11,7 @@ HEADERS += $$PWD/propertieswidget.h \
$$PWD/downloadedpiecesbar.h \ $$PWD/downloadedpiecesbar.h \
$$PWD/peerlistdelegate.h \ $$PWD/peerlistdelegate.h \
$$PWD/peerlistsortmodel.h \ $$PWD/peerlistsortmodel.h \
$$PWD/peeraddition.h \ $$PWD/peersadditiondlg.h \
$$PWD/trackersadditiondlg.h \ $$PWD/trackersadditiondlg.h \
$$PWD/pieceavailabilitybar.h \ $$PWD/pieceavailabilitybar.h \
$$PWD/proptabbar.h \ $$PWD/proptabbar.h \
@ -22,10 +22,10 @@ SOURCES += $$PWD/propertieswidget.cpp \
$$PWD/proplistdelegate.cpp \ $$PWD/proplistdelegate.cpp \
$$PWD/peerlistwidget.cpp \ $$PWD/peerlistwidget.cpp \
$$PWD/trackerlist.cpp \ $$PWD/trackerlist.cpp \
$$PWD/proptabbar.cpp \ $$PWD/peersadditiondlg.cpp \
$$PWD/downloadedpiecesbar.cpp \ $$PWD/downloadedpiecesbar.cpp \
$$PWD/peeraddition.cpp \
$$PWD/trackersadditiondlg.cpp \ $$PWD/trackersadditiondlg.cpp \
$$PWD/pieceavailabilitybar.cpp \ $$PWD/pieceavailabilitybar.cpp \
$$PWD/proptabbar.cpp \
$$PWD/speedwidget.cpp \ $$PWD/speedwidget.cpp \
$$PWD/speedplotview.cpp $$PWD/speedplotview.cpp