sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-19 00:02:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make request a member of reply

Browse Source
This commit is contained in:
Nyall Dawson 2019-01-23 08:05:02 +10:00
parent aa170ad524
commit e50d9a1673
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/auto_generated/qgsnetworkreply.sip.in
View File

@ -102,6 +102,11 @@ empty QByteArray if the specified header was not found in the reply.
int requestId() const;
%Docstring
Returns the unique ID identifying the original request which this response was formed from.
%End
QNetworkRequest request() const;
%Docstring
Returns the original network request.
%End
};

1
src/core/qgsnetworkreply.cpp
View File

@ -20,6 +20,7 @@ QgsNetworkReplyContent::QgsNetworkReplyContent( QNetworkReply *reply )
: mError( reply->error() )
, mErrorString( reply->errorString() )
, mRawHeaderPairs( reply->rawHeaderPairs() )
, mRequest( reply->request() )
{
int maxAttribute = static_cast< int >( QNetworkRequest::RedirectPolicyAttribute );
#if QT_VERSION >= QT_VERSION_CHECK( 5, 11, 0 )

6
src/core/qgsnetworkreply.h
View File

@ -133,6 +133,11 @@ class CORE_EXPORT QgsNetworkReplyContent
*/
int requestId() const { return mRequestId; }
/**
* Returns the original network request.
*/
QNetworkRequest request() const { return mRequest; }
private:
QNetworkReply::NetworkError mError = QNetworkReply::NoError;
@ -140,6 +145,7 @@ class CORE_EXPORT QgsNetworkReplyContent
QList<RawHeaderPair> mRawHeaderPairs;
QMap< QNetworkRequest::Attribute, QVariant > mAttributes;
int mRequestId = -1;
QNetworkRequest mRequest;
};
#endif // QGSNETWORKREPLY_H

16
tests/src/core/testqgsnetworkaccessmanager.cpp
View File

@ -65,7 +65,7 @@ void TestQgsNetworkAccessManager::fetchEmptyUrl()
bool loaded = false;
bool gotRequestAboutToBeCreatedSignal = false;
int requestId = -1;
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkRequestParameters >::of( &QgsNetworkAccessManager::requestAboutToBeCreated ), &context, [&]( QgsNetworkRequestParameters params )
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkRequestParameters >::of( &QgsNetworkAccessManager::requestAboutToBeCreated ), &context, [&]( const QgsNetworkRequestParameters & params )
{
gotRequestAboutToBeCreatedSignal = true;
requestId = params.requestId();
@ -73,10 +73,11 @@ void TestQgsNetworkAccessManager::fetchEmptyUrl()
QCOMPARE( params.operation(), QNetworkAccessManager::GetOperation );
QCOMPARE( params.request().url(), QUrl() );
} );
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkReplyContent >::of( &QgsNetworkAccessManager::finished ), &context, [&]( QgsNetworkReplyContent reply )
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkReplyContent >::of( &QgsNetworkAccessManager::finished ), &context, [&]( const QgsNetworkReplyContent & reply )
{
QCOMPARE( reply.errorString(), QStringLiteral( "Protocol \"\" is unknown" ) );
QCOMPARE( reply.requestId(), requestId );
QCOMPARE( reply.request().url(), QUrl() );
loaded = true;
} );
QgsNetworkAccessManager::instance()->get( QNetworkRequest( QUrl() ) );
@ -96,7 +97,7 @@ void TestQgsNetworkAccessManager::fetchBadUrl()
bool loaded = false;
bool gotRequestAboutToBeCreatedSignal = false;
int requestId = -1;
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkRequestParameters >::of( &QgsNetworkAccessManager::requestAboutToBeCreated ), &context, [&]( QgsNetworkRequestParameters params )
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkRequestParameters >::of( &QgsNetworkAccessManager::requestAboutToBeCreated ), &context, [&]( const QgsNetworkRequestParameters & params )
{
gotRequestAboutToBeCreatedSignal = true;
requestId = params.requestId();
@ -104,10 +105,12 @@ void TestQgsNetworkAccessManager::fetchBadUrl()
QCOMPARE( params.operation(), QNetworkAccessManager::GetOperation );
QCOMPARE( params.request().url(), QUrl( QStringLiteral( "http://x" ) ) );
} );
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkReplyContent >::of( &QgsNetworkAccessManager::finished ), &context, [&]( QgsNetworkReplyContent reply )
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkReplyContent >::of( &QgsNetworkAccessManager::finished ), &context, [&]( const QgsNetworkReplyContent & reply )
{
QCOMPARE( reply.errorString(), QStringLiteral( "Host x not found" ) );
QCOMPARE( reply.requestId(), requestId );
QCOMPARE( reply.request().url(), QUrl( QStringLiteral( "http://x" ) ) );
loaded = true;
} );
QgsNetworkAccessManager::instance()->get( QNetworkRequest( QUrl( QStringLiteral( "http://x" ) ) ) );
@ -129,7 +132,7 @@ void TestQgsNetworkAccessManager::fetchEncodedContent()
bool gotRequestAboutToBeCreatedSignal = false;
int requestId = -1;
QUrl u = QUrl::fromLocalFile( QStringLiteral( TEST_DATA_DIR ) + '/' + "encoded_html.html" );
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkRequestParameters >::of( &QgsNetworkAccessManager::requestAboutToBeCreated ), &context, [&]( QgsNetworkRequestParameters params )
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkRequestParameters >::of( &QgsNetworkAccessManager::requestAboutToBeCreated ), &context, [&]( const QgsNetworkRequestParameters & params )
{
gotRequestAboutToBeCreatedSignal = true;
requestId = params.requestId();
@ -137,11 +140,12 @@ void TestQgsNetworkAccessManager::fetchEncodedContent()
QCOMPARE( params.operation(), QNetworkAccessManager::GetOperation );
QCOMPARE( params.request().url(), u );
} );
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkReplyContent >::of( &QgsNetworkAccessManager::finished ), &context, [&]( QgsNetworkReplyContent reply )
connect( QgsNetworkAccessManager::instance(), qgis::overload< QgsNetworkReplyContent >::of( &QgsNetworkAccessManager::finished ), &context, [&]( const QgsNetworkReplyContent & reply )
{
QCOMPARE( reply.error(), QNetworkReply::NoError );
QCOMPARE( reply.requestId(), requestId );
QVERIFY( reply.rawHeaderList().contains( "Content-Length" ) );
QCOMPARE( reply.request().url(), u );
loaded = true;
} );
QgsNetworkAccessManager::instance()->get( QNetworkRequest( u ) );