len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 20:55:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(hopefully) fix some broken download stuff I introduced yesterday.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14354 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-08-15 13:28:15 +00:00
parent 022173195f
commit e59cf6b9df
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rbutil/rbutilqt/httpget.cpp
View file

@ -28,15 +28,14 @@ HttpGet::HttpGet(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
qDebug() << "--> HttpGet::HttpGet()"; qDebug() << "--> HttpGet::HttpGet()";
outputFile = new QFile(this); outputToBuffer = true;
outputFile->setFileName("");
getRequest = -1; getRequest = -1;
connect(&http, SIGNAL(done(bool)), this, SLOT(httpDone(bool))); connect(&http, SIGNAL(done(bool)), this, SLOT(httpDone(bool)));
connect(&http, SIGNAL(dataReadProgress(int, int)), this, SLOT(httpProgress(int, int))); connect(&http, SIGNAL(dataReadProgress(int, int)), this, SLOT(httpProgress(int, int)));
connect(&http, SIGNAL(requestFinished(int, bool)), this, SLOT(httpFinished(int, bool))); connect(&http, SIGNAL(requestFinished(int, bool)), this, SLOT(httpFinished(int, bool)));
connect(&http, SIGNAL(responseHeaderReceived(const QHttpResponseHeader&)), this, SLOT(httpResponseHeader(const QHttpResponseHeader&))); connect(&http, SIGNAL(responseHeaderReceived(const QHttpResponseHeader&)), this, SLOT(httpResponseHeader(const QHttpResponseHeader&)));
connect(&http, SIGNAL(stateChanged(int)), this, SLOT(httpState(int))); connect(&http, SIGNAL(stateChanged(int)), this, SLOT(httpState(int)));
//connect(&http, SIGNAL(requestStarted(int)), this, SLOT(httpStarted(int))); connect(&http, SIGNAL(requestStarted(int)), this, SLOT(httpStarted(int)));
connect(&http, SIGNAL(readyRead(const QHttpResponseHeader&)), this, SLOT(httpResponseHeader(const QHttpResponseHeader&))); connect(&http, SIGNAL(readyRead(const QHttpResponseHeader&)), this, SLOT(httpResponseHeader(const QHttpResponseHeader&)));
@ -71,6 +70,7 @@ void HttpGet::setProxy(const QUrl &proxy)
void HttpGet::setFile(QFile *file) void HttpGet::setFile(QFile *file)
{ {
outputFile = file; outputFile = file;
outputToBuffer = false;
qDebug() << "HttpGet::setFile" << outputFile->fileName(); qDebug() << "HttpGet::setFile" << outputFile->fileName();
} }
@ -78,7 +78,7 @@ void HttpGet::setFile(QFile *file)
void HttpGet::abort() void HttpGet::abort()
{ {
http.abort(); http.abort();
if(!outputFile->fileName().isEmpty()); if(!outputToBuffer)
outputFile->close(); outputFile->close();
} }
@ -100,7 +100,7 @@ bool HttpGet::getFile(const QUrl &url)
return false; return false;
} }
// if no output file was set write to buffer // if no output file was set write to buffer
if(!outputFile->fileName().isEmpty()) { if(!outputToBuffer) {
if (!outputFile->open(QIODevice::ReadWrite)) { if (!outputFile->open(QIODevice::ReadWrite)) {
qDebug() << "Error: Cannot open " << qPrintable(outputFile->fileName()) qDebug() << "Error: Cannot open " << qPrintable(outputFile->fileName())
<< " for writing: " << qPrintable(outputFile->errorString()) << " for writing: " << qPrintable(outputFile->errorString())
@ -108,14 +108,13 @@ bool HttpGet::getFile(const QUrl &url)
return false; return false;
} }
} }
qDebug() << "starting download to " << qPrintable(outputFile->fileName());
http.setHost(url.host(), url.port(80)); http.setHost(url.host(), url.port(80));
if(outputFile->fileName().isEmpty()) { if(outputToBuffer) {
qDebug() << "downloading to buffer"; qDebug() << "downloading to buffer:" << QString(url.toEncoded());
getRequest = http.get(QString(url.toEncoded())); getRequest = http.get(QString(url.toEncoded()));
} }
else { else {
qDebug() << "downloading to file"; qDebug() << "downloading to file:" << QString(url.toEncoded()) << qPrintable(outputFile->fileName());
getRequest = http.get(QString(url.toEncoded()), outputFile); getRequest = http.get(QString(url.toEncoded()), outputFile);
} }
qDebug() << "request scheduled: GET" << getRequest; qDebug() << "request scheduled: GET" << getRequest;
@ -127,15 +126,14 @@ bool HttpGet::getFile(const QUrl &url)
void HttpGet::httpDone(bool error) void HttpGet::httpDone(bool error)
{ {
qDebug() << "bytesAvailable =" << http.bytesAvailable();
if (error) { if (error) {
qDebug() << "Error: " << qPrintable(http.errorString()) << endl; qDebug() << "Error: " << qPrintable(http.errorString()) << endl;
} else {
qDebug() << "File downloaded as " << qPrintable(outputFile->fileName())
<< endl;
} }
if(!outputFile->fileName().isEmpty()) if(!outputToBuffer) {
outputFile->close(); outputFile->close();
qDebug() << "File downloaded as" << qPrintable(outputFile->fileName());
}
else qDebug() << "file downloaded to buffer";
emit done(error); emit done(error);
} }
@ -145,6 +143,8 @@ void HttpGet::httpFinished(int id, bool error)
{ {
qDebug() << "HttpGet::httpFinished(int, bool) =" << id << error; qDebug() << "HttpGet::httpFinished(int, bool) =" << id << error;
if(id == getRequest) dataBuffer = http.readAll(); if(id == getRequest) dataBuffer = http.readAll();
qDebug() << "pending:" << http.hasPendingRequests();
//if(!http.hasPendingRequests()) httpDone(error);
emit requestFinished(id, error); emit requestFinished(id, error);
} }

1
rbutil/rbutilqt/httpget.h
View file

@ -63,6 +63,7 @@ class HttpGet : public QObject
int response; int response;
int getRequest; int getRequest;
QByteArray dataBuffer; QByteArray dataBuffer;
bool outputToBuffer;
}; };
#endif #endif