len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make httpget class work with URI paths containing characters that need to be percent-encoded. Fixes FS#8872. Add a few comments.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17099 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2008-04-13 18:43:51 +00:00
parent be77cf5279
commit 73d1eb4ac0
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rbutil/rbutilqt/httpget.cpp
View file

@ -23,14 +23,13 @@
#include "httpget.h" #include "httpget.h"
QDir HttpGet::m_globalCache; QDir HttpGet::m_globalCache; //< global cach path value for new objects
QUrl HttpGet::m_globalProxy; QUrl HttpGet::m_globalProxy; //< global proxy value for new objects
HttpGet::HttpGet(QObject *parent) HttpGet::HttpGet(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
m_usecache = false; m_usecache = false;
qDebug() << "--> HttpGet::HttpGet()";
outputToBuffer = true; outputToBuffer = true;
cached = false; cached = false;
getRequest = -1; getRequest = -1;
@ -41,7 +40,6 @@ HttpGet::HttpGet(QObject *parent)
// default to global proxy / cache if not empty. // default to global proxy / cache if not empty.
// proxy is automatically enabled, disable it by setting an empty proxy // proxy is automatically enabled, disable it by setting an empty proxy
// cache is enabled to be in line, can get disabled with setCache(bool) // cache is enabled to be in line, can get disabled with setCache(bool)
qDebug() << "setting global proxy / cache";
if(!m_globalProxy.isEmpty()) if(!m_globalProxy.isEmpty())
setProxy(m_globalProxy); setProxy(m_globalProxy);
m_usecache = false; m_usecache = false;
@ -58,6 +56,8 @@ HttpGet::HttpGet(QObject *parent)
} }
//! @brief set cache path
// @param d new directory to use as cache path
void HttpGet::setCache(QDir d) void HttpGet::setCache(QDir d)
{ {
m_cachedir = d; m_cachedir = d;
@ -68,6 +68,9 @@ void HttpGet::setCache(QDir d)
} }
/** @brief enable / disable cache useage
* @param c set cache usage
*/
void HttpGet::setCache(bool c) void HttpGet::setCache(bool c)
{ {
qDebug() << "setCache(bool)" << c; qDebug() << "setCache(bool)" << c;
@ -103,6 +106,9 @@ QByteArray HttpGet::readAll()
} }
/** @brief get http error
* @return http error
*/
QHttp::Error HttpGet::error() QHttp::Error HttpGet::error()
{ {
return http.error(); return http.error();
@ -219,13 +225,15 @@ bool HttpGet::getFile(const QUrl &url)
qDebug() << query; qDebug() << query;
} }
QString path;
path = QString(QUrl::toPercentEncoding(url.path(), "/"));
if(outputToBuffer) { if(outputToBuffer) {
qDebug() << "[HTTP] downloading to buffer:" << url.toString(); qDebug() << "[HTTP] downloading to buffer:" << url.toString();
getRequest = http.get(url.path() + query); getRequest = http.get(path + query);
} }
else { else {
qDebug() << "[HTTP] downloading to file:" << url.toString() << qPrintable(outputFile->fileName()); qDebug() << "[HTTP] downloading to file:" << url.toString() << qPrintable(outputFile->fileName());
getRequest = http.get(url.path() + query, outputFile); getRequest = http.get(path + query, outputFile);
} }
qDebug() << "[HTTP] request scheduled: GET" << getRequest; qDebug() << "[HTTP] request scheduled: GET" << getRequest;