FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unify download/upload methods params.

This commit is contained in:
Martin Rotter 2016-02-25 16:26:27 +01:00
parent 24a1b51b67
commit f2943a594d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network-web/networkfactory.cpp
View File

@ -151,19 +151,18 @@ QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList<QString> &u
NetworkResult NetworkFactory::uploadData(const QString &url, int timeout, const QByteArray &input_data,
const QString &input_content_type, QByteArray &output,
QNetworkAccessManager::Operation operation, bool protected_contents,
const QString &username, const QString &password, bool forcefully_embed_basic_header) {
const QString &username, const QString &password, bool set_basic_header) {
Downloader downloader;
QEventLoop loop;
NetworkResult result;
downloader.appendRawHeader("Content-Type", input_content_type.toLocal8Bit());
if (forcefully_embed_basic_header) {
QString concatenated = username + ":" + password;
QByteArray data = concatenated.toLocal8Bit().toBase64();
QString headerData = QString("Basic ") + data;
if (set_basic_header) {
QString basic_value = username + ":" + password;
QString header_value = QString("Basic ") + QString(basic_value.toUtf8().toBase64());
downloader.appendRawHeader("Authorization", headerData.toLocal8Bit());
downloader.appendRawHeader("Authorization", header_value.toLocal8Bit());
}
// We need to quit event loop when the download finishes.

2
src/network-web/networkfactory.h
View File

@ -47,7 +47,7 @@ class NetworkFactory {
const QString &input_content_type, QByteArray &output,
QNetworkAccessManager::Operation operation,
bool protected_contents = false, const QString &username = QString(),
const QString &password = QString(), bool forcefully_embed_basic_header = false);
const QString &password = QString(), bool set_basic_header = false);
static NetworkResult downloadFeedFile(const QString &url, int timeout, QByteArray &output,
bool protected_contents = false, const QString &username = QString(),