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

* Fixed debug output in Api_v1.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-01-01 15:22:03 +01:00
parent ae4663f4c4
commit aa168ef572
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/web/Api_v1.cpp
View File

@@ -43,11 +43,11 @@ Api_v1::Api_v1(QxtAbstractWebSessionManager* sm, QObject* parent)
void void
Api_v1::auth_1( QxtWebRequestEvent* event, QString arg ) Api_v1::auth_1( QxtWebRequestEvent* event, QString arg )
{ {
qDebug() << "AUTH_1 HTTP" << event->url.toString() << arg; tDebug( LOGVERBOSE ) << "AUTH_1 HTTP" << event->url.toString() << arg;
if ( !event->url.hasQueryItem( "website" ) || !event->url.hasQueryItem( "name" ) ) if ( !event->url.hasQueryItem( "website" ) || !event->url.hasQueryItem( "name" ) )
{ {
qDebug() << "Malformed HTTP resolve request"; tDebug( LOGVERBOSE ) << "Malformed HTTP resolve request";
send404( event ); send404( event );
return; return;
} }
@@ -80,10 +80,10 @@ Api_v1::auth_1( QxtWebRequestEvent* event, QString arg )
void void
Api_v1::auth_2( QxtWebRequestEvent* event, QString arg ) Api_v1::auth_2( QxtWebRequestEvent* event, QString arg )
{ {
qDebug() << "AUTH_2 HTTP" << event->url.toString() << arg; tDebug( LOGVERBOSE ) << "AUTH_2 HTTP" << event->url.toString() << arg;
if ( event->content.isNull() ) if ( event->content.isNull() )
{ {
qDebug() << "Null content"; tDebug( LOGVERBOSE ) << "Null content";
send404( event ); send404( event );
return; return;
} }
@@ -99,13 +99,13 @@ Api_v1::auth_2( QxtWebRequestEvent* event, QString arg )
if ( keyval.size() == 2 ) if ( keyval.size() == 2 )
queryItems.insert( keyval.first(), keyval.last() ); queryItems.insert( keyval.first(), keyval.last() );
else else
qDebug() << "Failed parsing url parameters:" << part; tDebug( LOGVERBOSE ) << "Failed parsing url parameters:" << part;
} }
qDebug() << "has query items:" << pieces; tDebug( LOGVERBOSE ) << "has query items:" << pieces;
if ( !params.contains( "website" ) || !params.contains( "name" ) || !params.contains( "formtoken" ) ) if ( !params.contains( "website" ) || !params.contains( "name" ) || !params.contains( "formtoken" ) )
{ {
qDebug() << "Malformed HTTP resolve request"; tDebug( LOGVERBOSE ) << "Malformed HTTP resolve request";
send404( event ); send404( event );
return; return;
} }
@@ -113,7 +113,7 @@ Api_v1::auth_2( QxtWebRequestEvent* event, QString arg )
QString website = queryItems[ "website" ]; QString website = queryItems[ "website" ];
QString name = queryItems[ "name" ]; QString name = queryItems[ "name" ];
QByteArray authtoken = uuid().toLatin1(); QByteArray authtoken = uuid().toLatin1();
qDebug() << "HEADERS:" << event->headers; tDebug( LOGVERBOSE ) << "HEADERS:" << event->headers;
if ( !queryItems.contains( "receiverurl" ) || queryItems.value( "receiverurl" ).isEmpty() ) if ( !queryItems.contains( "receiverurl" ) || queryItems.value( "receiverurl" ).isEmpty() )
{ {
//no receiver url, so do it ourselves //no receiver url, so do it ourselves
@@ -139,7 +139,7 @@ Api_v1::auth_2( QxtWebRequestEvent* event, QString arg )
// do what the client wants // do what the client wants
QUrl receiverurl = QUrl( queryItems.value( "receiverurl" ), QUrl::TolerantMode ); QUrl receiverurl = QUrl( queryItems.value( "receiverurl" ), QUrl::TolerantMode );
receiverurl.addEncodedQueryItem( "authtoken", "#" + authtoken ); receiverurl.addEncodedQueryItem( "authtoken", "#" + authtoken );
qDebug() << "Got receiver url:" << receiverurl.toString(); tDebug( LOGVERBOSE ) << "Got receiver url:" << receiverurl.toString();
QxtWebRedirectEvent* e = new QxtWebRedirectEvent( event->sessionID, event->requestID, receiverurl.toString() ); QxtWebRedirectEvent* e = new QxtWebRedirectEvent( event->sessionID, event->requestID, receiverurl.toString() );
postEvent( e ); postEvent( e );
@@ -155,7 +155,7 @@ Api_v1::auth_2( QxtWebRequestEvent* event, QString arg )
void void
Api_v1::api( QxtWebRequestEvent* event ) Api_v1::api( QxtWebRequestEvent* event )
{ {
qDebug() << "HTTP" << event->url.toString(); tDebug( LOGVERBOSE ) << "HTTP" << event->url.toString();
const QUrl& url = event->url; const QUrl& url = event->url;
if ( url.hasQueryItem( "method" ) ) if ( url.hasQueryItem( "method" ) )
@@ -178,7 +178,7 @@ Api_v1::sid( QxtWebRequestEvent* event, QString unused )
Q_UNUSED( unused ); Q_UNUSED( unused );
RID rid = event->url.path().mid( 5 ); RID rid = event->url.path().mid( 5 );
qDebug() << "Request for sid" << rid; tDebug( LOGVERBOSE ) << "Request for sid" << rid;
result_ptr rp = Pipeline::instance()->result( rid ); result_ptr rp = Pipeline::instance()->result( rid );
if ( rp.isNull() ) if ( rp.isNull() )
@@ -204,7 +204,7 @@ Api_v1::sid( QxtWebRequestEvent* event, QString unused )
void void
Api_v1::send404( QxtWebRequestEvent* event ) Api_v1::send404( QxtWebRequestEvent* event )
{ {
qDebug() << "404" << event->url.toString(); tDebug() << "404" << event->url.toString();
QxtWebPageEvent* wpe = new QxtWebPageEvent( event->sessionID, event->requestID, "<h1>Not Found</h1>" ); QxtWebPageEvent* wpe = new QxtWebPageEvent( event->sessionID, event->requestID, "<h1>Not Found</h1>" );
wpe->status = 404; wpe->status = 404;
wpe->statusMessage = "no event found"; wpe->statusMessage = "no event found";
@@ -215,11 +215,11 @@ Api_v1::send404( QxtWebRequestEvent* event )
void void
Api_v1::stat( QxtWebRequestEvent* event ) Api_v1::stat( QxtWebRequestEvent* event )
{ {
qDebug() << "Got Stat request:" << event->url.toString(); tDebug( LOGVERBOSE ) << "Got Stat request:" << event->url.toString();
m_storedEvent = event; m_storedEvent = event;
if ( !event->content.isNull() ) if ( !event->content.isNull() )
qDebug() << "BODY:" << event->content->readAll(); tDebug( LOGVERBOSE ) << "BODY:" << event->content->readAll();
if ( event->url.hasQueryItem( "auth" ) ) if ( event->url.hasQueryItem( "auth" ) )
{ {
@@ -262,7 +262,7 @@ Api_v1::resolve( QxtWebRequestEvent* event )
if ( !event->url.hasQueryItem( "artist" ) || if ( !event->url.hasQueryItem( "artist" ) ||
!event->url.hasQueryItem( "track" ) ) !event->url.hasQueryItem( "track" ) )
{ {
qDebug() << "Malformed HTTP resolve request"; tDebug( LOGVERBOSE ) << "Malformed HTTP resolve request";
return send404( event ); return send404( event );
} }
@@ -273,7 +273,7 @@ Api_v1::resolve( QxtWebRequestEvent* event )
if ( artist.trimmed().isEmpty() || if ( artist.trimmed().isEmpty() ||
track.trimmed().isEmpty() ) track.trimmed().isEmpty() )
{ {
qDebug() << "Malformed HTTP resolve request"; tDebug( LOGVERBOSE ) << "Malformed HTTP resolve request";
return send404( event ); return send404( event );
} }
@@ -300,7 +300,7 @@ Api_v1::resolve( QxtWebRequestEvent* event )
void void
Api_v1::staticdata( QxtWebRequestEvent* event, const QString& str ) Api_v1::staticdata( QxtWebRequestEvent* event, const QString& str )
{ {
qDebug() << "STATIC request:" << event << str; tDebug( LOGVERBOSE ) << "STATIC request:" << event << str;
if ( str.contains( "tomahawk_auth_logo.png" ) ) if ( str.contains( "tomahawk_auth_logo.png" ) )
{ {
QFile f( RESPATH "www/tomahawk_banner_small.png" ); QFile f( RESPATH "www/tomahawk_banner_small.png" );
@@ -318,7 +318,7 @@ Api_v1::get_results( QxtWebRequestEvent* event )
{ {
if ( !event->url.hasQueryItem( "qid" ) ) if ( !event->url.hasQueryItem( "qid" ) )
{ {
tDebug() << "Malformed HTTP get_results request"; tDebug( LOGVERBOSE ) << "Malformed HTTP get_results request";
send404( event ); send404( event );
return; return;
} }
@@ -372,7 +372,7 @@ Api_v1::sendJSON( const QVariantMap& m, QxtWebRequestEvent* event )
e->contentType = ctype; e->contentType = ctype;
e->headers.insert( "Content-Length", QString::number( body.length() ) ); e->headers.insert( "Content-Length", QString::number( body.length() ) );
postEvent( e ); postEvent( e );
qDebug() << "JSON response" << event->url.toString() << body; tDebug( LOGVERBOSE ) << "JSON response" << event->url.toString() << body;
} }