mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 14:16:32 +02:00
Remove QJson usage (except QObjectHelper) from infoplugins
This commit is contained in:
@@ -32,9 +32,6 @@
|
|||||||
#include "utils/NetworkAccessManager.h"
|
#include "utils/NetworkAccessManager.h"
|
||||||
#include "Source.h"
|
#include "Source.h"
|
||||||
|
|
||||||
#include <qjson/parser.h>
|
|
||||||
#include <qjson/serializer.h>
|
|
||||||
|
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
#include <QNetworkConfiguration>
|
#include <QNetworkConfiguration>
|
||||||
@@ -296,14 +293,14 @@ ChartsPlugin::chartSourcesList()
|
|||||||
|
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
const QVariantMap res = p.parse( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
const QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
const QVariantList sources = res.value( "sources" ).toList();
|
const QVariantList sources = res.value( "sources" ).toList();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << Q_FUNC_INFO << "Failed to parse sources" << p.errorString() << "On line" << p.errorLine();
|
tLog() << Q_FUNC_INFO << "Failed to parse sources" << jsonData;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -438,14 +435,13 @@ ChartsPlugin::chartsList()
|
|||||||
|
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
QVariantMap res = p.parse( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
|
tLog() << "Failed to parse resources" << jsonData;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -631,13 +627,13 @@ ChartsPlugin::chartReturned()
|
|||||||
|
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
QVariantMap res = p.parse( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
|
tLog() << "Failed to parse json from chart lookup:" << jsonData;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -24,8 +24,6 @@
|
|||||||
#include "utils/Closure.h"
|
#include "utils/Closure.h"
|
||||||
#include "utils/NetworkAccessManager.h"
|
#include "utils/NetworkAccessManager.h"
|
||||||
|
|
||||||
#include <qjson/parser.h>
|
|
||||||
|
|
||||||
#include <QNetworkReply>
|
#include <QNetworkReply>
|
||||||
#include <QDomDocument>
|
#include <QDomDocument>
|
||||||
|
|
||||||
@@ -116,8 +114,7 @@ DiscogsPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requestD
|
|||||||
void
|
void
|
||||||
DiscogsPlugin::albumSearchSlot( const InfoRequestData &requestData, QNetworkReply *reply )
|
DiscogsPlugin::albumSearchSlot( const InfoRequestData &requestData, QNetworkReply *reply )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
QVariantMap results = TomahawkUtils::parseJson( reply->readAll() ).toMap();
|
||||||
QVariantMap results = p.parse( reply ).toMap();
|
|
||||||
|
|
||||||
if ( !results.contains( "results" ) || results.value( "results" ).toList().isEmpty() )
|
if ( !results.contains( "results" ) || results.value( "results" ).toList().isEmpty() )
|
||||||
{
|
{
|
||||||
@@ -145,8 +142,7 @@ DiscogsPlugin::albumSearchSlot( const InfoRequestData &requestData, QNetworkRepl
|
|||||||
void
|
void
|
||||||
DiscogsPlugin::albumInfoSlot( const InfoRequestData& requestData, QNetworkReply* reply )
|
DiscogsPlugin::albumInfoSlot( const InfoRequestData& requestData, QNetworkReply* reply )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
QVariantMap results = TomahawkUtils::parseJson( reply->readAll() ).toMap();
|
||||||
QVariantMap results = p.parse( reply ).toMap();
|
|
||||||
|
|
||||||
if ( !results.contains( "resp" ) )
|
if ( !results.contains( "resp" ) )
|
||||||
{
|
{
|
||||||
|
@@ -36,8 +36,6 @@
|
|||||||
|
|
||||||
#define HYPEM_URL "http://hypem.com/playlist/"
|
#define HYPEM_URL "http://hypem.com/playlist/"
|
||||||
#define HYPEM_END_URL "json/1/data.js"
|
#define HYPEM_END_URL "json/1/data.js"
|
||||||
#include <qjson/parser.h>
|
|
||||||
#include <qjson/serializer.h>
|
|
||||||
|
|
||||||
namespace Tomahawk
|
namespace Tomahawk
|
||||||
{
|
{
|
||||||
@@ -323,13 +321,13 @@ HypemPlugin::chartReturned()
|
|||||||
QVariantMap returnedData;
|
QVariantMap returnedData;
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
QVariantMap res = p.parse( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
|
tLog() << "Failed to parse json from chart lookup:" << jsonData;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -32,9 +32,6 @@
|
|||||||
#include "Source.h"
|
#include "Source.h"
|
||||||
#include "utils/NetworkAccessManager.h"
|
#include "utils/NetworkAccessManager.h"
|
||||||
|
|
||||||
#include <qjson/parser.h>
|
|
||||||
#include <qjson/serializer.h>
|
|
||||||
|
|
||||||
#include <QDate>
|
#include <QDate>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
@@ -305,14 +302,14 @@ NewReleasesPlugin::nrSourcesList()
|
|||||||
|
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
const QVariantMap res = p.parse ( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
const QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
const QVariantList sources = res.value ( "sources" ).toList();
|
const QVariantList sources = res.value ( "sources" ).toList();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tDebug() << Q_FUNC_INFO << "Failed to parse sources" << p.errorString() << "On line" << p.errorLine();
|
tDebug() << Q_FUNC_INFO << "Failed to parse sources" << jsonData;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -439,13 +436,13 @@ NewReleasesPlugin::nrList()
|
|||||||
|
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
const QVariantMap res = p.parse( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
const QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
|
tLog() << "Failed to parse resources" << jsonData;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -669,13 +666,13 @@ NewReleasesPlugin::nrReturned()
|
|||||||
|
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
QVariantMap res = p.parse ( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
|
tLog() << "Failed to parse json from chart lookup:" << jsonData;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -36,8 +36,6 @@
|
|||||||
#include "Source.h"
|
#include "Source.h"
|
||||||
|
|
||||||
#define SPOTIFY_API_URL "http://spotikea.tomahawk-player.org/"
|
#define SPOTIFY_API_URL "http://spotikea.tomahawk-player.org/"
|
||||||
#include <qjson/parser.h>
|
|
||||||
#include <qjson/serializer.h>
|
|
||||||
|
|
||||||
using namespace Tomahawk::InfoSystem;
|
using namespace Tomahawk::InfoSystem;
|
||||||
|
|
||||||
@@ -200,14 +198,14 @@ SpotifyPlugin::chartTypes()
|
|||||||
|
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
const QVariantMap res = p.parse( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
const QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
const QVariantMap chartObj = res;
|
const QVariantMap chartObj = res;
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << Q_FUNC_INFO << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
|
tLog() << Q_FUNC_INFO << "Failed to parse resources:" << jsonData;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -289,13 +287,13 @@ SpotifyPlugin::chartReturned()
|
|||||||
QVariantMap returnedData;
|
QVariantMap returnedData;
|
||||||
if ( reply->error() == QNetworkReply::NoError )
|
if ( reply->error() == QNetworkReply::NoError )
|
||||||
{
|
{
|
||||||
QJson::Parser p;
|
|
||||||
bool ok;
|
bool ok;
|
||||||
QVariantMap res = p.parse( reply, &ok ).toMap();
|
QByteArray jsonData = reply->readAll();
|
||||||
|
QVariantMap res = TomahawkUtils::parseJson( jsonData, &ok ).toMap();
|
||||||
|
|
||||||
if ( !ok )
|
if ( !ok )
|
||||||
{
|
{
|
||||||
tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
|
tLog() << "Failed to parse json from chart lookup:" << jsonData;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user