From c4a9dd6b32d3cfcd9684d1ed668d167a558f5b55 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 14 Apr 2012 13:07:33 -0400 Subject: [PATCH] Fix position when moving --- src/accounts/spotify/SpotifyPlaylistUpdater.cpp | 13 ++++++++++++- src/accounts/spotify/SpotifyPlaylistUpdater.h | 8 ++++---- src/libtomahawk/playlist.h | 1 + src/libtomahawk/playlist/playlistmodel.cpp | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/accounts/spotify/SpotifyPlaylistUpdater.cpp b/src/accounts/spotify/SpotifyPlaylistUpdater.cpp index 5eedfee2b..7d2a7939c 100644 --- a/src/accounts/spotify/SpotifyPlaylistUpdater.cpp +++ b/src/accounts/spotify/SpotifyPlaylistUpdater.cpp @@ -574,6 +574,14 @@ SpotifyPlaylistUpdater::onTracksRemovedReturn( const QString& msgType, const QVa void SpotifyPlaylistUpdater::tomahawkTracksMoved( const QList< plentry_ptr >& tracks, int position ) { + if( playlist()->busy() ) + { + // the playlist has had the new revision set, but it might not be finished, if it's not finished, playlist()->entries() still + // contains the *old* order, so we get the wrong data + m_queuedOps << NewClosure( 0, "", this, SLOT(tomahawkTracksMoved(QList,int)), tracks, position ); + return; + } + qDebug() << Q_FUNC_INFO << "Got tracks moved at position:" << position; foreach ( const plentry_ptr ple, tracks ) { @@ -588,7 +596,10 @@ SpotifyPlaylistUpdater::tomahawkTracksMoved( const QList< plentry_ptr >& tracks, // Find the trackid of the nearest spotify track QList< plentry_ptr > plTracks = playlist()->entries(); Q_ASSERT( position-1 < plTracks.size() ); - const QString startPos = nearestSpotifyTrack( plTracks, position ); + + QString startPos; + if ( position > 0 ) + startPos = nearestSpotifyTrack( plTracks, position ); msg[ "startPosition" ] = startPos; msg[ "playlistid" ] = m_spotifyId; diff --git a/src/accounts/spotify/SpotifyPlaylistUpdater.h b/src/accounts/spotify/SpotifyPlaylistUpdater.h index fc5077707..495eaa2bc 100644 --- a/src/accounts/spotify/SpotifyPlaylistUpdater.h +++ b/src/accounts/spotify/SpotifyPlaylistUpdater.h @@ -62,15 +62,15 @@ public slots: 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 ); + void tomahawkTracksInserted( const QList& ,int ); + void tomahawkTracksRemoved( const QList& ); + void tomahawkTracksMoved( const QList& ,int ); + void tomahawkPlaylistRenamed( const QString&, const QString& ); protected: virtual void removeFromSettings(const QString& group) const; virtual void saveToSettings(const QString& group) const; private slots: - void tomahawkTracksInserted( const QList& ,int ); - void tomahawkTracksRemoved( const QList& ); - void tomahawkTracksMoved( const QList& ,int ); - void tomahawkPlaylistRenamed( const QString&, const QString& ); // SpotifyResolver message handlers, all take msgtype, msg as argument void onTracksInsertedReturn( const QString& msgType, const QVariantMap& msg ); void onTracksRemovedReturn( const QString& msgType, const QVariantMap& msg ); diff --git a/src/libtomahawk/playlist.h b/src/libtomahawk/playlist.h index 304382295..e8a110590 100644 --- a/src/libtomahawk/playlist.h +++ b/src/libtomahawk/playlist.h @@ -311,5 +311,6 @@ private: } Q_DECLARE_METATYPE( QSharedPointer< Tomahawk::Playlist > ) +Q_DECLARE_METATYPE( QList< QSharedPointer< Tomahawk::PlaylistEntry > > ) #endif // PLAYLIST_H diff --git a/src/libtomahawk/playlist/playlistmodel.cpp b/src/libtomahawk/playlist/playlistmodel.cpp index 13ef1a9d9..53c45f20b 100644 --- a/src/libtomahawk/playlist/playlistmodel.cpp +++ b/src/libtomahawk/playlist/playlistmodel.cpp @@ -444,6 +444,7 @@ PlaylistModel::endPlaylistChanges() if ( !item || item->entry().isNull() ) continue; +// qDebug() << "Checking for equality:" << (item->entry() == m_savedInsertTracks.first()) << m_savedInsertTracks.first()->query()->track() << m_savedInsertTracks.first()->query()->artist(); if ( item->entry() == m_savedInsertTracks.first() ) { // Found our index