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

First attempt at 0.9 js resolver API

Browse Source
This commit is contained in:
Anton Romanov
2015-09-09 22:49:16 -07:00
parent af06850f12
commit 1d750b25a9
6 changed files with 707 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,7 +711,13 @@ JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QStr
if ( m_urlCallbackIsAsync )
{
QString qid = uuid();
QString getUrl = QString( "Tomahawk.resolver.instance.%1( '%2', '%3' );" ).arg( m_urlCallback )
QString getUrl = QString(
"if(Tomahawk.resolver.instance['_adapter_%1']) {"
" Tomahawk.resolver.instance._adapter_%1( {qid: '%2', url: '%3'} );"
"} else {"
" Tomahawk.resolver.instance.%1( {qid: '%2', url: '%3'} );"
"}"
).arg( m_urlCallback )
.arg( qid )
.arg( url );

2
src/libtomahawk/resolvers/ScriptAccount.cpp
View File

@@ -145,7 +145,7 @@ ScriptAccount::invoke( const scriptobject_ptr& scriptObject, const QString& meth
void
ScriptAccount::reportScriptJobResult( const QVariantMap& result )
{
tLog() << Q_FUNC_INFO << result;
//tLog() << Q_FUNC_INFO << result;
const QString requestId = result[ "requestId" ].toString();
Q_ASSERT( !requestId.isEmpty() );

2
src/libtomahawk/resolvers/ScriptCommand_AllTracks.cpp
View File

@@ -106,7 +106,7 @@ ScriptCommand_AllTracks::onTracksJobDone( const QVariantMap& result )
ScriptJob* job = qobject_cast< ScriptJob* >( sender() );
Q_ASSERT( job );
qDebug() << "Resolver reporting album tracks:" << result;
//qDebug() << "Resolver reporting album tracks:" << result;
if ( job->error() )
{

2
src/libtomahawk/resolvers/ScriptEngine.cpp
View File

@@ -49,6 +49,8 @@ ScriptEngine::ScriptEngine( JSAccount* parent )
settings()->setAttribute( QWebSettings::LocalStorageDatabaseEnabled, true );
settings()->setAttribute( QWebSettings::LocalContentCanAccessFileUrls, true );
settings()->setAttribute( QWebSettings::LocalContentCanAccessRemoteUrls, true );
settings()->setOfflineStorageDefaultQuota(100 * 1024 * 1024 /* 100 Mb */);
settings()->setOfflineWebApplicationCacheQuota(100 * 1024 * 1024 /* 100 Mb */);
// HACK
QStringList cmdArgs = QCoreApplication::instance()->arguments();

4
src/tomahawk/TomahawkApp.cpp
View File

@@ -171,6 +171,10 @@ TomahawkApp::init()
tLog() << "Starting Tomahawk...";
QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
//QWebSettings::setOfflineStoragePath(QLatin1String("/tmp"));
m_headless = true;
m_headless = arguments().contains( "--headless" );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );