Revert irrelevant musicdns changes.
This commit is contained in:
parent
55e9fd8dc3
commit
047bec831b
|
@ -16,18 +16,14 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "musicdnsclient.h"
|
#include "musicdnsclient.h"
|
||||||
|
#include "core/network.h"
|
||||||
|
|
||||||
#include <QBuffer>
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QNetworkReply>
|
#include <QNetworkReply>
|
||||||
#include <QXmlStreamReader>
|
#include <QXmlStreamReader>
|
||||||
#include <QtDebug>
|
#include <QtDebug>
|
||||||
|
|
||||||
#include "core/logging.h"
|
const char* MusicDnsClient::kClientId = "c44f70e49000dd7c0d1388bff2bf4152";
|
||||||
#include "core/network.h"
|
|
||||||
|
|
||||||
//const char* MusicDnsClient::kClientId = "c44f70e49000dd7c0d1388bff2bf4152";
|
|
||||||
const char* MusicDnsClient::kClientId = "0736ac2cd889ef77f26f6b5e3fb8a09c";
|
|
||||||
const char* MusicDnsClient::kUrl = "http://ofa.musicdns.org/ofa/1/track";
|
const char* MusicDnsClient::kUrl = "http://ofa.musicdns.org/ofa/1/track";
|
||||||
const int MusicDnsClient::kDefaultTimeout = 5000; // msec
|
const int MusicDnsClient::kDefaultTimeout = 5000; // msec
|
||||||
|
|
||||||
|
@ -53,12 +49,10 @@ void MusicDnsClient::Start(int id, const QString& fingerprint, int duration_msec
|
||||||
<< Param("cvr", QString("%1 %2").arg(QCoreApplication::applicationName(),
|
<< Param("cvr", QString("%1 %2").arg(QCoreApplication::applicationName(),
|
||||||
QCoreApplication::applicationVersion()))
|
QCoreApplication::applicationVersion()))
|
||||||
<< Param("dur", QString::number(duration_msec))
|
<< Param("dur", QString::number(duration_msec))
|
||||||
<< Param("lkt", "1")
|
|
||||||
<< Param("fmt", "unknown")
|
<< Param("fmt", "unknown")
|
||||||
<< Param("fpt", fingerprint)
|
<< Param("fpt", fingerprint)
|
||||||
<< Param("gnr", "unknown")
|
<< Param("gnr", "unknown")
|
||||||
<< Param("rmd", "1")
|
<< Param("rmd", "1")
|
||||||
<< Param("rmt", "0")
|
|
||||||
<< Param("tnm", "0")
|
<< Param("tnm", "0")
|
||||||
<< Param("ttl", "unknown")
|
<< Param("ttl", "unknown")
|
||||||
<< Param("yrr", "0");
|
<< Param("yrr", "0");
|
||||||
|
@ -67,8 +61,6 @@ void MusicDnsClient::Start(int id, const QString& fingerprint, int duration_msec
|
||||||
url.setQueryItems(parameters);
|
url.setQueryItems(parameters);
|
||||||
QNetworkRequest req(url);
|
QNetworkRequest req(url);
|
||||||
|
|
||||||
qLog(Debug) << url;
|
|
||||||
|
|
||||||
QNetworkReply* reply = network_->get(req);
|
QNetworkReply* reply = network_->get(req);
|
||||||
connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));
|
connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));
|
||||||
requests_[reply] = id;
|
requests_[reply] = id;
|
||||||
|
@ -98,19 +90,12 @@ void MusicDnsClient::RequestFinished() {
|
||||||
|
|
||||||
int id = requests_.take(reply);
|
int id = requests_.take(reply);
|
||||||
|
|
||||||
qLog(Debug) << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
|
|
||||||
|
|
||||||
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
|
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
|
||||||
emit Finished(id, QString());
|
emit Finished(id, QString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QByteArray data = reply->readAll();
|
QXmlStreamReader reader(reply);
|
||||||
qLog(Debug) << data;
|
|
||||||
QBuffer buffer(&data);
|
|
||||||
buffer.open(QIODevice::ReadOnly);
|
|
||||||
|
|
||||||
QXmlStreamReader reader(&buffer);
|
|
||||||
while (!reader.atEnd()) {
|
while (!reader.atEnd()) {
|
||||||
if (reader.readNext() == QXmlStreamReader::StartElement && reader.name() == "puid") {
|
if (reader.readNext() == QXmlStreamReader::StartElement && reader.name() == "puid") {
|
||||||
QString puid = reader.attributes().value("id").toString();
|
QString puid = reader.attributes().value("id").toString();
|
||||||
|
|
Loading…
Reference in New Issue