From cefa97af1851c1475b71c6292bee9a156b7b7439 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 1 Dec 2014 23:54:50 +0100
Subject: [PATCH] Add name() to JSPlugin.

This is more of a hack until JSResolver is ported to be a ScriptResolver
---
 src/libtomahawk/resolvers/JSInfoPlugin.cpp |  2 +-
 src/libtomahawk/resolvers/JSPlugin.cpp     | 10 +++++++++-
 src/libtomahawk/resolvers/JSPlugin.h       |  6 +++++-
 src/libtomahawk/resolvers/JSResolver.cpp   |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/libtomahawk/resolvers/JSInfoPlugin.cpp b/src/libtomahawk/resolvers/JSInfoPlugin.cpp
index e16010190..6e7fc365b 100644
--- a/src/libtomahawk/resolvers/JSInfoPlugin.cpp
+++ b/src/libtomahawk/resolvers/JSInfoPlugin.cpp
@@ -35,7 +35,7 @@ JSInfoPlugin::JSInfoPlugin( int id, JSPlugin *resolver )
     m_supportedGetTypes = parseSupportedTypes( callMethodOnInfoPluginWithResult( "supportedGetTypes" ) );
     m_supportedPushTypes = parseSupportedTypes( callMethodOnInfoPluginWithResult( "supportedPushTypes" ) );
 
-    setFriendlyName( QString( "JSInfoPlugin: %1" ) ); // TODO: .arg( resolver->name() )
+    setFriendlyName( QString( "JSInfoPlugin: %1" ).arg( resolver->name() ) );
 }
 
 
diff --git a/src/libtomahawk/resolvers/JSPlugin.cpp b/src/libtomahawk/resolvers/JSPlugin.cpp
index eadd9e199..c3b233ea9 100644
--- a/src/libtomahawk/resolvers/JSPlugin.cpp
+++ b/src/libtomahawk/resolvers/JSPlugin.cpp
@@ -30,8 +30,9 @@
 
 using namespace Tomahawk;
 
-JSPlugin::JSPlugin()
+JSPlugin::JSPlugin( const QString& name )
     : m_engine( new ScriptEngine( this ) )
+    , m_name( name )
 {
 }
 
@@ -123,3 +124,10 @@ JSPlugin::startJob( ScriptJob* scriptJob )
 
     evaluateJavaScript( eval );
 }
+
+
+const QString
+JSPlugin::name() const
+{
+    return m_name;
+}
diff --git a/src/libtomahawk/resolvers/JSPlugin.h b/src/libtomahawk/resolvers/JSPlugin.h
index 98fc05e4f..263c59a9e 100644
--- a/src/libtomahawk/resolvers/JSPlugin.h
+++ b/src/libtomahawk/resolvers/JSPlugin.h
@@ -40,10 +40,13 @@ class DLLEXPORT JSPlugin : public ScriptPlugin
     Q_OBJECT
 
 public:
-    JSPlugin();
+    // HACK: needs refactoring
+    JSPlugin( const QString& name );
 
     void startJob( ScriptJob* scriptJob ) override;
 
+    const QString name() const;
+
     /**
         *  Evaluate JavaScript on the WebKit thread
         */
@@ -73,6 +76,7 @@ private:
     QVariant evaluateJavaScriptInternal( const QString& scriptSource );
 
     std::unique_ptr<ScriptEngine> m_engine;
+    QString m_name;
 
 };
 
diff --git a/src/libtomahawk/resolvers/JSResolver.cpp b/src/libtomahawk/resolvers/JSResolver.cpp
index 6a1c4b087..9dcb3d678 100644
--- a/src/libtomahawk/resolvers/JSResolver.cpp
+++ b/src/libtomahawk/resolvers/JSResolver.cpp
@@ -64,8 +64,8 @@ JSResolver::JSResolver( const QString& accountId, const QString& scriptPath, con
     Q_D( JSResolver );
     tLog() << Q_FUNC_INFO << "Loading JS resolver:" << scriptPath;
 
-    d->scriptPlugin = new JSPlugin();
     d->name = QFileInfo( filePath() ).baseName();
+    d->scriptPlugin = new JSPlugin( d->name );
 
     // set the icon, if we launch properly we'll get the icon the resolver reports
     d->icon = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, QSize( 128, 128 ) );