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

Style fixes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-04-08 03:05:33 +02:00
parent 65cccb7b55
commit da0d585d53
5 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libtomahawk/audio/Qnr_IoDeviceStream.cpp
View File

@@ -38,8 +38,9 @@ QNR_IODeviceStream::QNR_IODeviceStream( const QSharedPointer<QNetworkReply>& rep
{ {
m_type = MediaStream::Stream; m_type = MediaStream::Stream;
if ( !m_networkReply->isOpen() ) { if ( !m_networkReply->isOpen() )
m_networkReply->open(QIODevice::ReadOnly); {
m_networkReply->open( QIODevice::ReadOnly );
} }
Q_ASSERT( m_networkReply->isOpen() ); Q_ASSERT( m_networkReply->isOpen() );
@@ -82,7 +83,7 @@ QNR_IODeviceStream::seekStream( qint64 offset )
qint64 qint64
QNR_IODeviceStream::needData ( void** buffer ) QNR_IODeviceStream::needData( void** buffer )
{ {
QMutexLocker locker( &m_mutex ); QMutexLocker locker( &m_mutex );
QByteArray data = m_data.mid( m_pos, BLOCK_SIZE ); QByteArray data = m_data.mid( m_pos, BLOCK_SIZE );
@@ -93,18 +94,16 @@ QNR_IODeviceStream::needData ( void** buffer )
endOfData(); endOfData();
return 0; return 0;
} }
*buffer = new char[data.size()]; *buffer = new char[data.size()];
memcpy(*buffer, data.data(), data.size()); memcpy(*buffer, data.data(), data.size());
return data.size(); return data.size();
} }
void void
QNR_IODeviceStream::readyRead() QNR_IODeviceStream::readyRead()
{ {
QMutexLocker locker( &m_mutex ); QMutexLocker locker( &m_mutex );
m_data += m_networkReply->readAll(); m_data += m_networkReply->readAll();
} }
// vim: sw=4 sts=4 et tw=100

2
src/libtomahawk/audio/Qnr_IoDeviceStream.h
View File

@@ -47,7 +47,7 @@ public:
~QNR_IODeviceStream(); ~QNR_IODeviceStream();
virtual void seekStream( qint64 offset ); virtual void seekStream( qint64 offset );
virtual qint64 needData ( void** buffer ); virtual qint64 needData( void** buffer );
private slots: private slots:
void readyRead(); void readyRead();

57
src/libtomahawk/resolvers/JSResolverHelper.cpp
View File

@@ -1,6 +1,6 @@
/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> === /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
* *
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org> * Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
* Copyright 2010-2011, Leo Franchi <lfranchi@kde.org> * Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
* Copyright 2013, Teo Mrnjavac <teo@kde.org> * Copyright 2013, Teo Mrnjavac <teo@kde.org>
* Copyright 2013, Uwe L. Korn <uwelk@xhochy.com> * Copyright 2013, Uwe L. Korn <uwelk@xhochy.com>
@@ -693,7 +693,7 @@ JSResolverHelper::reportStreamUrl( const QString& qid, const QString& streamUrl
} }
void JSResolverHelper::nativeAssert(bool assertion, const QString& message) void JSResolverHelper::nativeAssert( bool assertion, const QString& message )
{ {
if ( !assertion ) if ( !assertion )
{ {
@@ -703,7 +703,6 @@ void JSResolverHelper::nativeAssert(bool assertion, const QString& message)
} }
void void
JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url, JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
std::function< void( const QString&, QSharedPointer< QIODevice >& ) > callback ) std::function< void( const QString&, QSharedPointer< QIODevice >& ) > callback )
@@ -732,8 +731,7 @@ JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QStr
void void
JSResolverHelper::reportStreamUrl( const QString& qid, JSResolverHelper::reportStreamUrl( const QString& qid, const QString& streamUrl, const QVariantMap& headers )
const QString& streamUrl, const QVariantMap& headers )
{ {
if ( !m_streamCallbacks.contains( qid ) ) if ( !m_streamCallbacks.contains( qid ) )
return; return;
@@ -741,9 +739,11 @@ JSResolverHelper::reportStreamUrl( const QString& qid,
std::function< void( const QString&, QSharedPointer< QIODevice >& ) > callback = m_streamCallbacks.take( qid ); std::function< void( const QString&, QSharedPointer< QIODevice >& ) > callback = m_streamCallbacks.take( qid );
QMap<QString, QString> parsedHeaders; QMap<QString, QString> parsedHeaders;
foreach ( const QString& key, headers.keys()) { foreach ( const QString& key, headers.keys() )
{
Q_ASSERT_X( headers[key].canConvert( QVariant::String ), Q_FUNC_INFO, "Expected a Map of string for additional headers" ); Q_ASSERT_X( headers[key].canConvert( QVariant::String ), Q_FUNC_INFO, "Expected a Map of string for additional headers" );
if ( headers[key].canConvert( QVariant::String ) ) { if ( headers[key].canConvert( QVariant::String ) )
{
parsedHeaders.insert( key, headers[key].toString() ); parsedHeaders.insert( key, headers[key].toString() );
} }
} }
@@ -771,14 +771,14 @@ JSResolverHelper::nativeRetrieveMetadata( int metadataId, const QString& url,
if ( options.contains( "headers" ) && options["headers"].canConvert( QVariant::Map ) ) if ( options.contains( "headers" ) && options["headers"].canConvert( QVariant::Map ) )
{ {
const QVariantMap variantHeaders = options["headers"].toMap(); const QVariantMap variantHeaders = options["headers"].toMap();
foreach ( const QString& key, variantHeaders.keys() ) { foreach ( const QString& key, variantHeaders.keys() )
{
headers.insert( key, variantHeaders[key].toString() ); headers.insert( key, variantHeaders[key].toString() );
} }
} }
// TODO: Add heuristic if size is not defined // TODO: Add heuristic if size is not defined
CloudStream stream( url, sizehint, headers, CloudStream stream( url, sizehint, headers, Tomahawk::Utils::nam() );
Tomahawk::Utils::nam() );
stream.Precache(); stream.Precache();
QScopedPointer<TagLib::File> tag; QScopedPointer<TagLib::File> tag;
if ( mime_type == "audio/mpeg" ) if ( mime_type == "audio/mpeg" )
@@ -897,7 +897,8 @@ JSResolverHelper::nativeAsyncRequest( const int requestId, const QString& url,
const QVariantMap& options ) const QVariantMap& options )
{ {
QNetworkRequest req( url ); QNetworkRequest req( url );
foreach ( const QString& key , headers.keys() ) { foreach ( const QString& key, headers.keys() )
{
req.setRawHeader( key.toLatin1(), headers[key].toString().toLatin1() ); req.setRawHeader( key.toLatin1(), headers[key].toString().toLatin1() );
} }
@@ -915,19 +916,25 @@ JSResolverHelper::nativeAsyncRequest( const int requestId, const QString& url,
} }
NetworkReply* reply = NULL; NetworkReply* reply = NULL;
if ( options.contains( "method") && options["method"].toString().toUpper() == "POST" ) { if ( options.contains( "method") && options["method"].toString().toUpper() == "POST" )
{
QByteArray data; QByteArray data;
if ( options.contains( "data" ) ) { if ( options.contains( "data" ) )
{
data = options["data"].toString().toLatin1(); data = options["data"].toString().toLatin1();
} }
reply = new NetworkReply( Tomahawk::Utils::nam()->post( req, data ) ); reply = new NetworkReply( Tomahawk::Utils::nam()->post( req, data ) );
} else if ( options.contains( "method") && options["method"].toString().toUpper() == "HEAD" ) { }
else if ( options.contains( "method") && options["method"].toString().toUpper() == "HEAD" )
{
reply = new NetworkReply( Tomahawk::Utils::nam()->head( req ) ); reply = new NetworkReply( Tomahawk::Utils::nam()->head( req ) );
} else { }
else
{
reply = new NetworkReply( Tomahawk::Utils::nam()->get( req ) ); reply = new NetworkReply( Tomahawk::Utils::nam()->get( req ) );
} }
NewClosure( reply , SIGNAL( finished() ), this, SLOT( nativeAsyncRequestDone( int, NetworkReply* ) ), requestId, reply ); NewClosure( reply, SIGNAL( finished() ), this, SLOT( nativeAsyncRequestDone( int, NetworkReply* ) ), requestId, reply );
} }
@@ -1017,7 +1024,7 @@ JSResolverHelper::createFuzzyIndex( const QVariantList& list )
} }
else else
{ {
m_resolver->d_func()->fuzzyIndex.reset( new FuzzyIndex( m_resolver, accountId() + ".lucene" , true ) ); m_resolver->d_func()->fuzzyIndex.reset( new FuzzyIndex( m_resolver, accountId() + ".lucene", true ) );
} }
addToFuzzyIndex( list ); addToFuzzyIndex( list );
@@ -1038,7 +1045,8 @@ JSResolverHelper::addToFuzzyIndex( const QVariantList& list )
foreach ( const QVariant& variant, list ) foreach ( const QVariant& variant, list )
{ {
// Convert each entry to IndexData // Convert each entry to IndexData
if ( variant.canConvert( QVariant::Map ) ) { if ( variant.canConvert( QVariant::Map ) )
{
QVariantMap map = variant.toMap(); QVariantMap map = variant.toMap();
// Convert each entry and do multiple checks that we have valid data. // Convert each entry and do multiple checks that we have valid data.
@@ -1056,7 +1064,7 @@ JSResolverHelper::addToFuzzyIndex( const QVariantList& list )
bool bool
cmpTuple ( const QVariant& x, const QVariant& y ) cmpTuple( const QVariant& x, const QVariant& y )
{ {
return x.toList().at( 1 ).toFloat() < y.toList().at( 1 ).toFloat(); return x.toList().at( 1 ).toFloat() < y.toList().at( 1 ).toFloat();
} }
@@ -1071,7 +1079,8 @@ JSResolverHelper::searchInFuzzyIndex( const query_ptr& query )
// Convert map to sorted QVariantList // Convert map to sorted QVariantList
QVariantList list; QVariantList list;
foreach ( int id, map.keys() ) { foreach ( int id, map.keys() )
{
QVariantList innerList; QVariantList innerList;
innerList.append( QVariant( id ) ); innerList.append( QVariant( id ) );
innerList.append( QVariant( map[id] ) ); innerList.append( QVariant( map[id] ) );
@@ -1098,7 +1107,8 @@ JSResolverHelper::resolveFromFuzzyIndex( const QString& artist, const QString& a
{ {
// Important: Do not autoresolve! // Important: Do not autoresolve!
query_ptr query = Query::get( artist, track, album, QString(), false ); query_ptr query = Query::get( artist, track, album, QString(), false );
if ( query.isNull() ) { if ( query.isNull() )
{
tLog() << Q_FUNC_INFO << "Could not create a query for" << artist << "-" << track; tLog() << Q_FUNC_INFO << "Could not create a query for" << artist << "-" << track;
return QVariantList(); return QVariantList();
} }
@@ -1140,13 +1150,14 @@ JSResolverHelper::returnStreamUrl( const QString& streamUrl, const QMap<QString,
{ {
QUrl url = QUrl::fromEncoded( streamUrl.toUtf8() ); QUrl url = QUrl::fromEncoded( streamUrl.toUtf8() );
QNetworkRequest req( url ); QNetworkRequest req( url );
foreach ( const QString& key , headers.keys() ) { foreach ( const QString& key, headers.keys() )
{
req.setRawHeader( key.toLatin1(), headers[key].toLatin1() ); req.setRawHeader( key.toLatin1(), headers[key].toLatin1() );
} }
tDebug() << "Creating a QNetowrkReply with url:" << req.url().toString(); tDebug() << "Creating a QNetowrkReply with url:" << req.url().toString();
NetworkReply* reply = new NetworkReply( Tomahawk::Utils::nam()->get( req ) ); NetworkReply* reply = new NetworkReply( Tomahawk::Utils::nam()->get( req ) );
NewClosure( reply , SIGNAL( finalUrlReached() ), this, SLOT( gotStreamUrl( IODeviceCallback, NetworkReply* )), callback, reply ); NewClosure( reply, SIGNAL( finalUrlReached() ), this, SLOT( gotStreamUrl( IODeviceCallback, NetworkReply* )), callback, reply );
} }
} }

1
src/libtomahawk/resolvers/ScriptInfoPlugin.cpp
View File

@@ -70,7 +70,6 @@ ScriptInfoPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
{ {
Q_D( ScriptInfoPlugin ); Q_D( ScriptInfoPlugin );
QVariantMap arguments; QVariantMap arguments;
arguments[ "type" ] = requestData.type; arguments[ "type" ] = requestData.type;
arguments[ "data" ] = convertInfoStringHashToQVariantMap( requestData.input.value<Tomahawk::InfoSystem::InfoStringHash>() ); arguments[ "data" ] = convertInfoStringHashToQVariantMap( requestData.input.value<Tomahawk::InfoSystem::InfoStringHash>() );

1
src/libtomahawk/utils/ShortLinkHelper.cpp
View File

@@ -154,6 +154,7 @@ ShortLinkHelper::shortLinkRequestFinished( const playlist_ptr& playlist )
d->reply->deleteLater(); d->reply->deleteLater();
} }
void void
ShortLinkHelper::shortenLinkRequestFinished() ShortLinkHelper::shortenLinkRequestFinished()
{ {