mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 07:07:05 +02:00
Code Issues Releases Wiki Activity

* Fixed TWK-856: XSPFLoader now follows HTTP redirects (by using our own NetworkReply).

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-14 05:48:52 +01:00
parent 082f46f242
commit eec48e6ad7
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/libtomahawk/utils/XspfLoader.cpp
View File

@@ -24,9 +24,6 @@
#include <QDomDocument> #include <QDomDocument>
#include "utils/TomahawkUtils.h"
#include "utils/Logger.h"
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
#include "jobview/JobStatusView.h" #include "jobview/JobStatusView.h"
#include "jobview/JobStatusModel.h" #include "jobview/JobStatusModel.h"
@@ -38,6 +35,10 @@
#include <XspfUpdater.h> #include <XspfUpdater.h>
#include <Pipeline.h> #include <Pipeline.h>
#include "utils/NetworkReply.h"
#include "utils/TomahawkUtils.h"
#include "utils/Logger.h"
using namespace Tomahawk; using namespace Tomahawk;
@@ -64,7 +65,7 @@ XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject* parent )
, m_autoUpdate( autoUpdate ) , m_autoUpdate( autoUpdate )
, m_autoResolve( true ) , m_autoResolve( true )
, m_autoDelete( true ) , m_autoDelete( true )
, m_NS("http://xspf.org/ns/0/") , m_NS( "http://xspf.org/ns/0/" )
{ {
qRegisterMetaType< XSPFErrorCode >("XSPFErrorCode"); qRegisterMetaType< XSPFErrorCode >("XSPFErrorCode");
} }
@@ -99,17 +100,14 @@ XSPFLoader::title() const
void void
XSPFLoader::load( const QUrl& url ) XSPFLoader::load( const QUrl& url )
{ {
QNetworkRequest request( url );
m_url = url; m_url = url;
QNetworkRequest request( url );
Q_ASSERT( TomahawkUtils::nam() != 0 ); Q_ASSERT( TomahawkUtils::nam() != 0 );
QNetworkReply* reply = TomahawkUtils::nam()->get( request ); NetworkReply* reply = new NetworkReply( TomahawkUtils::nam()->get( request ) );
connect( reply, SIGNAL( finished() ), connect( reply, SIGNAL( finished() ), SLOT( networkLoadFinished() ) );
SLOT( networkLoadFinished() ) ); connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SLOT( networkError( QNetworkReply::NetworkError ) ) );
connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ),
SLOT( networkError( QNetworkReply::NetworkError ) ) );
} }
@@ -133,7 +131,7 @@ XSPFLoader::reportError()
{ {
emit error( FetchError ); emit error( FetchError );
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
const QString errorMsg = errorToString( FetchError); const QString errorMsg = errorToString( FetchError );
if ( !m_errorTitle.isEmpty() ) if ( !m_errorTitle.isEmpty() )
JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( QString( "%1: %2" ).arg( m_errorTitle ).arg( errorMsg ) ) ); JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( QString( "%1: %2" ).arg( m_errorTitle ).arg( errorMsg ) ) );
else else
@@ -146,12 +144,14 @@ XSPFLoader::reportError()
void void
XSPFLoader::networkLoadFinished() XSPFLoader::networkLoadFinished()
{ {
QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender()); NetworkReply* r = qobject_cast<NetworkReply*>( sender() );
if ( reply->error() != QNetworkReply::NoError ) if ( r->reply()->error() == QNetworkReply::NoError )
return; {
m_body = r->reply()->readAll();
gotBody();
}
m_body = reply->readAll(); r->deleteLater();
gotBody();
} }
@@ -159,6 +159,9 @@ void
XSPFLoader::networkError( QNetworkReply::NetworkError /* error */ ) XSPFLoader::networkError( QNetworkReply::NetworkError /* error */ )
{ {
reportError(); reportError();
NetworkReply* r = qobject_cast<NetworkReply*>( sender() );
r->deleteLater();
} }
@@ -293,7 +296,7 @@ XSPFLoader::gotBody()
else else
{ {
if( !m_entries.isEmpty() ) if ( !m_entries.isEmpty() )
emit tracks( m_entries ); emit tracks( m_entries );
} }