From cac24eacd369fdefdeb30cf66f619304244b05fe Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Wed, 5 Jun 2013 20:46:22 +0200
Subject: [PATCH] * Cache avatar instead of trying to get it from the cache
 over and over.

---
 src/libtomahawk/Source.cpp | 39 +++++++++++++++++++-------------------
 src/libtomahawk/Source.h   |  5 +++--
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/libtomahawk/Source.cpp b/src/libtomahawk/Source.cpp
index 2a87199b1..1bfdd0ca4 100644
--- a/src/libtomahawk/Source.cpp
+++ b/src/libtomahawk/Source.cpp
@@ -57,6 +57,7 @@ Source::Source( int id, const QString& nodeId )
     , m_id( id )
     , m_updateIndexWhenSynced( false )
     , m_state( DBSyncConnection::UNKNOWN )
+    , m_avatarLoaded( false )
     , m_cc( 0 )
     , m_commandCount( 0 )
 {
@@ -251,33 +252,31 @@ Source::friendlyNamesLessThan( const QString& first, const QString& second )
 QPixmap
 Source::avatar( TomahawkUtils::ImageMode style, const QSize& size )
 {
-//     tLog() << "****************************************************************************************";
-//     tLog() << peerInfos().count() << "PEERS FOR " << friendlyName();
-    QPixmap result;
     foreach ( const peerinfo_ptr& peerInfo, peerInfos() )
     {
-//         peerInfoDebug(peerInfo) << !peerInfo->avatar().isNull();
-        if ( !peerInfo.isNull() && !peerInfo->avatar( style, size ).isNull() )
+        if ( peerInfo && !peerInfo->avatar( style, size ).isNull() )
         {
-            result =  peerInfo->avatar( style, size );
-            break;
+            return peerInfo->avatar( style, size );
         }
     }
-    if ( result.isNull() )
+
+    if ( m_avatarLoaded )
+        return m_avatar;
+
+    // Try to get the avatar from the cache
+    // Hint: We store the avatar for each xmpp peer using its contactId, the dbFriendlyName is a contactId of a peer
+    m_avatarLoaded = true;
+    QByteArray avatarBuffer = TomahawkUtils::Cache::instance()->getData( "Sources", dbFriendlyName() ).toByteArray();
+    if ( !avatarBuffer.isNull() )
     {
-        // Try to get the avatar from the cache
-        // Hint: We store the avatar for each xmpp peer using its contactId, the dbFriendlyName is a contactId of a peer
-        QByteArray avatarBuffer = TomahawkUtils::Cache::instance()->getData( "Sources", dbFriendlyName() ).toByteArray();
-        if ( !avatarBuffer.isNull() )
-        {
-            QPixmap avatar;
-            avatar.loadFromData( avatarBuffer );
-            avatarBuffer.clear();
-            result = QPixmap( TomahawkUtils::createRoundedImage( avatar, QSize( 0, 0 ) ) );
-        }
+        QPixmap avatar;
+        avatar.loadFromData( avatarBuffer );
+        avatarBuffer.clear();
+
+        m_avatar = QPixmap( TomahawkUtils::createRoundedImage( avatar, QSize( 0, 0 ) ) );
     }
-//        tLog() << "****************************************************************************************";
-    return result;
+
+    return m_avatar;
 }
 #endif
 
diff --git a/src/libtomahawk/Source.h b/src/libtomahawk/Source.h
index f5fa9ba74..1f5c1dddc 100644
--- a/src/libtomahawk/Source.h
+++ b/src/libtomahawk/Source.h
@@ -70,13 +70,11 @@ public:
     QString friendlyName() const;
     void setFriendlyName( const QString& fname );
 
-
     // fallback when the normal friendlyname from cache is not available
     // this is usually the jabber id or whatever was used when first connected
     QString dbFriendlyName() const;
     void setDbFriendlyName( const QString& dbFriendlyName );
 
-
 #ifndef ENABLE_HEADLESS
     QPixmap avatar( TomahawkUtils::ImageMode style = TomahawkUtils::Original, const QSize& size = QSize() );
 #endif
@@ -173,6 +171,9 @@ private:
     DBSyncConnection::State m_state;
     QTimer m_currentTrackTimer;
 
+    QPixmap m_avatar;
+    bool m_avatarLoaded;
+
     QPointer<ControlConnection> m_cc;
     QList< QSharedPointer<DatabaseCommand> > m_cmds;
     int m_commandCount;