mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-24 09:49:42 +01:00
Code Issues Releases Wiki Activity

* Style cleanup for AvatarManager.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2012-05-28 13:05:37 +02:00
parent c9f287590c
commit c258f1897f
2 changed files with 75 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
src/accounts/xmpp/sip/AvatarManager.cpp
View File

@ -33,47 +33,51 @@
#include "utils/Logger.h"
AvatarManager::AvatarManager(Jreen::Client *client) :
m_cacheDir(TomahawkUtils::appDataDir().absolutePath().append("/jreen/"))
AvatarManager::AvatarManager( Jreen::Client* client )
: m_cacheDir( TomahawkUtils::appDataDir().absolutePath().append( "/jreen/" ) )
{
m_client = client;
m_cachedAvatars = m_cacheDir.entryList();
connect(m_client, SIGNAL(serverFeaturesReceived(QSet<QString>)), SLOT(onNewConnection()));
connect(m_client, SIGNAL(presenceReceived(Jreen::Presence)), SLOT(onNewPresence(Jreen::Presence)));
connect(m_client, SIGNAL(iqReceived(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ)));
connect( m_client, SIGNAL( serverFeaturesReceived( QSet<QString> ) ), SLOT( onNewConnection() ) );
connect( m_client, SIGNAL( presenceReceived( Jreen::Presence ) ), SLOT( onNewPresence( Jreen::Presence ) ) );
connect( m_client, SIGNAL( iqReceived( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
connect(this, SIGNAL(newAvatar(QString)), SLOT(onNewAvatar(QString)));
connect( this, SIGNAL( newAvatar( QString ) ), SLOT( onNewAvatar( QString ) ) );
}
AvatarManager::~AvatarManager()
{
}
void AvatarManager::onNewConnection()
void
AvatarManager::onNewConnection()
{
fetchVCard( m_client->jid().bare() );
}
void AvatarManager::fetchVCard(const QString &jid)
void
AvatarManager::fetchVCard( const QString& jid )
{
// qDebug() << Q_FUNC_INFO;
Jreen::IQ iq( Jreen::IQ::Get, jid );
iq.addExtension( new Jreen::VCard() );
Jreen::IQReply *reply = m_client->send( iq );
Jreen::IQ iq(Jreen::IQ::Get, jid );
iq.addExtension(new Jreen::VCard());
Jreen::IQReply *reply = m_client->send(iq);
connect(reply, SIGNAL(received(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ)));
connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
}
void AvatarManager::onNewPresence(const Jreen::Presence& presence)
void
AvatarManager::onNewPresence( const Jreen::Presence& presence )
{
Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
if(update)
if ( update )
{
// qDebug() << "vcard: found update for" << presence.from().full();
if(!isCached(update->photoHash()))
if ( !isCached( update->photoHash() ) )
{
// qDebug() << presence.from().full() << "vcard: photo not cached, starting request..." << update->photoHash();
fetchVCard( presence.from().bare() );
@ -84,78 +88,72 @@ void AvatarManager::onNewPresence(const Jreen::Presence& presence)
m_JidsAvatarHashes.insert( update->photoHash(), presence.from().bare() );
if ( !this->avatar( presence.from().bare() ).isNull() )
emit newAvatar(presence.from().bare());
emit newAvatar( presence.from().bare() );
}
}
else
{
// qDebug() << Q_FUNC_INFO << presence.from().full() << "got no statusupdateextension";
//TODO: do we want this? might fetch avatars for broken clients
fetchVCard( presence.from().bare() );
}
}
void AvatarManager::onNewIq(const Jreen::IQ& iq)
void
AvatarManager::onNewIq( const Jreen::IQ& iq )
{
Jreen::VCard::Ptr vcard = iq.payload<Jreen::VCard>();
if(vcard)
if ( vcard )
{
iq.accept();
// qDebug() << Q_FUNC_INFO << "Got vcard from " << iq.from().full();
QString id = iq.from().full();
QString avatarHash;
const Jreen::VCard::Photo &photo = vcard->photo();
if (!photo.data().isEmpty()) {
if ( !photo.data().isEmpty() )
{
// qDebug() << "vcard: got photo data" << id;
avatarHash = QCryptographicHash::hash(photo.data(), QCryptographicHash::Sha1).toHex();
avatarHash = QCryptographicHash::hash( photo.data(), QCryptographicHash::Sha1 ).toHex();
if (!m_cacheDir.exists())
if ( !m_cacheDir.exists() )
m_cacheDir.mkpath( avatarDir( avatarHash ).absolutePath() );
QFile file(avatarPath(avatarHash));
if (file.open(QIODevice::WriteOnly)) {
file.write(photo.data());
QFile file( avatarPath( avatarHash ) );
if ( file.open( QIODevice::WriteOnly ) )
{
file.write( photo.data() );
file.close();
}
m_cachedAvatars.append(avatarHash);
m_cachedAvatars.append( avatarHash );
m_JidsAvatarHashes.insert( avatarHash, iq.from().bare() );
Q_ASSERT(!this->avatar(iq.from().bare()).isNull());
emit newAvatar(iq.from().bare());
}
else
{
// qDebug() << "vcard: got no photo data" << id;
Q_ASSERT( !this->avatar( iq.from().bare() ).isNull() );
emit newAvatar( iq.from().bare() );
}
// got own presence
if ( m_client->jid().bare() == id )
{
// qDebug() << Q_FUNC_INFO << "got own vcard";
Jreen::Presence presence = m_client->presence();
Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
if (update->photoHash() != avatarHash)
if ( update->photoHash() != avatarHash )
{
qDebug() << Q_FUNC_INFO << "Updating own presence...";
update->setPhotoHash(avatarHash);
m_client->send(presence);
update->setPhotoHash( avatarHash );
m_client->send( presence );
}
}
}
}
QPixmap AvatarManager::avatar(const QString &jid) const
QPixmap
AvatarManager::avatar( const QString& jid ) const
{
if( isCached( avatarHash( jid ) ) )
if ( isCached( avatarHash( jid ) ) )
{
return QPixmap( avatarPath( avatarHash( jid ) ) );
}
@ -165,29 +163,39 @@ QPixmap AvatarManager::avatar(const QString &jid) const
}
}
QString AvatarManager::avatarHash(const QString &jid) const
QString
AvatarManager::avatarHash( const QString& jid ) const
{
//qDebug() << Q_FUNC_INFO << jid << m_JidsAvatarHashes.key(jid);
return m_JidsAvatarHashes.key(jid);
//qDebug() << Q_FUNC_INFO << jid << m_JidsAvatarHashes.key( jid );
return m_JidsAvatarHashes.key( jid );
}
QDir AvatarManager::avatarDir(const QString&) const
QDir
AvatarManager::avatarDir( const QString& /* avatarHash */ ) const
{
return m_cacheDir;
}
QString AvatarManager::avatarPath(const QString &avatarHash) const
QString
AvatarManager::avatarPath( const QString& avatarHash ) const
{
Q_ASSERT(!avatarHash.contains("@"));
return avatarDir(avatarHash).absoluteFilePath(avatarHash);
Q_ASSERT( !avatarHash.contains( "@" ) );
return avatarDir( avatarHash ).absoluteFilePath( avatarHash );
}
bool AvatarManager::isCached(const QString &avatarHash) const
bool
AvatarManager::isCached( const QString& avatarHash ) const
{
return m_cachedAvatars.contains( avatarHash );
}
void AvatarManager::onNewAvatar(const QString&)
void
AvatarManager::onNewAvatar( const QString& /* jid */ )
{
// qDebug() << Q_FUNC_INFO << "Found new Avatar..." << jid;
}

24
src/accounts/xmpp/sip/AvatarManager.h
View File

@ -32,32 +32,32 @@ class ACCOUNTDLLEXPORT AvatarManager : public QObject
Q_OBJECT
public:
AvatarManager(Jreen::Client *client);
AvatarManager(Jreen::Client* client);
virtual ~AvatarManager();
QPixmap avatar(const QString &jid) const;
QPixmap avatar(const QString& jid) const;
signals:
void newAvatar( const QString &jid );
void newAvatar( const QString& jid );
private slots:
void onNewPresence( const Jreen::Presence& presence );
void onNewIq(const Jreen::IQ &iq);
void onNewIq(const Jreen::IQ& iq);
void onNewConnection();
void onNewAvatar( const QString &jid );
void onNewAvatar( const QString& jid );
private:
void fetchVCard( const QString &jid);
QString avatarHash(const QString &jid) const;
QString avatarPath(const QString &avatarHash) const;
void fetchVCard( const QString& jid );
QString avatarHash( const QString& jid ) const;
QString avatarPath( const QString& avatarHash ) const;
QDir avatarDir(const QString &avatarHash) const;
bool isCached(const QString &avatarHash) const;
QDir avatarDir( const QString& avatarHash ) const;
bool isCached( const QString& avatarHash ) const;
Jreen::Client *m_client;
Jreen::Client* m_client;
QStringList m_cachedAvatars;
QDir m_cacheDir;
QMap<QString, QString> m_JidsAvatarHashes;
QMap< QString, QString > m_JidsAvatarHashes;
};
#endif // AVATARMANAGER_H