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

* JspfLoader now also uses our own NetworkReply to support HTTP redirects.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-14 05:55:22 +01:00
parent eec48e6ad7
commit b9191a39ee
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/JspfLoader.cpp
View File

@@ -19,19 +19,19 @@
#include "JspfLoader.h" #include "JspfLoader.h"
#include <QApplication> #include <QApplication>
#include <QDomDocument> #include <QDomDocument>
#include <QMessageBox> #include <QMessageBox>
#include <qjson/parser.h> #include <qjson/parser.h>
#include "utils/TomahawkUtils.h"
#include "utils/Logger.h"
#include "SourceList.h" #include "SourceList.h"
#include "Playlist.h" #include "Playlist.h"
#include "utils/NetworkReply.h"
#include "utils/TomahawkUtils.h"
#include "utils/Logger.h"
using namespace Tomahawk; using namespace Tomahawk;
@@ -59,23 +59,19 @@ void
JSPFLoader::load( const QUrl& url ) JSPFLoader::load( const QUrl& url )
{ {
QNetworkRequest request( 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 ) );
// isn't there a race condition here? something could happen before we connect() connect( reply, SIGNAL( finished() ), SLOT( networkLoadFinished() ) );
// no---the event loop is needed to make the request, i think (leo) connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SLOT( networkError( QNetworkReply::NetworkError ) ) );
connect( reply, SIGNAL( finished() ),
SLOT( networkLoadFinished() ) );
connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ),
SLOT( networkError( QNetworkReply::NetworkError ) ) );
} }
void void
JSPFLoader::load( QFile& file ) JSPFLoader::load( QFile& file )
{ {
if( file.open( QFile::ReadOnly ) ) if ( file.open( QFile::ReadOnly ) )
{ {
m_body = file.readAll(); m_body = file.readAll();
gotBody(); gotBody();
@@ -101,17 +97,24 @@ JSPFLoader::reportError()
void void
JSPFLoader::networkLoadFinished() JSPFLoader::networkLoadFinished()
{ {
QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender()); NetworkReply* r = qobject_cast<NetworkReply*>( sender() );
m_body = reply->readAll(); if ( r->reply()->error() == QNetworkReply::NoError )
gotBody(); {
m_body = r->reply()->readAll();
gotBody();
}
r->deleteLater();
} }
void void
JSPFLoader::networkError( QNetworkReply::NetworkError e ) JSPFLoader::networkError( QNetworkReply::NetworkError e )
{ {
tLog() << Q_FUNC_INFO << "Network error loading jspf" << e;
reportError(); reportError();
NetworkReply* r = qobject_cast<NetworkReply*>( sender() );
r->deleteLater();
} }
@@ -178,7 +181,7 @@ JSPFLoader::gotBody()
continue; continue;
q->setDuration( duration.toInt() / 1000 ); q->setDuration( duration.toInt() / 1000 );
if( !url.isEmpty() ) if ( !url.isEmpty() )
{ {
q->setResultHint( url ); q->setResultHint( url );
q->setSaveHTTPResultHint( true ); q->setSaveHTTPResultHint( true );