From f72e12314052f6df6bd86398e1b8119cab054b6a Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 13 Apr 2012 19:58:57 -0400
Subject: [PATCH] Handle moves from spotify (doesn't show up till a restart)

---
 src/accounts/spotify/SpotifyAccount.cpp       |  5 +-
 .../spotify/SpotifyPlaylistUpdater.cpp        | 62 ++++++++++++++++---
 src/accounts/spotify/SpotifyPlaylistUpdater.h |  2 +-
 3 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/accounts/spotify/SpotifyAccount.cpp b/src/accounts/spotify/SpotifyAccount.cpp
index 736d9f9a3..fe8d13d86 100644
--- a/src/accounts/spotify/SpotifyAccount.cpp
+++ b/src/accounts/spotify/SpotifyAccount.cpp
@@ -318,11 +318,12 @@ SpotifyAccount::resolverMessage( const QString &msgType, const QVariantMap &msg
         SpotifyPlaylistUpdater* updater = m_updaters[ plid ];
         Q_ASSERT( updater->sync() );
 
-        const QVariantList tracksList = msg.value( "trackPositions" ).toList();
+        const QString newStartPos = msg.value( "newStartPosition" ).toString();
+        const QVariantList tracksList = msg.value( "tracks" ).toList();
         const QString newRev = msg.value( "revid" ).toString();
         const QString oldRev = msg.value( "oldRev" ).toString();
 
-        updater->spotifyTracksMoved( tracksList, newRev, oldRev  );
+        updater->spotifyTracksMoved( tracksList, newStartPos, newRev, oldRev  );
     }
     else if( msgType == "playlistRenamed" )
     {
diff --git a/src/accounts/spotify/SpotifyPlaylistUpdater.cpp b/src/accounts/spotify/SpotifyPlaylistUpdater.cpp
index 65d958f77..5c1ed3d5c 100644
--- a/src/accounts/spotify/SpotifyPlaylistUpdater.cpp
+++ b/src/accounts/spotify/SpotifyPlaylistUpdater.cpp
@@ -344,16 +344,60 @@ SpotifyPlaylistUpdater::tomahawkPlaylistRenamed(const QString &newT, const QStri
 }
 
 void
-SpotifyPlaylistUpdater::spotifyTracksMoved( const QVariantList& tracks, const QString& newRev, const QString& oldRev )
+SpotifyPlaylistUpdater::spotifyTracksMoved( const QVariantList& tracks, const QString& newStartPos, const QString& newRev, const QString& oldRev )
 {
-    // TODO
-//     if( playlist()->busy() )
-//     {
-//         // We might still be waiting for a add/remove tracks command to finish, so the entries we get here might be stale
-//         // wait for any to be complete
-//         m_queuedOps << NewClosure( 0, "", this, "spotifyPlaylistRenamed", title, newRev, oldRev );
-//         return;
-//     }
+    if( playlist()->busy() )
+    {
+        // We might still be waiting for a add/remove tracks command to finish, so the entries we get here might be stale
+        // wait for any to be complete
+        m_queuedOps << NewClosure( 0, "", this, SLOT(spotifyTracksMoved(QVariantList, QString, QString, QString)), tracks, newStartPos, newRev, oldRev );
+        return;
+    }
+
+
+    qDebug() << "Moving some tracks in a spotify-synced playlist, tracks:" << tracks << "to new startpos:" << newStartPos;
+    // Uh oh, dont' want to get out of sync!!
+    //     Q_ASSERT( m_latestRev == oldRev );
+    //     m_latestRev = newRev;
+    QList< plentry_ptr > entries = playlist()->entries();
+
+    QList< plentry_ptr > toMove;
+    for ( QList< plentry_ptr >::iterator iter = entries.begin(); iter != entries.end(); )
+    {
+        if ( (*iter)->annotation().isEmpty() )
+            continue;
+
+        if ( tracks.contains( (*iter)->annotation() ) )
+        {
+            toMove << *iter;
+            iter = entries.erase( iter );
+            continue;
+        }
+
+        ++iter;
+    }
+
+
+    // Find the position of the track to insert from
+    for ( QList< plentry_ptr >::iterator iter = entries.begin(); iter != entries.end(); ++iter )
+    {
+        if ( (*iter)->annotation() == newStartPos )
+        {
+            ++iter;
+            while ( !toMove.isEmpty() )
+            {
+                qDebug() << "Adding moved track to playlist at pos (end:" << (iter == entries.end());
+                if ( iter != entries.end() )
+                    qDebug() << (*iter)->query()->track() << (*iter)->query()->artist();
+                iter = entries.insert( iter, toMove.takeLast() );
+            }
+
+            break;
+        }
+    }
+
+    m_blockUpdatesForNextRevision = true;
+    playlist()->createNewRevision( uuid(), playlist()->currentrevision(), entries );
 }
 
 
diff --git a/src/accounts/spotify/SpotifyPlaylistUpdater.h b/src/accounts/spotify/SpotifyPlaylistUpdater.h
index fc0a88e08..75a8cc429 100644
--- a/src/accounts/spotify/SpotifyPlaylistUpdater.h
+++ b/src/accounts/spotify/SpotifyPlaylistUpdater.h
@@ -59,7 +59,7 @@ public slots:
     /// Spotify callbacks when we are directly instructed from the resolver
     void spotifyTracksAdded( const QVariantList& tracks, const QString& startPosId, const QString& newRev, const QString& oldRev );
     void spotifyTracksRemoved( const QVariantList& tracks, const QString& newRev, const QString& oldRev );
-    void spotifyTracksMoved( const QVariantList& tracks, const QString& newRev, const QString& oldRev );
+    void spotifyTracksMoved( const QVariantList& tracks, const QString& newStartPos, const QString& newRev, const QString& oldRev );
     void spotifyPlaylistRenamed( const QString& title, const QString& newRev, const QString& oldRev  );
 
 protected: