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

Make JSResolver::escape public and use it from JSInfoPlugin

Browse Source
This commit is contained in:
Dominik Schmidt
2014-11-17 16:12:53 +01:00
parent de0fcab5f9
commit b3ace2f05a
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/resolvers/JSInfoPlugin.cpp
View File

@@ -59,7 +59,7 @@ JSInfoPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
.arg( d->id ) // infoPluginId .arg( d->id ) // infoPluginId
.arg( requestData.requestId ) // requestId .arg( requestData.requestId ) // requestId
.arg( requestData.type ) // type .arg( requestData.type ) // type
.arg( serializeQVariantMap( convertInfoStringHashToQVariantMap( requestData.input.value<Tomahawk::InfoSystem::InfoStringHash>() ) ) ); // infoHash .arg( JSResolver::escape( serializeQVariantMap( convertInfoStringHashToQVariantMap( requestData.input.value<Tomahawk::InfoSystem::InfoStringHash>() ) ) ) ); // infoHash
callMethodOnInfoPlugin( eval ); callMethodOnInfoPlugin( eval );
} }
@@ -73,8 +73,8 @@ JSInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
QString eval = QString( "pushInfo({ type: %1, pushFlags: %2, input: %3, additionalInput: %4})" ) QString eval = QString( "pushInfo({ type: %1, pushFlags: %2, input: %3, additionalInput: %4})" )
.arg( pushData.type ) .arg( pushData.type )
.arg( pushData.pushFlags ) .arg( pushData.pushFlags )
.arg( serializeQVariantMap ( pushData.infoPair.second.toMap() ) ) .arg( JSResolver::escape( serializeQVariantMap ( pushData.infoPair.second.toMap() ) ) )
.arg( serializeQVariantMap( pushData.infoPair.first ) ); .arg( JSResolver::escape( serializeQVariantMap( pushData.infoPair.first ) ) );
callMethodOnInfoPlugin( eval ); callMethodOnInfoPlugin( eval );
} }
@@ -93,7 +93,7 @@ JSInfoPlugin::notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tom
.arg( d->id ) .arg( d->id )
.arg( requestData.requestId ) .arg( requestData.requestId )
.arg( requestData.type ) .arg( requestData.type )
.arg( serializeQVariantMap( convertInfoStringHashToQVariantMap( criteria ) ) ); .arg( JSResolver::escape( serializeQVariantMap( convertInfoStringHashToQVariantMap( criteria ) ) ) );
callMethodOnInfoPlugin( eval ); callMethodOnInfoPlugin( eval );
} }

3
src/libtomahawk/resolvers/JSResolver.cpp
View File

@@ -1022,5 +1022,6 @@ JSResolver::callOnResolver( const QString& scriptSource )
QString JSResolver::escape( const QString& source ) QString JSResolver::escape( const QString& source )
{ {
return source.replace( "\\", "\\\\" ).replace( "'", "\\'" ); QString copy = source;
return copy.replace( "\\", "\\\\" ).replace( "'", "\\'" );
} }

9
src/libtomahawk/resolvers/JSResolver.h
View File

@@ -71,6 +71,10 @@ public:
*/ */
QVariant evaluateJavaScriptWithResult( const QString& scriptSource ); QVariant evaluateJavaScriptWithResult( const QString& scriptSource );
/**
* Escape \ and ' in strings so they are safe to use in JavaScript
*/
static QString escape( const QString& source );
public slots: public slots:
void resolve( const Tomahawk::query_ptr& query ) override; void resolve( const Tomahawk::query_ptr& query ) override;
@@ -111,11 +115,6 @@ private:
*/ */
QVariant evaluateJavaScriptInternal( const QString& scriptSource ); QVariant evaluateJavaScriptInternal( const QString& scriptSource );
/**
* Escape \ and ' in strings so they are safe to use in JavaScript
*/
static QString escape( const QString& source );
// encapsulate javascript calls // encapsulate javascript calls
QVariantMap resolverSettings(); QVariantMap resolverSettings();
QVariantMap resolverUserConfig(); QVariantMap resolverUserConfig();