mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-23 06:02:53 +02:00
Code Issues Releases Wiki Activity

Fix atticaid sync issue that would lose value

Browse Source
This commit is contained in:
Leo Franchi
2012-03-18 13:26:33 -04:00
parent 195953f4f8
commit 42b2779240
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/accounts/AccountModel.cpp
View File

@@ -30,6 +30,7 @@ using namespace Tomahawk;
using namespace Accounts; using namespace Accounts;
#define ACCOUNTMODEL_DEBUG 0 #define ACCOUNTMODEL_DEBUG 0
AccountModel::AccountModel( QObject* parent ) AccountModel::AccountModel( QObject* parent )
: QAbstractListModel( parent ) : QAbstractListModel( parent )
{ {

21
src/libtomahawk/accounts/AccountModelNode.h
View File

@@ -26,6 +26,8 @@
#include <attica/content.h> #include <attica/content.h>
#define ACCOUNTMODELNODE_DEBUG 0
namespace Tomahawk { namespace Tomahawk {
namespace Accounts { namespace Accounts {
@@ -87,7 +89,9 @@ struct AccountModelNode {
{ {
if ( AccountManager::instance()->factoryForAccount( acct ) == fac ) if ( AccountManager::instance()->factoryForAccount( acct ) == fac )
{ {
// qDebug() << "Found account for factory:" << acct->accountFriendlyName(); #if ACCOUNTMODELNODE_DEBUG
qDebug() << "Found account for factory:" << acct->accountFriendlyName();
#endif
accounts.append( acct ); accounts.append( acct );
} }
} }
@@ -98,15 +102,24 @@ struct AccountModelNode {
init(); init();
atticaContent = cnt; atticaContent = cnt;
// qDebug() << "Creating attica model node for resolver:" << cnt.id(); #if ACCOUNTMODELNODE_DEBUG
qDebug() << "Creating attica model node for resolver:" << cnt.id();
#endif
foreach ( Account* acct, AccountManager::instance()->accounts( Accounts::ResolverType ) ) foreach ( Account* acct, AccountManager::instance()->accounts( Accounts::ResolverType ) )
{ {
#if ACCOUNTMODELNODE_DEBUG
qDebug() << "Checking account:" << acct->accountFriendlyName() << qobject_cast< AtticaResolverAccount* >( acct );
#endif
if ( AtticaResolverAccount* resolver = qobject_cast< AtticaResolverAccount* >( acct ) ) if ( AtticaResolverAccount* resolver = qobject_cast< AtticaResolverAccount* >( acct ) )
{ {
#if ACCOUNTMODELNODE_DEBUG
qDebug() << "With attica id:" << resolver->atticaId();
#endif
if ( resolver->atticaId() == atticaContent.id() ) if ( resolver->atticaId() == atticaContent.id() )
{ {
// qDebug() << "found atticaaccount :" << resolver->accountFriendlyName(); #if ACCOUNTMODELNODE_DEBUG
qDebug() << "found atticaaccount :" << resolver->accountFriendlyName();
#endif
atticaAccount = resolver; atticaAccount = resolver;
break; break;
} }

3
src/libtomahawk/accounts/ResolverAccount.cpp
View File

@@ -102,6 +102,8 @@ ResolverAccount::ResolverAccount( const QString& accountId, const QString& path
setAccountFriendlyName( m_resolver.data()->name() ); setAccountFriendlyName( m_resolver.data()->name() );
setTypes( AccountType( ResolverType ) ); setTypes( AccountType( ResolverType ) );
sync();
} }
@@ -225,6 +227,7 @@ AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QS
TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true ); TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true );
loadIcon(); loadIcon();
sync();
} }