squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-23 08:48:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

- BUGFIX: Added proxy support in search engine, RSS, downloads from urls

Browse Source 
- Must add SOCKS5 proxy support in search engine plugins (python -> urllib2?)
This commit is contained in:
Christophe Dumez
2007-11-21 22:33:32 +00:00
parent 19996736d6
commit 78fc5d4865
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@@ -52,10 +52,10 @@
-> in download list -> in download list
-> in seeding list -> in seeding list
rc8->final? changelog: rc8->rc9 changelog:
- FEATURE: Better media file preview (player detected automatically) - FEATURE: Better media file preview (player detected automatically)
- BUGFIX: Remember properties window size and position - BUGFIX: Remember properties window size and position
- BUGFIX: Improved proxy support in search engine (HTTP only) - BUGFIX: Added proxy support in search engine, RSS, downloads from urls
- BUGFIX: Do no pause torrents before saving fastresume data anymore (no longer needed) - BUGFIX: Do no pause torrents before saving fastresume data anymore (no longer needed)
- BUGFIX: Save fast resume data regularly (every 10 seconds) to avoid downloading from scratch if qBittorrent crashes - BUGFIX: Save fast resume data regularly (every 10 seconds) to avoid downloading from scratch if qBittorrent crashes
- BUGFIX: Do not save fastresume data for checking torrents anymore - BUGFIX: Do not save fastresume data for checking torrents anymore

13
src/downloadThread.cpp
View File

@@ -22,6 +22,7 @@
#include "downloadThread.h" #include "downloadThread.h"
#include <iostream> #include <iostream>
#include <cc++/common.h> #include <cc++/common.h>
#include <QSettings>
QString subDownloadThread::errorCodeToString(int status) { QString subDownloadThread::errorCodeToString(int status) {
switch(status){ switch(status){
@@ -52,6 +53,18 @@ QString subDownloadThread::errorCodeToString(int status) {
subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url), abort(false){ subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(parent), url(url), abort(false){
url_stream = new ost::URLStream(); url_stream = new ost::URLStream();
// Proxy support
QSettings settings("qBittorrent", "qBittorrent");
int intValue = settings.value(QString::fromUtf8("[Preferences/Connection/ProxyType"), 0).toInt();
if(intValue > 0) {
// Proxy enabled
url_stream->setProxy(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString().toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt());
if(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Authentication"), false).toBool()) {
// Authentication required
url_stream->setProxyUser(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Username"), QString()).toString().toUtf8().data());
url_stream->setProxyPassword(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Password"), QString()).toString().toUtf8().data());
}
}
} }
subDownloadThread::~subDownloadThread(){ subDownloadThread::~subDownloadThread(){

8
src/downloadThread.h
View File

@@ -34,6 +34,13 @@ namespace ost {
class URLStream; class URLStream;
} }
typedef struct {
QString IP;
int port;
QString username;
QString password;
} tmp_proxy;
class subDownloadThread : public QThread { class subDownloadThread : public QThread {
Q_OBJECT Q_OBJECT
private: private:
@@ -76,6 +83,7 @@ class downloadThread : public QThread {
~downloadThread(); ~downloadThread();
void downloadUrl(QString url); void downloadUrl(QString url);
void setProxy(QString IP, int port, QString username, QString password);
protected: protected:
void run(); void run();