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

Fix closure call and handle redirects

Browse Source
This commit is contained in:
Leo Franchi
2012-09-20 22:13:07 -04:00
parent 12d36079f3
commit 831799ae10
6 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/infoplugins/generic/discogs/DiscogsPlugin.h
View File

@@ -59,5 +59,4 @@ private:
}
Q_DECLARE_METATYPE( QNetworkReply* )
#endif

1
src/libtomahawk/AtticaManager.h
View File

@@ -177,5 +177,4 @@ protected:
};
Q_DECLARE_METATYPE( Attica::Content );
Q_DECLARE_METATYPE( QNetworkReply* );
#endif // ATTICAMANAGER_H

3
src/libtomahawk/Typedefs.h
View File

@@ -28,6 +28,8 @@
//template <typename T> class QSharedPointer;
class QNetworkReply;
namespace Tomahawk
{
class Artist;
@@ -221,5 +223,6 @@ inline static QString uuid()
Q_DECLARE_METATYPE( QModelIndex )
Q_DECLARE_METATYPE( QPersistentModelIndex )
Q_DECLARE_METATYPE( QNetworkReply* );
#endif // TYPEDEFS_H

6
src/libtomahawk/utils/SoundcloudParser.cpp
View File

@@ -103,8 +103,10 @@ SoundcloudParser::parseTrack( const QVariantMap& res )
if ( !q.isNull() )
{
tLog() << "Setting resulthint to " << res.value( "stream_url" ) << res;
q->setResultHint( res.value( "stream_url" ).toString() + "?client_id=TiNg2DRYhBnp01DA3zNag" );
QUrl url = QUrl::fromUserInput( res.value( "stream_url" ).toString() );
url.addQueryItem( "client_id", "TiNg2DRYhBnp01DA3zNag" );
tLog() << "Setting resulthint to " << res.value( "stream_url" ) << url.toString();
q->setResultHint( url.toString() );
q->setSaveHTTPResultHint( true );
m_tracks << q;
}

26
src/libtomahawk/utils/WebResultHintChecker.cpp
View File

@@ -25,6 +25,7 @@
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QNetworkRequest>
using namespace Tomahawk;
@@ -50,8 +51,7 @@ WebResultHintChecker::WebResultHintChecker( const query_ptr& q )
return;
}
QNetworkReply* reply = TomahawkUtils::nam()->head( QNetworkRequest( QUrl( m_url ) ) );
NewClosure( reply, SIGNAL( finished() ), this, SLOT( headFinished( QNetworkReply* ) ) );
check( m_url );
}
WebResultHintChecker::~WebResultHintChecker()
@@ -60,10 +60,28 @@ WebResultHintChecker::~WebResultHintChecker()
}
void
WebResultHintChecker::check( const QString &url )
{
QNetworkReply* reply = TomahawkUtils::nam()->head( QNetworkRequest( QUrl( url ) ) );
NewClosure( reply, SIGNAL( finished() ), this, SLOT( headFinished( QNetworkReply* ) ), reply );
}
void
WebResultHintChecker::headFinished( QNetworkReply* reply )
{
if ( reply->error() != QNetworkReply::NoError )
reply->deleteLater();
const QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
if ( redir.isValid() )
{
const QUrl url = reply->url().resolved( redir );
check( url.toString() );
return;
}
else if ( reply->error() != QNetworkReply::NoError )
{
// Error getting headers for the http resulthint, remove it from the result
// as it's definitely not playable
@@ -72,8 +90,8 @@ WebResultHintChecker::headFinished( QNetworkReply* reply )
m_query->removeResult( m_result );
if ( m_query->resultHint() == m_url )
m_query->setResultHint( QString() );
m_query->setSaveHTTPResultHint( false );
}
reply->deleteLater();
deleteLater();
}

2
src/libtomahawk/utils/WebResultHintChecker.h
View File

@@ -37,6 +37,8 @@ private slots:
void headFinished( QNetworkReply* reply );
private:
void check( const QString& url );
query_ptr m_query;
result_ptr m_result;
QString m_url;