pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bit of a refactoring

Browse source
This commit is contained in:
Martin Rotter 2023-10-23 15:01:07 +02:00
parent 939ae0e06b
commit e695203502
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/librssguard/network-web/downloader.cpp
View file

@ -236,7 +236,11 @@ void Downloader::finished() {
m_lastContentType = reply->header(QNetworkRequest::KnownHeaders::ContentTypeHeader); m_lastContentType = reply->header(QNetworkRequest::KnownHeaders::ContentTypeHeader);
m_lastOutputError = reply->error(); m_lastOutputError = reply->error();
m_lastHttpStatusCode = reply->attribute(QNetworkRequest::Attribute::HttpStatusCodeAttribute).toInt(); m_lastHttpStatusCode = reply->attribute(QNetworkRequest::Attribute::HttpStatusCodeAttribute).toInt();
m_lastHeaders = reply->rawHeaderPairs(); m_lastHeaders.clear();
for (const QNetworkReply::RawHeaderPair& head : reply->rawHeaderPairs()) {
m_lastHeaders.insert(head.first, head.second);
}
// original_url = m_activeReply->property("original_url").toUrl(); // original_url = m_activeReply->property("original_url").toUrl();
@ -366,7 +370,7 @@ void Downloader::runGetRequest(const QNetworkRequest& request) {
connect(m_activeReply, &QNetworkReply::finished, this, &Downloader::finished); connect(m_activeReply, &QNetworkReply::finished, this, &Downloader::finished);
} }
QList<QNetworkReply::RawHeaderPair> Downloader::lastHeaders() const { QMap<QString, QString> Downloader::lastHeaders() const {
return m_lastHeaders; return m_lastHeaders;
} }

4
src/librssguard/network-web/downloader.h
View file

@ -30,7 +30,7 @@ class Downloader : public QObject {
QVariant lastContentType() const; QVariant lastContentType() const;
QList<QNetworkCookie> lastCookies() const; QList<QNetworkCookie> lastCookies() const;
int lastHttpStatusCode() const; int lastHttpStatusCode() const;
QList<QNetworkReply::RawHeaderPair> lastHeaders() const; QMap<QString, QString> lastHeaders() const;
void setProxy(const QNetworkProxy& proxy); void setProxy(const QNetworkProxy& proxy);
@ -116,7 +116,7 @@ class Downloader : public QObject {
int m_lastHttpStatusCode; int m_lastHttpStatusCode;
QVariant m_lastContentType; QVariant m_lastContentType;
QList<QNetworkCookie> m_lastCookies; QList<QNetworkCookie> m_lastCookies;
QList<QNetworkReply::RawHeaderPair> m_lastHeaders; QMap<QString, QString> m_lastHeaders;
}; };
#endif // DOWNLOADER_H #endif // DOWNLOADER_H

2
src/librssguard/network-web/networkfactory.h
View file

@ -21,7 +21,7 @@ struct NetworkResult {
int m_httpCode; int m_httpCode;
QString m_contentType; QString m_contentType;
QList<QNetworkCookie> m_cookies; QList<QNetworkCookie> m_cookies;
QList<QNetworkReply::RawHeaderPair> m_headers; QMap<QString, QString> m_headers;
explicit NetworkResult(); explicit NetworkResult();
explicit NetworkResult(QNetworkReply::NetworkError err, explicit NetworkResult(QNetworkReply::NetworkError err,

12
src/librssguard/services/standard/standardserviceroot.cpp
View file

@ -184,13 +184,15 @@ QList<Message> StandardServiceRoot::obtainNewMessages(Feed* feed,
false, false,
{}, {},
{}, {},
networkProxy()) networkProxy());
.m_networkError;
if (network_result != QNetworkReply::NetworkError::NoError) { qDebugNN << "etag:" << network_result.m_headers["ETag"];
qWarningNN << LOGSEC_CORE << "Error" << QUOTE_W_SPACE(network_result)
if (network_result.m_networkError != QNetworkReply::NetworkError::NoError) {
qWarningNN << LOGSEC_CORE << "Error" << QUOTE_W_SPACE(network_result.m_networkError)
<< "during fetching of new messages for feed" << QUOTE_W_SPACE_DOT(feed->source()); << "during fetching of new messages for feed" << QUOTE_W_SPACE_DOT(feed->source());
throw FeedFetchException(Feed::Status::NetworkError, NetworkFactory::networkErrorText(network_result)); throw FeedFetchException(Feed::Status::NetworkError,
NetworkFactory::networkErrorText(network_result.m_networkError));
} }
} }
else if (f->sourceType() == StandardFeed::SourceType::LocalFile) { else if (f->sourceType() == StandardFeed::SourceType::LocalFile) {