mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-21 13:21:52 +02:00
Code Issues Releases Wiki Activity

Fix external resolvers that depend on setup message

Browse Source
This commit is contained in:
Leo Franchi
2011-07-31 13:16:10 -04:00
parent 3e1d58463d
commit e3dddea777
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/resolvers/scriptresolver.cpp
View File

@@ -58,21 +58,7 @@ ScriptResolver::ScriptResolver( const QString& exe )
if ( !TomahawkUtils::nam() )
return;
// Send a configutaion message with any information the resolver might need
// For now, only the proxy information is sent
QVariantMap m;
m.insert( "_msgtype", "config" );
TomahawkUtils::NetworkProxyFactory* factory = dynamic_cast<TomahawkUtils::NetworkProxyFactory*>( TomahawkUtils::nam()->proxyFactory() );
QNetworkProxy proxy = factory->proxy();
QString proxyType = ( proxy.type() == QNetworkProxy::Socks5Proxy ? "socks5" : "none" );
m.insert( "proxytype", proxyType );
m.insert( "proxyhost", proxy.hostName() );
m.insert( "proxyport", proxy.port() );
m.insert( "proxyuser", proxy.user() );
m.insert( "proxypass", proxy.password() );
m.insert( "noproxyhosts", factory->noProxyHosts() );
QByteArray data = m_serializer.serialize( m );
sendMsg( data );
sendConfig();
}
@@ -86,6 +72,31 @@ ScriptResolver::~ScriptResolver()
delete m_configWidget.data();
}
void
ScriptResolver::sendConfig()
{
// Send a configutaion message with any information the resolver might need
// For now, only the proxy information is sent
QVariantMap m;
m.insert( "_msgtype", "config" );
TomahawkUtils::NetworkProxyFactory* factory = dynamic_cast<TomahawkUtils::NetworkProxyFactory*>( TomahawkUtils::nam()->proxyFactory() );
QNetworkProxy proxy = factory->proxy();
QString proxyType = ( proxy.type() == QNetworkProxy::Socks5Proxy ? "socks5" : "none" );
m.insert( "proxytype", proxyType );
m.insert( "proxyhost", proxy.hostName() );
m.insert( "proxyport", proxy.port() );
m.insert( "proxyuser", proxy.user() );
m.insert( "proxypass", proxy.password() );
// QJson sucks
QVariantList hosts;
foreach ( const QString& host, factory->noProxyHosts() )
hosts << host;
m.insert( "noproxyhosts", hosts );
QByteArray data = m_serializer.serialize( m );
sendMsg( data );
}
void
ScriptResolver::reload()
@@ -96,6 +107,8 @@ ScriptResolver::reload()
{
m_proc.start( filePath() );
m_error = Tomahawk::ExternalResolver::NoError;
sendConfig();
}
}
@@ -247,6 +260,7 @@ ScriptResolver::cmdExited( int code, QProcess::ExitStatus status )
m_num_restarts++;
tLog() << "*** Restart num" << m_num_restarts;
m_proc.start( filePath() );
sendConfig();
}
else
{

2
src/resolvers/scriptresolver.h
View File

@@ -63,6 +63,8 @@ private slots:
void cmdExited( int code, QProcess::ExitStatus status );
private:
void sendConfig();
void handleMsg( const QByteArray& msg );
void sendMsg( const QByteArray& msg );
void doSetup( const QVariantMap& m );