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

Refactor platform check into its own function

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-27 22:08:16 +01:00
parent 7022b2ad1e
commit 1072e3cf2b
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/libtomahawk/accounts/ResolverAccount.cpp
View File

@@ -72,6 +72,38 @@ ResolverAccountFactory::createFromPath( const QString& path )
} }
/**
* Check if the bundle specifies a platform, and if so, reject the
* resolver if the platform is wrong.
*/
bool
isPlatformSupported( const QVariant& variant )
{
// No platform specified, so accept it.
if ( variant.isNull() )
return true;
const QString platform( variant.toString() );
// We accept any platform
if ( platform == "any" )
return true;
QString myPlatform( "any" );
#if defined( Q_OS_WIN )
myPlatform = "win";
#elif defined( Q_OS_MAC )
myPlatform = "osx";
#elif defined( Q_OS_LINUX )
if ( __WORDSIZE == 32 )
myPlatform = "linux-x86";
else if ( __WORDSIZE == 64 )
myPlatform = "linux-x64";
#endif
return myPlatform.contains( platform );
}
Account* Account*
ResolverAccountFactory::createFromPath( const QString& path, const QString& factory, bool isAttica ) ResolverAccountFactory::createFromPath( const QString& path, const QString& factory, bool isAttica )
{ {
@@ -170,28 +202,10 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
//else we just have empty metadata (legacy resolver without desktop file) //else we just have empty metadata (legacy resolver without desktop file)
} }
//check if the bundle specifies a platform, and if so, reject the resolver if the platform is wrong if ( !isPlatformSupported( configuration[ "platform" ] ) )
if ( !configuration[ "platform" ].isNull() && configuration[ "platform" ].toString() != "any" )
{ {
QString platform( configuration[ "platform" ].toString() ); displayError( tr( "Resolver installation error: platform mismatch." ) );
QString myPlatform( "any" ); return nullptr;
#if defined( Q_OS_WIN )
myPlatform = "win";
#elif defined( Q_OS_MAC )
myPlatform = "osx";
#elif defined( Q_OS_LINUX )
if ( __WORDSIZE == 32 )
myPlatform = "linux-x86";
else if ( __WORDSIZE == 64 )
myPlatform = "linux-x64";
#endif
if ( !myPlatform.contains( platform ) )
{
displayError( tr( "Resolver installation error: platform mismatch." ) );
return nullptr;
}
} }
if ( !configuration[ "tomahawkVersion" ].isNull() ) if ( !configuration[ "tomahawkVersion" ].isNull() )