iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Decode tags from files to pass to mpd in server urls

Browse Source
This commit is contained in:
craig
2012-03-04 20:58:07 +00:00
committed by craig
parent 48edc1d7b2
commit 13ebd33077
3 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
http/httpserver.cpp
View File

@@ -24,6 +24,7 @@
#include "httpserver.h"
#include "httpsocket.h"
#include "utils.h"
#include "tags.h"
#include <QtCore/QUrl>
#include <QtCore/QThread>
#ifdef ENABLE_KDE_SUPPORT
@@ -149,13 +150,9 @@ QByteArray HttpServer::encodeUrl(const Song &s) const
QByteArray HttpServer::encodeUrl(const QString &file) const
{
QUrl url;
url.setScheme("http");
url.setHost("127.0.0.1");
url.setPort(socket->port());
url.setPath(file);
url.addQueryItem("cantata", "file");
return url.toEncoded();
Song s=Tags::read(file);
s.fillEmptyFields();
return encodeUrl(s);
}
Song HttpServer::decodeUrl(const QString &url) const
@@ -198,16 +195,3 @@ Song HttpServer::decodeUrl(const QString &url) const
return s;
}
QString HttpServer::decodeFileUrl(const QString &file) const
{
if (isAlive()) {
QUrl u(file);
if (u.hasQueryItem("cantata") && u.queryItemValue("cantata")=="file") {
return u.path();
}
}
return QString();
}