Merge branch 'master' of https://github.com/tomahawk-player/tomahawk

src/libtomahawk/AlbumPlaylistInterface.cpp

@@ -114,6 +114,10 @@ AlbumPlaylistInterface::tracks()
             connect( Tomahawk::InfoSystem::InfoSystem::instance(),
                     SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                     SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+
+            connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                    SIGNAL( finished( QString ) ),
+                    SLOT( infoSystemFinished( QString ) ) );
         }
         else if ( m_mode == DatabaseMode && !m_databaseLoaded )
         {
@@ -178,9 +182,24 @@ AlbumPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData re
         }
     }
 
+    if ( !m_queries.isEmpty() )
+    {
+        infoSystemFinished( id() );
+    }
+}
+
+
+void
+AlbumPlaylistInterface::infoSystemFinished( const QString& infoId )
+{
+    if ( infoId != id() )
+        return;
+
     m_infoSystemLoaded = true;
     disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
                 this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+    disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
+                this, SLOT( infoSystemFinished( QString ) ) );
 
     if ( m_queries.isEmpty() && m_mode == Mixed )
     {

src/libtomahawk/AlbumPlaylistInterface.h

@@ -61,6 +61,7 @@ signals:
 private slots:
     void onTracksLoaded( const QList< Tomahawk::query_ptr >& tracks );
     void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( const QString& infoId );
 
 private:
     QList< Tomahawk::query_ptr > m_queries;

src/libtomahawk/accounts/spotify/SpotifyAccount.cpp

@@ -564,8 +564,12 @@ SpotifyAccount::resolverMessage( const QString &msgType, const QVariantMap &msg
         QObject* receiver = m_qidToSlotMap[ qid ].first;
         QString slot = m_qidToSlotMap[ qid ].second;
         m_qidToSlotMap.remove( qid );
+        
+        QVariant extraData;
+        if ( m_qidToExtraData.contains( qid ) )
+            extraData = m_qidToExtraData.take( qid );
 
-        QMetaObject::invokeMethod( receiver, slot.toLatin1(), Q_ARG( QString, msgType ), Q_ARG( QVariantMap, msg ) );
+        QMetaObject::invokeMethod( receiver, slot.toLatin1(), Q_ARG( QString, msgType ), Q_ARG( QVariantMap, msg ), Q_ARG( QVariant, extraData ) );
     }
     else if ( msgType == "allPlaylists" )
     {
@@ -911,7 +915,7 @@ SpotifyAccount::startPlaylistSync( SpotifyPlaylistInfo* playlist )
 
 
 void
-SpotifyAccount::startPlaylistSyncWithPlaylist( const QString& msgType, const QVariantMap& msg )
+SpotifyAccount::startPlaylistSyncWithPlaylist( const QString& msgType, const QVariantMap& msg, const QVariant& )
 {
     Q_UNUSED( msgType );
     qDebug() << Q_FUNC_INFO <<  "Got full spotify playlist body, creating a tomahawk playlist and enabling sync!!";
@@ -959,7 +963,7 @@ SpotifyAccount::startPlaylistSyncWithPlaylist( const QString& msgType, const QVa
 
 
 void
-SpotifyAccount::playlistCreated( const QString& msgType, const QVariantMap& msg )
+SpotifyAccount::playlistCreated( const QString& msgType, const QVariantMap& msg, const QVariant& )
 {
     Q_UNUSED( msgType );
 
@@ -990,20 +994,20 @@ SpotifyAccount::playlistCreated( const QString& msgType, const QVariantMap& msg
 
 
 QString
-SpotifyAccount::sendMessage( const QVariantMap &m, QObject* obj, const QString& slot )
+SpotifyAccount::sendMessage( const QVariantMap &m, QObject* obj, const QString& slot, const QVariant& extraData )
 {
     QVariantMap msg = m;
-    QString qid;
+    const QString qid = uuid();
 
     if ( obj )
     {
-        qid = QUuid::createUuid().toString().replace( "{", "" ).replace( "}", "" );
-
         m_qidToSlotMap[ qid ] = qMakePair( obj, slot );
         msg[ "qid" ] = qid;
 
     }
 
+    m_qidToExtraData[ qid ] = extraData;
+    
     m_spotifyResolver.data()->sendMessage( msg );
 
     return qid;

src/libtomahawk/accounts/spotify/SpotifyAccount.h

@@ -99,7 +99,6 @@ public:
     virtual SipPlugin* sipPlugin() { return 0; }
     virtual bool preventEnabling() const { return m_preventEnabling; }
 
-    QString sendMessage( const QVariantMap& msg, QObject* receiver = 0, const QString& slot = QString() );
 
     void registerUpdaterForPlaylist( const QString& plId, SpotifyPlaylistUpdater* updater );
     void unregisterUpdater( const QString& plid );
@@ -111,6 +110,8 @@ public:
     bool loggedIn() const;
 
 public slots:
+    QString sendMessage( const QVariantMap& msg, QObject* receiver = 0, const QString& slot = QString(), const QVariant& extraData = QVariant() );
+    
     void aboutToShow( QAction* action, const Tomahawk::playlist_ptr& playlist );
     void syncActionTriggered( bool );
     void atticaLoaded(Attica::Content::List);
@@ -125,9 +126,9 @@ private slots:
     void logout();
 
     // SpotifyResolver message handlers, all take msgtype, msg as argument
-  //  void <here>( const QString& msgType, const QVariantMap& msg );
+  //  void <here>( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
-    void startPlaylistSyncWithPlaylist( const QString& msgType, const QVariantMap& msg );
+    void startPlaylistSyncWithPlaylist( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
-    void playlistCreated( const QString& msgType, const QVariantMap& msg );
+    void playlistCreated( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
 
     void delayedInit();
     void hookupAfterDeletion( bool autoEnable );
@@ -156,6 +157,7 @@ private:
     QWeakPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin;
 
     QMap<QString, QPair<QObject*, QString> > m_qidToSlotMap;
+    QMap<QString, QVariant > m_qidToExtraData;
 
     // List of synced spotify playlists in config UI
     QList< SpotifyPlaylistInfo* > m_allSpotifyPlaylists;

src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp

@@ -103,9 +103,10 @@ SpotifyInfoPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requ
             message[ "artist" ] = artist;
             message[ "album" ] = album;
 
-            const QString qid = m_account.data()->sendMessage( message, this, "albumListingResult" );
+            QMetaObject::invokeMethod( m_account.data(), "sendMessage", Qt::QueuedConnection, Q_ARG( QVariantMap, message ),
-
+                                                                                              Q_ARG( QObject*, this ),
-            m_waitingForResults[ qid ] = requestData;
+                                                                                              Q_ARG( QString, "albumListingResult" ),
+                                                                                              Q_ARG( QVariant, QVariant::fromValue< InfoRequestData >( requestData ) ) );
         }
         break;
     }
@@ -119,15 +120,12 @@ SpotifyInfoPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requ
 
 
 void
-SpotifyInfoPlugin::albumListingResult( const QString& msgType, const QVariantMap& msg )
+SpotifyInfoPlugin::albumListingResult( const QString& msgType, const QVariantMap& msg, const QVariant& extraData )
 {
     Q_ASSERT( msg.contains( "qid" ) );
-    Q_ASSERT( m_waitingForResults.contains( msg.value( "qid" ).toString() ) );
+    Q_ASSERT( extraData.canConvert< InfoRequestData >() );
 
-    if ( !msg.contains( "qid" ) || !m_waitingForResults.contains( msg.value( "qid" ).toString() ) )
+    const InfoRequestData requestData = extraData.value< InfoRequestData >();
-        return;
-
-    const InfoRequestData requestData = m_waitingForResults.take( msg.value( "qid" ).toString() );
 
     QVariantList tracks = msg.value( "tracks" ).toList();
     QStringList trackNameList;

src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h

@@ -46,7 +46,7 @@ public:
     virtual ~SpotifyInfoPlugin();
 
 public slots:
-    void  albumListingResult( const QString& msgType, const QVariantMap& msg );
+    void  albumListingResult( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
 
 protected slots:
     virtual void init() {}
@@ -62,8 +62,6 @@ private:
     void dataError( InfoRequestData );
     void trackListResult( const QStringList& trackNameList, const Tomahawk::InfoSystem::InfoRequestData& requestData );
 
-    QHash< QString, InfoRequestData > m_waitingForResults;
-
     QWeakPointer< Tomahawk::Accounts::SpotifyAccount > m_account;
 };
 

src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp

@@ -353,6 +353,8 @@ SpotifyPlaylistUpdater::tomahawkPlaylistRenamed(const QString &newT, const QStri
     msg[ "newTitle" ] = newT;
     msg[ "oldTitle" ] = oldT;
     msg[ "playlistid" ] = m_spotifyId;
+
+    // TODO check return value
     m_spotify.data()->sendMessage( msg, this, "onPlaylistRename" );
 }
 
@@ -493,7 +495,7 @@ SpotifyPlaylistUpdater::plentryToVariant( const QList< plentry_ptr >& entries )
 
 
 void
-SpotifyPlaylistUpdater::onTracksInsertedReturn( const QString& msgType, const QVariantMap& msg )
+SpotifyPlaylistUpdater::onTracksInsertedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& )
 {
     const bool success = msg.value( "success" ).toBool();
 
@@ -577,7 +579,7 @@ SpotifyPlaylistUpdater::tomahawkTracksRemoved( const QList< query_ptr >& tracks
 
 
 void
-SpotifyPlaylistUpdater::onTracksRemovedReturn( const QString& msgType, const QVariantMap& msg )
+SpotifyPlaylistUpdater::onTracksRemovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& )
 {
     const bool success = msg.value( "success" ).toBool();
 
@@ -626,7 +628,7 @@ SpotifyPlaylistUpdater::tomahawkTracksMoved( const QList< plentry_ptr >& tracks,
 
 
 void
-SpotifyPlaylistUpdater::onTracksMovedReturn( const QString& msgType, const QVariantMap& msg )
+SpotifyPlaylistUpdater::onTracksMovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& )
 {
     const bool success = msg.value( "success" ).toBool();
 

src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h

@@ -74,9 +74,9 @@ protected:
 
 private slots:
     // SpotifyResolver message handlers, all take msgtype, msg as argument
-    void onTracksInsertedReturn( const QString& msgType, const QVariantMap& msg );
+    void onTracksInsertedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
-    void onTracksRemovedReturn( const QString& msgType, const QVariantMap& msg );
+    void onTracksRemovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
-    void onTracksMovedReturn( const QString& msgType, const QVariantMap& msg );
+    void onTracksMovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
 
     void checkDeleteDialog() const;
 

src/libtomahawk/playlist/TreeProxyModel.cpp

@@ -204,7 +204,7 @@ TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent
 
             PlayableItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
 
-            if ( ti && ti->name() == item->name() )
+            if ( ti && ti->name() == item->name() && !ti->query().isNull() )
             {
                 if ( ti->query()->albumpos() == item->query()->albumpos() || ti->query()->albumpos() == 0 || item->query()->albumpos() == 0 )
                 {