d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

- Moved from libcommoncpp to libcurl for downloads from urls 

- Added SOCKS5 proxy support when downloading from urls
adaptive-webui-19844
Christophe Dumez 17 years ago
parent
8ecf79e91c
commit
61eb921e44
7 changed files with 157 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      INSTALL
  2. 58
      configure
  3. 2
      qbittorrent.qc
  4. 61
      qcm/libcurl.qcm
  5. 133
      src/downloadThread.cpp
  6. 16
      src/downloadThread.h
  7. 2
      src/src.pro

2
INSTALL
Unescape View File

@ -25,7 +25,7 @@ Dependencies:
- libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization - libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
- libcommoncpp2 - libcurl
- python >= 2.3 (needed by search engine) - python >= 2.3 (needed by search engine)

58
configure vendored
Unescape View File

@ -22,8 +22,8 @@ Dependency options:
--with-libtorrent-lib=[path] Path to libtorrent library files --with-libtorrent-lib=[path] Path to libtorrent library files
--with-libtorrent-static-lib=[path] Path to libtorrent .a file --with-libtorrent-static-lib=[path] Path to libtorrent .a file
--with-libboost-inc=[path] Path to libboost include files --with-libboost-inc=[path] Path to libboost include files
--with-libcommoncpp2-inc=[path] Path to libcommoncpp2 include files --with-libcurl-inc=[path] Path to libcurl include files
--with-libcommoncpp2-lib=[path] Path to libcommoncpp2 library files --with-libcurl-lib=[path] Path to libcurl library files
--disable-libmagick Disable use of libmagick --disable-libmagick Disable use of libmagick
--with-libmagick-inc=[path] Path to libmagick++ include files --with-libmagick-inc=[path] Path to libmagick++ include files
--with-libmagick-lib=[path] Path to libmagick++ library files --with-libmagick-lib=[path] Path to libmagick++ library files
@ -166,13 +166,13 @@ while [ $# -gt 0 ]; do
shift shift
;; ;;
--with-libcommoncpp2-inc=*) --with-libcurl-inc=*)
QC_WITH_LIBCOMMONCPP2_INC=$optarg QC_WITH_LIBCURL_INC=$optarg
shift shift
;; ;;
--with-libcommoncpp2-lib=*) --with-libcurl-lib=*)
QC_WITH_LIBCOMMONCPP2_LIB=$optarg QC_WITH_LIBCURL_LIB=$optarg
shift shift
;; ;;
@ -231,8 +231,8 @@ echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC
echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB
echo QC_WITH_LIBTORRENT_STATIC_LIB=$QC_WITH_LIBTORRENT_STATIC_LIB echo QC_WITH_LIBTORRENT_STATIC_LIB=$QC_WITH_LIBTORRENT_STATIC_LIB
echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
echo QC_WITH_LIBCOMMONCPP2_INC=$QC_WITH_LIBCOMMONCPP2_INC echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC
echo QC_WITH_LIBCOMMONCPP2_LIB=$QC_WITH_LIBCOMMONCPP2_LIB echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
echo QC_DISABLE_libmagick=$QC_DISABLE_libmagick echo QC_DISABLE_libmagick=$QC_DISABLE_libmagick
echo QC_WITH_LIBMAGICK_INC=$QC_WITH_LIBMAGICK_INC echo QC_WITH_LIBMAGICK_INC=$QC_WITH_LIBMAGICK_INC
echo QC_WITH_LIBMAGICK_LIB=$QC_WITH_LIBMAGICK_LIB echo QC_WITH_LIBMAGICK_LIB=$QC_WITH_LIBMAGICK_LIB
@ -485,25 +485,25 @@ public:
return true; return true;
} }
}; };
#line 1 "libcommoncpp2.qcm" #line 1 "libcurl.qcm"
/* /*
-----BEGIN QCMOD----- -----BEGIN QCMOD-----
name: libcommoncpp2 name: libcommoncpp2
arg: with-libcommoncpp2-inc=[path], Path to libcommoncpp2 include files arg: with-libcurl-inc=[path], Path to libcurl include files
arg: with-libcommoncpp2-lib=[path], Path to libcommoncpp2 library files arg: with-libcurl-lib=[path], Path to libcurl library files
-----END QCMOD----- -----END QCMOD-----
*/ */
class qc_libcommoncpp2 : public ConfObj class qc_libcurl : public ConfObj
{ {
public: public:
qc_libcommoncpp2(Conf *c) : ConfObj(c) {} qc_libcurl(Conf *c) : ConfObj(c) {}
QString name() const { return "GNU Common C++ library (libcommoncpp2)"; } QString name() const { return "libcurl"; }
QString shortname() const { return "libcommoncpp2"; } QString shortname() const { return "libcurl"; }
bool exec(){ bool exec(){
QString s; QString s;
s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC"); s = conf->getenv("QC_WITH_LIBCURL_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "cc++/url.h")) { if(!conf->checkHeader(s, "curl/curl.h")) {
return false; return false;
} }
}else{ }else{
@ -512,7 +512,7 @@ public:
sl << "/usr/local/include"; sl << "/usr/local/include";
bool found = false; bool found = false;
foreach(s, sl){ foreach(s, sl){
if(conf->checkHeader(s, "cc++/url.h")){ if(conf->checkHeader(s, "curl/curl.h")){
found = true; found = true;
break; break;
} }
@ -523,12 +523,10 @@ public:
} }
conf->addIncludePath(s); conf->addIncludePath(s);
s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB"); s = conf->getenv("QC_WITH_LIBCURL_LIB");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!QFile::exists(s+QString("/libccext2.so"))) if(!QFile::exists(s+QString("/libcurl.so")))
return false; return false;
if(!QFile::exists(s+QString("/libccgnu2.so")))
return false;
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
}else{ }else{
QStringList sl; QStringList sl;
@ -538,11 +536,9 @@ public:
sl << "/usr/local/lib64/"; sl << "/usr/local/lib64/";
bool found = false; bool found = false;
foreach(s, sl){ foreach(s, sl){
if(QFile::exists(s+QString("libccext2.so"))){ if(QFile::exists(s+QString("libcurl.so"))){
if(QFile::exists(s+QString("libccgnu2.so"))){ found = true;
found = true; break;
break;
}
} }
} }
if(!found) return false; if(!found) return false;
@ -715,7 +711,7 @@ cat >$1/modules_new.cpp <<EOT
o = new qc_libboost(conf); o = new qc_libboost(conf);
o->required = true; o->required = true;
o->disabled = false; o->disabled = false;
o = new qc_libcommoncpp2(conf); o = new qc_libcurl(conf);
o->required = true; o->required = true;
o->disabled = false; o->disabled = false;
o = new qc_libmagick(conf); o = new qc_libmagick(conf);
@ -1673,8 +1669,8 @@ export QC_WITH_LIBTORRENT_INC
export QC_WITH_LIBTORRENT_LIB export QC_WITH_LIBTORRENT_LIB
export QC_WITH_LIBTORRENT_STATIC_LIB export QC_WITH_LIBTORRENT_STATIC_LIB
export QC_WITH_LIBBOOST_INC export QC_WITH_LIBBOOST_INC
export QC_WITH_LIBCOMMONCPP2_INC export QC_WITH_LIBCURL_INC
export QC_WITH_LIBCOMMONCPP2_LIB export QC_WITH_LIBCURL_LIB
export QC_DISABLE_libmagick export QC_DISABLE_libmagick
export QC_WITH_LIBMAGICK_INC export QC_WITH_LIBMAGICK_INC
export QC_WITH_LIBMAGICK_LIB export QC_WITH_LIBMAGICK_LIB

2
qbittorrent.qc
Unescape View File

@ -12,7 +12,7 @@
<dep type='libboost'> <dep type='libboost'>
<required/> <required/>
</dep> </dep>
<dep type='libcommoncpp2'> <dep type='libcurl'>
<required/> <required/>
</dep> </dep>
<dep type='libmagick'/> <dep type='libmagick'/>

61
qcm/libcurl.qcm
Unescape View File

@ -0,0 +1,61 @@
/*
-----BEGIN QCMOD-----
name: libcommoncpp2
arg: with-libcurl-inc=[path], Path to libcurl include files
arg: with-libcurl-lib=[path], Path to libcurl library files
-----END QCMOD-----
*/
class qc_libcurl : public ConfObj
{
public:
qc_libcurl(Conf *c) : ConfObj(c) {}
QString name() const { return "libcurl"; }
QString shortname() const { return "libcurl"; }
bool exec(){
QString s;
s = conf->getenv("QC_WITH_LIBCURL_INC");
if(!s.isEmpty()) {
if(!conf->checkHeader(s, "curl/curl.h")) {
return false;
}
}else{
QStringList sl;
sl << "/usr/include";
sl << "/usr/local/include";
bool found = false;
foreach(s, sl){
if(conf->checkHeader(s, "curl/curl.h")){
found = true;
break;
}
}
if(!found) {
return false;
}
}
conf->addIncludePath(s);
s = conf->getenv("QC_WITH_LIBCURL_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("/libcurl.so")))
return false;
conf->addLib(QString("-L") + s);
}else{
QStringList sl;
sl << "/usr/lib/";
sl << "/usr/lib64/";
sl << "/usr/local/lib/";
sl << "/usr/local/lib64/";
bool found = false;
foreach(s, sl){
if(QFile::exists(s+QString("libcurl.so"))){
found = true;
break;
}
}
if(!found) return false;
conf->addLib(QString("-L") + s);
}
return true;
}
};

133
src/downloadThread.cpp
Unescape View File

@ -21,66 +21,45 @@
#include "downloadThread.h" #include "downloadThread.h"
#include <iostream> #include <iostream>
#include <cc++/common.h>
#include <QSettings> #include <QSettings>
#include <stdio.h>
QString subDownloadThread::errorCodeToString(int status) { // http://curl.rtin.bz/libcurl/c/libcurl-errors.html
QString subDownloadThread::errorCodeToString(CURLcode status) {
switch(status){ switch(status){
case 1://ost::URLStream::errUnreachable: case CURLE_COULDNT_RESOLVE_HOST:
return tr("Host is unreachable"); return tr("Host is unreachable");
case 2://ost::URLStream::errMissing: case CURLE_READ_ERROR:
case CURLE_FILE_COULDNT_READ_FILE:
return tr("File was not found (404)"); return tr("File was not found (404)");
case 3://ost::URLStream::errDenied: case CURLE_LOGIN_DENIED:
return tr("Connection was denied"); return tr("Connection was denied");
case 4://ost::URLStream::errInvalid: case CURLE_URL_MALFORMAT:
return tr("Url is invalid"); return tr("Url is invalid");
case 5://ost::URLStream::errForbidden: case CURLE_COULDNT_RESOLVE_PROXY:
return tr("Connection forbidden (403)"); return tr("Could not resolve proxy");
case 6://ost::URLStream::errUnauthorized: //case 5:
return tr("Connection was not authorized (401)"); // return tr("Connection forbidden (403)");
case 7://ost::URLStream::errRelocated: //case 6:
return tr("Content has moved (301)"); // return tr("Connection was not authorized (401)");
case 8://ost::URLStream::errFailure: //case 7:
// return tr("Content has moved (301)");
case CURLE_COULDNT_CONNECT:
return tr("Connection failure"); return tr("Connection failure");
case 9://ost::URLStream::errTimeout: case CURLE_OPERATION_TIMEOUTED:
return tr("Connection was timed out"); return tr("Connection was timed out");
case 10://ost::URLStream::errInterface: case CURLE_INTERFACE_FAILED:
return tr("Incorrect network interface"); return tr("Incorrect network interface");
default: default:
return tr("Unknown error"); return tr("Unknown error");
} }
} }
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();
// Proxy support
QSettings settings("qBittorrent", "qBittorrent");
int intValue = settings.value(QString::fromUtf8("Preferences/Connection/ProxyType"), 0).toInt();
if(intValue > 0) {
// Proxy enabled
QString IP = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString();
qDebug("Set proxy, hostname: %s, port: %d", IP.toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt());
if(intValue==1 || intValue==3) {
if(!IP.startsWith("http://", Qt::CaseInsensitive)) {
// HTTP Proxy without leading http://
url_stream->setProxy((QString("http://")+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());
}else {
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()) {
qDebug("Proxy auth required");
// 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());
}
} //TODO: Support SOCKS5 proxies
}
}
subDownloadThread::~subDownloadThread(){ subDownloadThread::~subDownloadThread(){
abort = true; abort = true;
wait(); wait();
delete url_stream;
} }
void subDownloadThread::run(){ void subDownloadThread::run(){
@ -91,38 +70,54 @@ void subDownloadThread::run(){
filePath = tmpfile->fileName(); filePath = tmpfile->fileName();
} }
delete tmpfile; delete tmpfile;
QFile dest_file(filePath); FILE *f = fopen(filePath.toUtf8().data(), "w");
if(!dest_file.open(QIODevice::WriteOnly | QIODevice::Text)){ if(!f) {
std::cerr << "Error: could't create temporary file: " << (const char*)filePath.toUtf8() << '\n'; std::cerr << "couldn't open destination file" << "\n";
return;
}
ost::URLStream::Error status = url_stream->get((const char*)url.toUtf8());
if(status){
// Failure
QString error_msg = errorCodeToString((int)status);
qDebug("Download failed for %s, reason: %s", (const char*)url.toUtf8(), (const char*)error_msg.toUtf8());
url_stream->close();
emit downloadFailureST(this, url, error_msg);
return; return;
} }
qDebug("Downloading %s...", (const char*)url.toUtf8()); CURL *curl;
char cbuf[1024]; CURLcode res;
int len; curl = curl_easy_init();
while(!url_stream->eof()) { if(curl) {
url_stream->read(cbuf, sizeof(cbuf)); std::string c_url = url.toUtf8().data();
len = url_stream->gcount(); curl_easy_setopt(curl, CURLOPT_URL, c_url.c_str());
if(len > 0) // PROXY SUPPORT
dest_file.write(cbuf, len); QSettings settings("qBittorrent", "qBittorrent");
if(abort){ int intValue = settings.value(QString::fromUtf8("Preferences/Connection/ProxyType"), 0).toInt();
dest_file.close(); if(intValue > 0) {
url_stream->close(); // Proxy enabled
return; QString IP = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString();
QString port = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toString();
qDebug("Using proxy: %s", (IP+QString(":")+port).toUtf8().data());
curl_easy_setopt(curl, CURLOPT_PROXYPORT, (IP+QString(":")+port).toUtf8().data());
// Default proxy type is HTTP, we must change if it is SOCKS5
if(intValue%2==0) {
qDebug("Proxy is SOCKS5, not HTTP");
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
}
// Authentication?
if(intValue > 2) {
qDebug("Proxy requires authentication, authenticating");
QString username = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Username"), QString()).toString();
QString password = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Password"), QString()).toString();
curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, (username+QString(":")+password).toUtf8().data());
}
}
// TODO: define CURLOPT_WRITEFUNCTION or it will crash on windows
curl_easy_setopt(curl, CURLOPT_WRITEDATA, f);
qDebug("Downloading %s", url.toUtf8().data());
res = curl_easy_perform(curl);
/* always cleanup */
curl_easy_cleanup(curl);
fclose(f);
if(res) {
emit downloadFailureST(this, url, errorCodeToString(res));
} else {
emit downloadFinishedST(this, url, filePath);
} }
} else {
std::cerr << "Could not initialize CURL" << "\n";
} }
dest_file.close();
url_stream->close();
emit downloadFinishedST(this, url, filePath);
qDebug("download completed here: %s", (const char*)filePath.toUtf8());
} }
/** Download Thread **/ /** Download Thread **/

