mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

* Fixed infinite loop in SpotifyPlaylistUpdater.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-06-16 14:43:08 +02:00
parent e9b1624659
commit d28ff17570
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp
View File

@@ -22,6 +22,7 @@
#include "accounts/AccountManager.h" #include "accounts/AccountManager.h"
#include "utils/TomahawkUtils.h" #include "utils/TomahawkUtils.h"
#include "utils/Logger.h"
#include "SpotifyAccount.h" #include "SpotifyAccount.h"
#include "Track.h" #include "Track.h"
@@ -53,7 +54,7 @@ SpotifyUpdaterFactory::create( const Tomahawk::playlist_ptr& pl, const QVariantH
if ( m_account.isNull() ) if ( m_account.isNull() )
{ {
qWarning() << "Found a spotify updater with no spotify account... ignoring for now!!"; qWarning() << "Found a spotify updater with no spotify account... ignoring for now!";
return 0; return 0;
} }
@@ -425,7 +426,7 @@ SpotifyPlaylistUpdater::spotifyTracksRemoved( const QVariantList& trackIds, cons
return; return;
} }
qDebug() << Q_FUNC_INFO << "remove tracks in middle of tomahawk playlist, from spotify command!" << trackIds << newRev << oldRev; tDebug() << Q_FUNC_INFO << "remove tracks in middle of tomahawk playlist, from spotify command!" << trackIds << newRev << oldRev;
// Uh oh, dont' want to get out of sync!! // Uh oh, dont' want to get out of sync!!
// Q_ASSERT( m_latestRev == oldRev ); // Q_ASSERT( m_latestRev == oldRev );
// m_latestRev = newRev; // m_latestRev = newRev;
@@ -439,7 +440,7 @@ SpotifyPlaylistUpdater::spotifyTracksRemoved( const QVariantList& trackIds, cons
const QString id = trackIdV.toString(); const QString id = trackIdV.toString();
if ( id.isEmpty() ) if ( id.isEmpty() )
{ {
qWarning() << Q_FUNC_INFO << "Tried to get track id to remove, but either couldn't convert to qstring:" << trackIdV; tDebug() << Q_FUNC_INFO << "Tried to get track id to remove, but either couldn't convert to qstring:" << trackIdV;
continue; continue;
} }
@@ -458,9 +459,9 @@ SpotifyPlaylistUpdater::spotifyTracksRemoved( const QVariantList& trackIds, cons
entries.removeAll( torm ); entries.removeAll( torm );
const int sizeDiff = playlist()->entries().size() - entries.size(); const int sizeDiff = playlist()->entries().size() - entries.size();
qDebug() << "We were asked to delete:" << trackIds.size() << "tracks from the playlist, and we deleted:" << sizeDiff; tDebug() << "We were asked to delete:" << trackIds.size() << "tracks from the playlist, and we deleted:" << sizeDiff;
if ( trackIds.size() != ( playlist()->entries().size() - entries.size() ) ) if ( trackIds.size() != ( playlist()->entries().size() - entries.size() ) )
qWarning() << "========================= Failed to delete all the tracks we were asked for!! Didn't find some indicesss... ==================="; tDebug() << Q_FUNC_INFO << "Failed to delete all the tracks we were asked for! Didn't find some indexes!";
if ( sizeDiff > 0 ) if ( sizeDiff > 0 )
{ {
@@ -528,7 +529,10 @@ SpotifyPlaylistUpdater::spotifyTracksMoved( const QVariantList& tracks, const QS
for ( QList< plentry_ptr >::iterator iter = entries.begin(); iter != entries.end(); ) for ( QList< plentry_ptr >::iterator iter = entries.begin(); iter != entries.end(); )
{ {
if ( (*iter)->annotation().isEmpty() ) if ( (*iter)->annotation().isEmpty() )
{
++iter;
continue; continue;
}
if ( tracks.contains( (*iter)->annotation() ) ) if ( tracks.contains( (*iter)->annotation() ) )
{ {