1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-10-05 18:11:36 +02:00

Only allow voting once; Show the user's set score if he has rated it over the server

This commit is contained in:
Leo Franchi
2011-10-19 19:31:26 -04:00
parent 52930918f2
commit 742f73f028
4 changed files with 46 additions and 16 deletions

View File

@@ -151,7 +151,20 @@ AtticaManager::pathFromId( const QString& resolverId ) const
void
AtticaManager::uploadRating( const Content& c )
{
m_resolverStates[ c.id() ].rating = c.rating();
m_resolverStates[ c.id() ].userRating = c.rating();
for ( int i = 0; i < m_resolvers.count(); i++ )
{
if ( m_resolvers[ i ].id() == c.id() )
{
Attica::Content atticaContent = m_resolvers[ i ];
atticaContent.setRating( c.rating() );
m_resolvers[ i ] = atticaContent;
break;
}
}
TomahawkSettings::instance()->setAtticaResolverStates( m_resolverStates );
PostJob* job = m_resolverProvider.voteForContent( c.id(), (uint)c.rating() );
connect( job, SIGNAL( finished( Attica::BaseJob* ) ), job, SLOT( deleteLater() ) );
@@ -161,6 +174,12 @@ AtticaManager::uploadRating( const Content& c )
emit resolverStateChanged( c.id() );
}
bool
AtticaManager::userHasRated( const Content& c ) const
{
return m_resolverStates[ c.id() ].userRating != -1;
}
void
AtticaManager::providerAdded( const Provider& provider )
@@ -231,14 +250,20 @@ AtticaManager::syncServerData()
foreach ( const QString& id, m_resolverStates.keys() )
{
Resolver r = m_resolverStates[ id ];
foreach ( const Content& upstream, m_resolvers )
for ( int i = 0; i < m_resolvers.size(); i++ )
{
Attica::Content upstream = m_resolvers[ i ];
// same resolver
if ( id != upstream.id() )
continue;
// Update our rating with the server's idea of rating
m_resolverStates[ id ].rating = upstream.rating();
// Update our rating with the server's idea of rating if we haven't rated it
if ( m_resolverStates[ id ].userRating != -1 )
{
upstream.setRating( m_resolverStates[ id ].userRating );
m_resolvers[ i ] = upstream;
}
// DO we need to upgrade?
if ( ( r.state == Installed || r.state == NeedsUpgrade ) &&
!upstream.version().isEmpty() )