mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-18 20:04:00 +02:00
Code Issues Releases Wiki Activity

Deprecate old resolver API

Browse Source
This commit is contained in:
Uwe L. Korn
2014-05-23 19:12:55 +01:00
parent 8ed4c3a43f
commit 796be81f14
1 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,28 +47,13 @@
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QImageReader> #include <QImageReader>
#include <QMessageBox>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#include <QMetaProperty> #include <QMetaProperty>
#include <QCryptographicHash>
#include <QSslError>
#include <QWebFrame> #include <QWebFrame>
#ifdef QCA2_FOUND
#include <QtCrypto>
#endif
#include <boost/bind.hpp> #include <boost/bind.hpp>
// FIXME: bloody hack, remove this for 0.3
// this one adds new functionality to old resolvers
#define RESOLVER_LEGACY_CODE "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : TomahawkResolver;"
// this one keeps old code invokable
#define RESOLVER_LEGACY_CODE2 "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : window;"
JSResolver::JSResolver( const QString& scriptPath, const QStringList& additionalScriptPaths ) JSResolver::JSResolver( const QString& scriptPath, const QStringList& additionalScriptPaths )
: Tomahawk::ExternalResolverGui( scriptPath ) : Tomahawk::ExternalResolverGui( scriptPath )
, d_ptr( new JSResolverPrivate( this, scriptPath, additionalScriptPaths ) ) , d_ptr( new JSResolverPrivate( this, scriptPath, additionalScriptPaths ) )
@@ -342,7 +327,7 @@ JSResolver::artists( const Tomahawk::collection_ptr& collection )
return; return;
} }
QString eval = QString( "resolver.artists( '%1' );" ) QString eval = QString( "Tomahawk.resolver.instance.artists( '%1' );" )
.arg( collection->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ); .arg( collection->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) );
QVariantMap m = d->engine->mainFrame()->evaluateJavaScript( eval ).toMap(); QVariantMap m = d->engine->mainFrame()->evaluateJavaScript( eval ).toMap();
@@ -378,7 +363,7 @@ JSResolver::albums( const Tomahawk::collection_ptr& collection, const Tomahawk::
return; return;
} }
QString eval = QString( "resolver.albums( '%1', '%2' );" ) QString eval = QString( "Tomahawk.resolver.instance.albums( '%1', '%2' );" )
.arg( collection->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( collection->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
.arg( artist->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ); .arg( artist->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) );
@@ -415,7 +400,7 @@ JSResolver::tracks( const Tomahawk::collection_ptr& collection, const Tomahawk::
return; return;
} }
QString eval = QString( "resolver.tracks( '%1', '%2', '%3' );" ) QString eval = QString( "Tomahawk.resolver.instance.tracks( '%1', '%2', '%3' );" )
.arg( collection->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( collection->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
.arg( album->artist()->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( album->artist()->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
.arg( album->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ); .arg( album->name().replace( "\\", "\\\\" ).replace( "'", "\\'" ) );
@@ -448,7 +433,7 @@ JSResolver::canParseUrl( const QString& url, UrlType type )
if ( d->capabilities.testFlag( UrlLookup ) ) if ( d->capabilities.testFlag( UrlLookup ) )
{ {
QString eval = QString( "resolver.canParseUrl( '%1', %2 );" ) QString eval = QString( "Tomahawk.resolver.instance.canParseUrl( '%1', %2 );" )
.arg( QString( url ).replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( QString( url ).replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
.arg( (int) type ); .arg( (int) type );
return d->engine->mainFrame()->evaluateJavaScript( eval ).toBool(); return d->engine->mainFrame()->evaluateJavaScript( eval ).toBool();
@@ -479,7 +464,7 @@ JSResolver::lookupUrl( const QString& url )
return; return;
} }
QString eval = QString( "resolver.lookupUrl( '%1' );" ) QString eval = QString( "Tomahawk.resolver.instance.lookupUrl( '%1' );" )
.arg( QString( url ).replace( "\\", "\\\\" ).replace( "'", "\\'" ) ); .arg( QString( url ).replace( "\\", "\\\\" ).replace( "'", "\\'" ) );
QVariantMap m = d->engine->mainFrame()->evaluateJavaScript( eval ).toMap(); QVariantMap m = d->engine->mainFrame()->evaluateJavaScript( eval ).toMap();
@@ -518,7 +503,7 @@ JSResolver::resolve( const Tomahawk::query_ptr& query )
QString eval; QString eval;
if ( !query->isFullTextQuery() ) if ( !query->isFullTextQuery() )
{ {
eval = QString( RESOLVER_LEGACY_CODE2 "resolver.resolve( '%1', '%2', '%3', '%4' );" ) eval = QString( "Tomahawk.resolver.instance.resolve( '%1', '%2', '%3', '%4' );" )
.arg( query->id().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( query->id().replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
.arg( query->queryTrack()->artist().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( query->queryTrack()->artist().replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
.arg( query->queryTrack()->album().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( query->queryTrack()->album().replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
@@ -526,12 +511,7 @@ JSResolver::resolve( const Tomahawk::query_ptr& query )
} }
else else
{ {
eval = QString( "if(Tomahawk.resolver.instance !== undefined) {" eval = QString( "Tomahawk.resolver.instance.search( '%1', '%2' );" )
" resolver.search( '%1', '%2' );"
"} else {"
" resolve( '%1', '', '', '%2' );"
"}"
)
.arg( query->id().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ) .arg( query->id().replace( "\\", "\\\\" ).replace( "'", "\\'" ) )
.arg( query->fullTextQuery().replace( "\\", "\\\\" ).replace( "'", "\\'" ) ); .arg( query->fullTextQuery().replace( "\\", "\\\\" ).replace( "'", "\\'" ) );
} }
@@ -681,7 +661,7 @@ JSResolver::loadUi()
{ {
Q_D( JSResolver ); Q_D( JSResolver );
QVariantMap m = d->engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.getConfigUi();" ).toMap(); QVariantMap m = d->engine->mainFrame()->evaluateJavaScript( "Tomahawk.resolver.instance.getConfigUi();" ).toMap();
d->dataWidgets = m["fields"].toList(); d->dataWidgets = m["fields"].toList();
bool compressed = m.value( "compressed", "false" ).toBool(); bool compressed = m.value( "compressed", "false" ).toBool();
@@ -732,7 +712,7 @@ JSResolver::saveConfig()
// qDebug() << Q_FUNC_INFO << saveData; // qDebug() << Q_FUNC_INFO << saveData;
d->resolverHelper->setResolverConfig( saveData.toMap() ); d->resolverHelper->setResolverConfig( saveData.toMap() );
d->engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.saveUserConfig();" ); d->engine->mainFrame()->evaluateJavaScript( "Tomahawk.resolver.instance.saveUserConfig();" );
} }
@@ -828,7 +808,7 @@ JSResolver::loadCollections()
if ( d->capabilities.testFlag( Browsable ) ) if ( d->capabilities.testFlag( Browsable ) )
{ {
QVariantMap collectionInfo = d->engine->mainFrame()->evaluateJavaScript( "resolver.collection();" ).toMap(); QVariantMap collectionInfo = d->engine->mainFrame()->evaluateJavaScript( "Tomahawk.resolver.instance.collection();" ).toMap();
if ( collectionInfo.isEmpty() || if ( collectionInfo.isEmpty() ||
!collectionInfo.contains( "prettyname" ) || !collectionInfo.contains( "prettyname" ) ||
!collectionInfo.contains( "description" ) ) !collectionInfo.contains( "description" ) )
@@ -926,7 +906,7 @@ JSResolver::resolverSettings()
{ {
Q_D( JSResolver ); Q_D( JSResolver );
return d->engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "if(resolver.settings) resolver.settings; else getSettings(); " ).toMap(); return d->engine->mainFrame()->evaluateJavaScript( "Tomahawk.resolver.instance.settings;" ).toMap();
} }
@@ -935,7 +915,7 @@ JSResolver::resolverUserConfig()
{ {
Q_D( JSResolver ); Q_D( JSResolver );
return d->engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.getUserConfig();" ).toMap(); return d->engine->mainFrame()->evaluateJavaScript( "Tomahawk.resolver.instance.getUserConfig();" ).toMap();
} }
@@ -944,7 +924,7 @@ JSResolver::resolverInit()
{ {
Q_D( JSResolver ); Q_D( JSResolver );
return d->engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.init();" ).toMap(); return d->engine->mainFrame()->evaluateJavaScript( "Tomahawk.resolver.instance.init();" ).toMap();
} }