16
src/downloadThread.h
Unescape View File

@ -29,29 +29,18 @@
#include <QMutexLocker> #include <QMutexLocker>
#include <QWaitCondition> #include <QWaitCondition>
#include <QStringList> #include <QStringList>
#include <curl/curl.h>
namespace ost {
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:
QString url; QString url;
ost::URLStream *url_stream;
bool abort; bool abort;
public: public:
subDownloadThread(QObject *parent, QString url); subDownloadThread(QObject *parent, QString url);
~subDownloadThread(); ~subDownloadThread();
QString errorCodeToString(int status); QString errorCodeToString(CURLcode status);
signals: signals:
// For subthreads // For subthreads
@ -90,7 +79,6 @@ class downloadThread : public QThread {
protected slots: protected slots:
void propagateDownloadedFile(subDownloadThread* st, QString url, QString path); void propagateDownloadedFile(subDownloadThread* st, QString url, QString path);
void propagateDownloadFailure(subDownloadThread* st, QString url, QString reason); void propagateDownloadFailure(subDownloadThread* st, QString url, QString reason);
}; };

2
src/src.pro
Unescape View File

@ -81,7 +81,7 @@ QMAKE_CXXFLAGS_RELEASE += -fwrapv -O2
QMAKE_CXXFLAGS_DEBUG += -fwrapv -O1 QMAKE_CXXFLAGS_DEBUG += -fwrapv -O1
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += "libtorrent libccext2 libccgnu2" PKGCONFIG += "libtorrent libcurl"
!contains(DEFINES, HAVE_MAGICK){ !contains(DEFINES, HAVE_MAGICK){
message(ImageMagick disabled) message(ImageMagick disabled)

Write Preview
Loading…
Cancel
Save