mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-26 04:43:06 +01:00
Code Issues Releases Wiki Activity

Add some error logging and the connection timer

Browse Source
This commit is contained in:
Jeff Mitchell 2011-02-12 19:15:08 -05:00
parent 2bd2823a76
commit 2d918156d1
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/sip/twitter/twitter.cpp
View File

@ -18,6 +18,7 @@ TwitterPlugin::TwitterPlugin()
: SipPlugin()
, m_isAuthed( false )
, m_checkTimer( this )
, m_connectTimer( this )
, m_cachedFriendsSinceId( 0 )
, m_cachedMentionsSinceId( 0 )
, m_cachedDirectMessagesSinceId( 0 )
@ -30,6 +31,11 @@ TwitterPlugin::TwitterPlugin()
m_checkTimer.setSingleShot( false );
connect( &m_checkTimer, SIGNAL( timeout() ), SLOT( checkTimerFired() ) );
m_checkTimer.start();
m_connectTimer.setInterval( 60000 );
m_connectTimer.setSingleShot( false );
connect( &m_connectTimer, SIGNAL( timeout() ), SLOT( connectTimerFired() ) );
m_connectTimer.start();
}
bool
@ -116,6 +122,7 @@ TwitterPlugin::connectAuthVerifyReply( const QTweetUser &user )
connect( m_mentions.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( mentionsStatuses(const QList<QTweetStatus> &) ) );
connect( m_directMessages.data(), SIGNAL( parsedStatuses(const QList< QTweetDMStatus > &) ), SLOT( directMessages(const QList<QTweetDMStatus> &) ) );
connect( m_directMessageNew.data(), SIGNAL( parsedStatuses(const QList< QTweetDMStatus > &) ), SLOT( directMessagePosted(const QTweetDMStatus &) ) );
connect( m_directMessageNew.data(), SIGNAL( error(QTweetNetBase::ErrorCode, const QString &) ), SLOT( directMessagePostError(QTweetNetBase::ErrorCode, const QString &) ) );
connect( m_directMessageDestroy.data(), SIGNAL( parsedStatuses(const QList< QTweetDMStatus > &) ), SLOT( directMessageDestoyed(const QTweetDMStatus &) ) );
QMetaObject::invokeMethod( this, "checkTimerFired", Qt::AutoConnection );
}
@ -146,6 +153,30 @@ TwitterPlugin::checkTimerFired()
m_mentions.data()->fetch( m_cachedMentionsSinceId, 0, 800 );
}
void
TwitterPlugin::connectTimerFired()
{
if ( !isValid() || m_cachedPeers.isEmpty() )
return;
QList<QString> peerlist = m_cachedPeers.keys();
qStableSort( peerlist.begin(), peerlist.end() );
foreach( QString screenName, peerlist )
{
QHash< QString, QVariant > peerData = m_cachedPeers[screenName].toHash();
if ( !peerData.contains( "node" ) || !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) )
continue;
if ( !peerData.contains( "ohst" ) || !peerData.contains( "oprt" ) ||
peerData["ohst"].toString() != Servent::instance()->externalAddress() ||
peerData["oprt"].toInt() != Servent::instance()->externalPort()
)
QMetaObject::invokeMethod( this, "sendOffer", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&peerData ) );
else
QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), QGenericArgument( "QHash< QString, QVariant >", (const void*)&peerData ) );
}
}
void
TwitterPlugin::friendsTimelineStatuses( const QList< QTweetStatus > &statuses )
{
@ -330,11 +361,19 @@ TwitterPlugin::sendOffer( const QString &screenName, const QHash< QString, QVari
}
void
TwitterPlugin::directMessagePosted(const QTweetDMStatus& message)
TwitterPlugin::directMessagePosted( const QTweetDMStatus& message )
{
qDebug() << Q_FUNC_INFO;
qDebug() << "Message sent to " << message.recipientScreenName() << " containing: " << message.text();}
qDebug() << "Message sent to " << message.recipientScreenName() << " containing: " << message.text();
}
void
TwitterPlugin::directMessagePostError( QTweetNetBase::ErrorCode errorCode, const QString &message )
{
qDebug() << Q_FUNC_INFO;
qDebug() << "Received an error posting direct message: " << m_directMessageNew.data()->lastErrorMessage();
}
void
TwitterPlugin::directMessageDestroyed(const QTweetDMStatus& message)

3
src/sip/twitter/twitter.h
View File

@ -52,11 +52,13 @@ public slots:
private slots:
void connectAuthVerifyReply( const QTweetUser &user );
void checkTimerFired();
void connectTimerFired();
void friendsTimelineStatuses( const QList< QTweetStatus > &statuses );
void mentionsStatuses( const QList< QTweetStatus > &statuses );
void pollDirectMessages();
void directMessages( const QList< QTweetDMStatus > &messages );
void directMessagePosted( const QTweetDMStatus &message );
void directMessagePostError( QTweetNetBase::ErrorCode errorCode, const QString &message );
void directMessageDestroyed( const QTweetDMStatus &message );
void registerOffer( const QString &screenName, const QHash< QString, QVariant > &peerdata );
void sendOffer( const QString &screenName, const QHash< QString, QVariant > &peerdata );
@ -71,6 +73,7 @@ private:
QWeakPointer< QTweetDirectMessageDestroy > m_directMessageDestroy;
bool m_isAuthed;
QTimer m_checkTimer;
QTimer m_connectTimer;
qint64 m_cachedFriendsSinceId;
qint64 m_cachedMentionsSinceId;
qint64 m_cachedDirectMessagesSinceId;