From cd3d42dc61f0e92118e32a2947de02281973da85 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 14 Jan 2013 14:39:30 -0500 Subject: [PATCH] Add some methods for pushing supported info types out of infosystem; untested currently, but compiles --- src/libtomahawk/Typedefs.h | 1 + src/libtomahawk/infosystem/InfoSystem.cpp | 16 +++++++++++ src/libtomahawk/infosystem/InfoSystem.h | 28 +++++++++++++++---- .../infosystem/InfoSystemWorker.cpp | 7 +++-- src/libtomahawk/infosystem/InfoSystemWorker.h | 3 ++ 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/Typedefs.h b/src/libtomahawk/Typedefs.h index fc0dc5c6b..61973c1e3 100644 --- a/src/libtomahawk/Typedefs.h +++ b/src/libtomahawk/Typedefs.h @@ -208,6 +208,7 @@ namespace Tomahawk class InfoPlugin; + typedef QSet< InfoType > InfoTypeSet; typedef QMap< InfoType, QVariant > InfoTypeMap; typedef QMap< InfoType, uint > InfoTimeoutMap; typedef QHash< QString, QString > InfoStringHash; diff --git a/src/libtomahawk/infosystem/InfoSystem.cpp b/src/libtomahawk/infosystem/InfoSystem.cpp index f1cae7698..fc6c56b22 100644 --- a/src/libtomahawk/infosystem/InfoSystem.cpp +++ b/src/libtomahawk/infosystem/InfoSystem.cpp @@ -309,6 +309,22 @@ InfoSystem::removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin ) } +void +InfoSystem::receiveUpdatedSupportedGetTypes( InfoTypeSet supportedTypes ) +{ + m_supportedGetTypes = supportedTypes; + emit updatedSupportedGetTypes( m_supportedGetTypes ); +} + + +void +InfoSystem::receiveUpdatedSupportedPushTypes( InfoTypeSet supportedTypes ) +{ + m_supportedPushTypes = supportedTypes; + emit updatedSupportedPushTypes( m_supportedPushTypes ); +} + + QPointer< QThread > InfoSystem::workerThread() const { diff --git a/src/libtomahawk/infosystem/InfoSystem.h b/src/libtomahawk/infosystem/InfoSystem.h index c46fe46b7..433f304b1 100644 --- a/src/libtomahawk/infosystem/InfoSystem.h +++ b/src/libtomahawk/infosystem/InfoSystem.h @@ -155,9 +155,11 @@ public: virtual ~InfoSystemCacheThread(); void run(); - InfoSystemCache* cache() const; private: + friend class InfoSystem; + InfoSystemCache* cache() const; + QPointer< InfoSystemCache > m_cache; }; @@ -171,9 +173,12 @@ public: virtual ~InfoSystemWorkerThread(); void run(); - InfoSystemWorker* worker() const; private: + friend class DiagnosticsDialog; + friend class InfoSystem; + InfoSystemWorker* worker() const; + QPointer< InfoSystemWorker > m_worker; }; @@ -185,14 +190,17 @@ class DLLEXPORT InfoSystem : public QObject public: static InfoSystem* instance(); - InfoSystem( QObject *parent ); + InfoSystem( QObject* parent ); ~InfoSystem(); - bool getInfo( const InfoRequestData &requestData ); + bool getInfo( const InfoRequestData& requestData ); //WARNING: if changing timeoutMillis above, also change in below function in .cpp file - bool getInfo( const QString &caller, const QVariantMap &customData, const InfoTypeMap &inputMap, const InfoTimeoutMap &timeoutMap = InfoTimeoutMap(), bool allSources = false ); + bool getInfo( const QString &caller, const QVariantMap& customData, const InfoTypeMap& inputMap, const InfoTimeoutMap& timeoutMap = InfoTimeoutMap(), bool allSources = false ); bool pushInfo( InfoPushData pushData ); - bool pushInfo( const QString &caller, const InfoTypeMap &input, const PushInfoFlags pushFlags ); + bool pushInfo( const QString& caller, const InfoTypeMap& input, const PushInfoFlags pushFlags ); + + const InfoTypeSet& supportedGetTypes() const { return m_supportedGetTypes; } + const InfoTypeSet& supportedPushTypes() const { return m_supportedPushTypes; } QPointer< QThread > workerThread() const; @@ -206,14 +214,22 @@ signals: void finished( QString target ); void finished( QString target, Tomahawk::InfoSystem::InfoType type ); + void updatedSupportedGetTypes( Tomahawk::InfoSystem::InfoTypeSet supportedTypes ); + void updatedSupportedPushTypes( Tomahawk::InfoSystem::InfoTypeSet supportedTypes ); + private slots: void init(); + void receiveUpdatedSupportedGetTypes( Tomahawk::InfoSystem::InfoTypeSet supportedTypes ); + void receiveUpdatedSupportedPushTypes( Tomahawk::InfoSystem::InfoTypeSet supportedTypes ); private: bool m_inited; InfoSystemCacheThread* m_infoSystemCacheThreadController; InfoSystemWorkerThread* m_infoSystemWorkerThreadController; + InfoTypeSet m_supportedGetTypes; + InfoTypeSet m_supportedPushTypes; + static InfoSystem* s_instance; }; diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.cpp b/src/libtomahawk/infosystem/InfoSystemWorker.cpp index 4bceb6efe..eaaf64765 100644 --- a/src/libtomahawk/infosystem/InfoSystemWorker.cpp +++ b/src/libtomahawk/infosystem/InfoSystemWorker.cpp @@ -29,10 +29,10 @@ #include -#include -#include #include #include +#include +#include #include namespace Tomahawk @@ -130,6 +130,9 @@ InfoSystemWorker::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin ) ); QMetaObject::invokeMethod( plugin.data(), "init", Qt::QueuedConnection ); + + emit updatedSupportedGetTypes( QSet< InfoType >::fromList( m_infoGetMap.keys() ) ); + emit updatedSupportedPushTypes( QSet< InfoType >::fromList( m_infoPushMap.keys() ) ); } diff --git a/src/libtomahawk/infosystem/InfoSystemWorker.h b/src/libtomahawk/infosystem/InfoSystemWorker.h index 9b977571b..96a0ddb8f 100644 --- a/src/libtomahawk/infosystem/InfoSystemWorker.h +++ b/src/libtomahawk/infosystem/InfoSystemWorker.h @@ -55,6 +55,9 @@ signals: void finished( QString target ); void finished( QString target, Tomahawk::InfoSystem::InfoType type ); + void updatedSupportedGetTypes( Tomahawk::InfoSystem::InfoTypeSet supportedTypes ); + void updatedSupportedPushTypes( Tomahawk::InfoSystem::InfoTypeSet supportedTypes ); + public slots: void init( Tomahawk::InfoSystem::InfoSystemCache* cache ); void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );