mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 01:54:07 +02:00
Code Issues Releases Wiki Activity

Remove some debug and change around some proxy ordering to make sense when no hostname is passed in

Browse Source
This commit is contained in:
Jeff Mitchell
2012-06-18 16:18:44 -04:00
parent fda615f0ab
commit bb44c9a2e9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MusicScanner.cpp
View File

@@ -287,7 +287,7 @@ MusicScanner::scanFile( const QFileInfo& fi )
m_filemtimes.remove( "file://" + fi.canonicalFilePath() ); m_filemtimes.remove( "file://" + fi.canonicalFilePath() );
} }
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath(); //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath();
QVariant m = readFile( fi ); QVariant m = readFile( fi );
if ( m.toMap().isEmpty() ) if ( m.toMap().isEmpty() )
return; return;

6
src/libtomahawk/utils/TomahawkUtils.cpp
View File

@@ -333,14 +333,14 @@ NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other )
QList< QNetworkProxy > QList< QNetworkProxy >
NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query ) NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
{ {
//tDebug() << Q_FUNC_INFO << "query hostname is " << query.peerHostName(); //tDebug() << Q_FUNC_INFO << "query hostname is " << query.peerHostName() << ", proxy host is " << m_proxy.hostName();
QList< QNetworkProxy > proxies; QList< QNetworkProxy > proxies;
QString hostname = query.peerHostName(); QString hostname = query.peerHostName();
s_noProxyHostsMutex.lock(); s_noProxyHostsMutex.lock();
if ( s_noProxyHosts.contains( hostname ) ) if ( !hostname.isEmpty() && s_noProxyHosts.contains( hostname ) )
proxies << QNetworkProxy::NoProxy << systemProxyForQuery( query ); proxies << QNetworkProxy::NoProxy << systemProxyForQuery( query );
else if ( m_proxy.hostName().isEmpty() || hostname.isEmpty() || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy ) else if ( m_proxy.hostName().isEmpty() || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy )
proxies << systemProxyForQuery( query ); proxies << systemProxyForQuery( query );
else else
proxies << m_proxy << systemProxyForQuery( query ); proxies << m_proxy << systemProxyForQuery( query );