mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-22 19:05:05 +01:00
Code Issues Releases Wiki Activity

Added path check for metadata.json through Attica.

Browse Source
This commit is contained in:
Teo Mrnjavac 2013-04-07 19:19:59 +02:00
parent 2d57f6c140
commit 8cc52bca75
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,12 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
if ( dir.cdUp() && dir.cdUp() ) //go up twice to the content dir, if any
{
QString metadataFilePath = dir.absoluteFilePath( "metadata.json" );
configuration = metadataFromJsonFile( metadataFilePath );
expandPaths( dir, configuration );
QFileInfo metadataFileInfo( metadataFilePath );
if ( metadataFileInfo.isFile() && metadataFileInfo.isReadable() )
{
configuration = metadataFromJsonFile( metadataFilePath );
expandPaths( dir, configuration );
}
}
return new AtticaResolverAccount( generateId( factory ), path, pathInfo.baseName(), configuration );
}