From 56edc1ba0cd8d907e173ff538f2dbba7ec8dca92 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 28 Apr 2012 15:51:22 -0400 Subject: [PATCH] Update diagnostics dialog for accounts. Just ported over, still crappy. --- src/DiagnosticsDialog.cpp | 153 +++++++++++++++--------------- src/libtomahawk/sip/SipHandler.h | 2 +- src/libtomahawk/sip/SipPlugin.cpp | 2 + 3 files changed, 81 insertions(+), 76 deletions(-) diff --git a/src/DiagnosticsDialog.cpp b/src/DiagnosticsDialog.cpp index 9adf47db9..35ff7e9dc 100644 --- a/src/DiagnosticsDialog.cpp +++ b/src/DiagnosticsDialog.cpp @@ -22,9 +22,9 @@ #include "config.h" -#include -#include -#include +#include "accounts/AccountManager.h" +#include "network/Servent.h" +#include "SourceList.h" #include #include @@ -33,6 +33,7 @@ #include #include "utils/Logger.h" +#include "sip/SipHandler.h" DiagnosticsDialog::DiagnosticsDialog( QWidget *parent ) @@ -93,80 +94,82 @@ void DiagnosticsDialog::updateLogView() // Peers / Accounts, TODO log.append("ACCOUNTS:\n"); -// QList< Tomahawk::source_ptr > sources = SourceList::instance()->sources( true ); -// Q_FOREACH(SipPlugin *sip, SipHandler::instance()->allPlugins()) -// { -// Q_ASSERT(sip); -// QString stateString; -// switch( sip->connectionState() ) -// { -// case SipPlugin::Connecting: -// stateString = "Connecting"; -// break; -// -// case SipPlugin::Connected: -// stateString = "Connected"; -// break; -// -// case SipPlugin::Disconnected: -// stateString = "Disconnected"; -// break; -// case SipPlugin::Disconnecting: -// stateString = "Disconnecting"; -// } -// log.append( -// QString(" %2 (%1): %3 (%4)\n") -// .arg(sip->account()->accountServiceName()) -// .arg(sip->friendlyName()) -// .arg(sip->account()->accountFriendlyName()) -// .arg(stateString) -// ); + const QList< Tomahawk::source_ptr > sources = SourceList::instance()->sources( true ); + const QList< Tomahawk::Accounts::Account* > accounts = Tomahawk::Accounts::AccountManager::instance()->accounts( Tomahawk::Accounts::SipType ); + foreach ( Tomahawk::Accounts::Account* account, accounts ) + { + Q_ASSERT( account && account->sipPlugin() ); + if ( !account || !account->sipPlugin() ) + continue; -// Q_FOREACH( const QString &peerId, sip->peersOnline() ) -// { -// /* enable this again, when we check the Source.has this peerId -// bool connected = false; -// Q_FOREACH( const Tomahawk::source_ptr &source, sources ) -// { -// if( source->controlConnection() ) -// { -// connected = true; -// break; -// } -// }*/ -// -// QString versionString = SipHandler::instance()->versionString( peerId ); -// SipInfo sipInfo = SipHandler::instance()->sipInfo( peerId ); -// if( !sipInfo.isValid() ) -// log.append( -// QString(" %1: %2 %3" /*"(%4)"*/ "\n") -// .arg( peerId ) -// .arg( "sipinfo invalid" ) -// .arg( versionString ) -// // .arg( connected ? "connected" : "not connected") -// ); -// else if( sipInfo.isVisible() ) -// log.append( -// QString(" %1: %2:%3 %4" /*" (%5)"*/ "\n") -// .arg( peerId ) -// .arg( sipInfo.host().hostName() ) -// .arg( sipInfo.port() ) -// .arg( versionString ) -// // .arg( connected ? "connected" : "not connected") -// -// ); -// else -// log.append( -// QString(" %1: visible: false %2" /*" (%3)"*/ "\n") -// .arg( peerId ) -// .arg( versionString ) -// // .arg( connected ? "connected" : "not connected") -// -// ); -// } -// log.append("\n"); -// } + QString stateString; + switch( account->connectionState() ) + { + case Tomahawk::Accounts::Account::Connecting: + stateString = "Connecting"; + break; + case Tomahawk::Accounts::Account::Connected: + stateString = "Connected"; + break; + case Tomahawk::Accounts::Account::Disconnected: + stateString = "Disconnected"; + break; + case Tomahawk::Accounts::Account::Disconnecting: + stateString = "Disconnecting"; + } + log.append( + QString( " %2 (%1): %3 (%4)\n" ) + .arg( account->accountServiceName() ) + .arg( account->sipPlugin()->friendlyName() ) + .arg( account->accountFriendlyName()) + .arg( stateString ) + ); + + foreach( const QString &peerId, account->sipPlugin()->peersOnline() ) + { + /* enable this again, when we check the Source.has this peerId + bool connected = false; + Q_FOREACH( const Tomahawk::source_ptr &source, sources ) + { + if( source->controlConnection() ) + { + connected = true; + break; + } + }*/ + + QString versionString = SipHandler::instance()->versionString( peerId ); + SipInfo sipInfo = SipHandler::instance()->sipInfo( peerId ); + if( !sipInfo.isValid() ) + log.append( + QString(" %1: %2 %3" /*"(%4)"*/ "\n") + .arg( peerId ) + .arg( "sipinfo invalid" ) + .arg( versionString ) + // .arg( connected ? "connected" : "not connected") + ); + else if( sipInfo.isVisible() ) + log.append( + QString(" %1: %2:%3 %4" /*" (%5)"*/ "\n") + .arg( peerId ) + .arg( sipInfo.host().hostName() ) + .arg( sipInfo.port() ) + .arg( versionString ) + // .arg( connected ? "connected" : "not connected") + + ); + else + log.append( + QString(" %1: visible: false %2" /*" (%3)"*/ "\n") + .arg( peerId ) + .arg( versionString ) + // .arg( connected ? "connected" : "not connected") + + ); + } + log.append("\n"); + } ui->logView->setPlainText(log); } diff --git a/src/libtomahawk/sip/SipHandler.h b/src/libtomahawk/sip/SipHandler.h index 2e7318cda..cede50607 100644 --- a/src/libtomahawk/sip/SipHandler.h +++ b/src/libtomahawk/sip/SipHandler.h @@ -37,7 +37,7 @@ * through AccountManager, this is an internal class. */ -class SipHandler : public QObject +class DLLEXPORT SipHandler : public QObject { Q_OBJECT diff --git a/src/libtomahawk/sip/SipPlugin.cpp b/src/libtomahawk/sip/SipPlugin.cpp index e7f6df977..3c205cda5 100644 --- a/src/libtomahawk/sip/SipPlugin.cpp +++ b/src/libtomahawk/sip/SipPlugin.cpp @@ -31,6 +31,8 @@ SipPlugin::SipPlugin( Tomahawk::Accounts::Account *account, QObject* parent ) : QObject( parent ) , m_account( account ) { + connect( this, SIGNAL( peerOnline( QString ) ), this, SLOT( onPeerOnline( QString ) ) ); + connect( this, SIGNAL( peerOffline( QString ) ), this, SLOT( onPeerOffline( QString ) ) ); }