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

Fix playing of files from windows share

Browse Source
This commit is contained in:
craig.p.drummond
2013-10-16 18:24:04 +00:00
committed by craig.p.drummond
parent e8ac259901
commit 6000884da3
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
http/httpserver.cpp
View File

@@ -26,6 +26,7 @@
#include "tags.h"
#include "settings.h"
#include "thread.h"
#include <QFile>
#include <QUrl>
#if QT_VERSION >= 0x050000
#include <QUrlQuery>
@@ -187,7 +188,15 @@ QByteArray HttpServer::encodeUrl(const QString &file) const
{
#ifdef Q_OS_WIN
QString f=fixWindowsPath(file);
DBUG << "file" << f;
DBUG << "file" << f << "orig" << file;
// For some reason, drag'n' drop of \\share\path\file.mp3 is changed to share/path/file.mp3!
if (!f.startsWith(QLatin1String("//")) && !QFile::exists(f)) {
QString share=f.startsWith(QLatin1Char('/')) ? (QLatin1Char('/')+f) : (QLatin1String("//")+f);
if (QFile::exists(share)) {
f=share;
DBUG << "converted to share-path" << f;
}
}
Song s=Tags::read(f);
s.file=f;
#else

14
http/httpsocket.cpp
View File

@@ -327,7 +327,7 @@ void HttpSocket::readClient()
if (tokens.length()>=2 && "GET"==tokens[0]) {
QStringList params = QString(socket->readAll()).split(QRegExp("[\r\n][\r\n]*"));
DBUG << "params" << params;
DBUG << "params" << params << "tokens" << tokens;
if (!isFromMpd(params)) {
return;
}
@@ -403,6 +403,16 @@ void HttpSocket::readClient()
}
#endif
} else if (!song.file.isEmpty()) {
#ifdef Q_OS_WIN
if (tokens[1].startsWith("//") && !song.file.startsWith(QLatin1String("//")) && !QFile::exists(song.file)) {
QString share=QLatin1String("//")+url.host()+song.file;
if (QFile::exists(share)) {
song.file=share;
DBUG << "fixed share-path" << song.file;
}
}
#endif
QFile f(song.file);
if (f.open(QIODevice::ReadOnly)) {
@@ -464,7 +474,7 @@ void HttpSocket::readClient()
if (!ok) {
QTextStream os(socket);
os.setAutoDetectUnicode(true);
os << "HTTP/1.0 404 Ok\r\n"
os << "HTTP/1.0 404 OK\r\n"
"Content-Type: text/html; charset=\"utf-8\"\r\n"
"\r\n"
"<h1>Nothing to see here</h1>\n";