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

Load resolver metadata from JSON file rather than desktop file.

Browse Source
This commit is contained in:
Teo Mrnjavac
2013-03-13 23:11:05 +01:00
parent 709c6e1da2
commit 056562d782
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
#include "TomahawkSettings.h" #include "TomahawkSettings.h"
#include "Source.h" #include "Source.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "qjson/parser.h"
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
@@ -85,9 +86,9 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
if ( !dir.cd( "content" ) ) //more fubar if ( !dir.cd( "content" ) ) //more fubar
return 0; return 0;
QString desktopFilePath = dir.absoluteFilePath( "metadata.desktop" ); QString metadataFilePath = dir.absoluteFilePath( "metadata.json" );
configuration = metadataFromDesktopFile( desktopFilePath ); configuration = metadataFromJsonFile( metadataFilePath );
realPath = configuration[ "path" ].toString(); realPath = configuration[ "path" ].toString();
if ( realPath.isEmpty() ) if ( realPath.isEmpty() )
return 0; return 0;
@@ -97,8 +98,8 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
QDir dir = pathInfo.absoluteDir();//assume we are in the code directory of a bundle QDir dir = pathInfo.absoluteDir();//assume we are in the code directory of a bundle
if ( dir.cdUp() && dir.cdUp() ) //go up twice to the content dir, if any if ( dir.cdUp() && dir.cdUp() ) //go up twice to the content dir, if any
{ {
QString desktopFilePath = dir.absoluteFilePath( "metadata.desktop" ); QString metadataFilePath = dir.absoluteFilePath( "metadata.json" );
configuration = metadataFromDesktopFile( desktopFilePath ); configuration = metadataFromJsonFile( metadataFilePath );
configuration[ "path" ] = realPath; //our initial path still overrides whatever the desktop file says configuration[ "path" ] = realPath; //our initial path still overrides whatever the desktop file says
} }
//else we just have empty metadata (legacy resolver without desktop file) //else we just have empty metadata (legacy resolver without desktop file)
@@ -112,37 +113,31 @@ ResolverAccountFactory::createFromPath( const QString& path, const QString& fact
QVariantHash QVariantHash
ResolverAccountFactory::metadataFromDesktopFile( const QString& path ) ResolverAccountFactory::metadataFromJsonFile( const QString& path )
{ {
QVariantHash result; QVariantHash result;
QFile desktopFile( path ); QFile metadataFile( path );
if ( desktopFile.open( QIODevice::ReadOnly | QIODevice::Text ) ) if ( metadataFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
{ {
QTextStream desktopFileStream( &desktopFile ); QJson::Parser parser;
bool ok;
QVariantMap variant = parser.parse( metadataFile.readAll(), &ok ).toMap();
while ( !desktopFileStream.atEnd() ) if ( ok )
{ {
QString line = desktopFileStream.readLine().trimmed(); result[ "author" ] = variant[ "author" ];
result[ "description" ] = variant[ "description" ];
if ( line.contains( QRegExp( "^X-Synchrotron-MainScript\\s*=\\s*" ) ) ) if ( !variant[ "manifest" ].isNull() )
{ {
line.remove( QRegExp( "^X-Synchrotron-MainScript\\s*=\\s*" ) ); QVariantMap manifest = variant[ "manifest" ].toMap();
QFileInfo fi( path ); if ( !manifest[ "main" ].isNull() )
result[ "path" ] = fi.absoluteDir().absoluteFilePath( line ); //this is our path to the JS {
QFileInfo fi( path );
result[ "path" ] = fi.absoluteDir().absoluteFilePath( manifest[ "main" ].toString() ); //this is our path to the JS
}
} }
else if ( line.contains( QRegExp( "^X-KDE-PluginInfo-Author\\s*=\\s*" ) ) )
{
line.remove( QRegExp( "^X-KDE-PluginInfo-Author\\s*=\\s*" ) );
result[ "author" ] = line;
}
else if ( line.contains( QRegExp( "^Comment\\s*=\\s*" ) ) )
{
line.remove( QRegExp( "^Comment\\s*=\\s*" ) );
result[ "description" ] = line;
}
//TODO: correct baseName and rename directory maybe?
} }
//TODO: correct baseName and rename directory maybe?
} }
return result; return result;
} }

2
src/libtomahawk/accounts/ResolverAccount.h
View File

@@ -54,7 +54,7 @@ public:
static Account* createFromPath( const QString& path, const QString& factoryId, bool isAttica ); static Account* createFromPath( const QString& path, const QString& factoryId, bool isAttica );
private: private:
static QVariantHash metadataFromDesktopFile( const QString& path ); static QVariantHash metadataFromJsonFile( const QString& path );
}; };
/** /**