Implement request / script uuids

data/js/tomahawk.js

@@ -595,8 +595,7 @@ Tomahawk.PluginManager = {
     objects: {},
     identifyObject: function (object) {
         if( object.id === undefined ) {
-            // FIXME: get a proper unique id
+            object.id = Tomahawk.uuid();
-            object.id = "foobar";
         }
 
         return object.id;

src/libtomahawk/resolvers/JSResolverHelper.cpp

@@ -272,6 +272,13 @@ JSResolverHelper::instanceUUID()
 }
 
 
+QString
+JSResolverHelper::uuid() const
+{
+    return ::uuid();
+}
+
+
 void
 JSResolverHelper::addUrlResult( const QString& url, const QVariantMap& result )
 {

src/libtomahawk/resolvers/JSResolverHelper.h

@@ -126,7 +126,7 @@ public slots:
     QString readBase64( const QString& fileName );
     QString readCompressed( const QString& fileName );
     QString instanceUUID();
-
+    QString uuid() const;
     QString compress( const QString& data );
     QVariantMap resolverData();
 

src/libtomahawk/resolvers/ScriptObject.cpp

@@ -22,14 +22,10 @@
 
 using namespace Tomahawk;
 
-ScriptObject::ScriptObject( ScriptPlugin* parent )
+ScriptObject::ScriptObject( const QString& id, ScriptPlugin* parent )
     : QObject( parent )
-    , d_ptr( new ScriptObjectPrivate( this, parent ))
+    , d_ptr( new ScriptObjectPrivate( this, id, parent ))
 {
-    Q_D( ScriptObject );
-
-    // TODO:retrieve id from ScriptPlugin
-    d->id = "foobar";
 }
 
 

src/libtomahawk/resolvers/ScriptObject.h

@@ -37,7 +37,7 @@ friend class JSPlugin;
 friend class ScriptJob;
 
 public:
-    ScriptObject( ScriptPlugin* parent );
+    ScriptObject( const QString& id, ScriptPlugin* parent );
     virtual ~ScriptObject();
 
     ScriptJob* invoke( const QString& methodName, const QVariantMap& arguments );

src/libtomahawk/resolvers/ScriptObject_p.h

@@ -28,8 +28,9 @@ class ScriptObjectPrivate
 {
     friend class ScriptObject;
 public:
-    ScriptObjectPrivate( ScriptObject* q, ScriptPlugin* scriptPlugin )
+    ScriptObjectPrivate( ScriptObject* q, const QString& id, ScriptPlugin* scriptPlugin )
         : q_ptr ( q )
+        , id( id )
         , scriptPlugin( scriptPlugin )
     {
     }

src/libtomahawk/resolvers/ScriptPlugin.cpp

@@ -31,8 +31,7 @@ using namespace Tomahawk;
 static QString
 requestIdGenerator()
 {
-    //FIXME: create a proper requestId
+    return uuid();
-    return "somerequestId";
 }
 
 
@@ -85,7 +84,7 @@ ScriptPlugin::registerScriptPlugin( const QString& type, const QString& objectId
     ScriptObject* object = m_objects.value( objectId );
     if( !object )
     {
-        object = new ScriptObject( this );
+        object = new ScriptObject( objectId, this );
         m_objects.insert( objectId, object );
     }