Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Work around Qt's QUrl parser. (#6059) 

Qt's QUrl parser does no longer accept pure numeric hostnames without
trying to make a dotted IPv4 address of them.
Thus current method of storing subsonic's numeric ids in the host part
of a QUrl ("subsonic://<id>") does no longer work.
Instead a query is constructed omitting the host-part entirely and using
"subsonic://?id=<id>" to store and retrieve subsonic titles.
This commit is contained in:
ftiede 2018-05-23 15:23:21 +02:00 committed by John Maguire
parent 783cdf938a
commit 4619a4c1ab
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/internet/subsonic/subsonicservice.cpp
View File

@ -541,7 +541,10 @@ void SubsonicLibraryScanner::OnGetAlbumFinished(QNetworkReply* reply) {
qint64 length = reader.attributes().value("duration").toString().toInt();
length *= kNsecPerSec;
song.set_length_nanosec(length);
QUrl url = QUrl(QString("subsonic://%1").arg(id));
QUrl url = QUrl(QString("subsonic://"));
QUrlQuery song_query(url.query());
song_query.addQueryItem("id", id);
url.setQuery(song_query);
QUrl cover_url = service_->BuildRequestUrl("getCoverArt");
QUrlQuery cover_url_query(url.query());
cover_url_query.addQueryItem("id", id);

3
src/internet/subsonic/subsonicurlhandler.cpp
View File

@ -30,9 +30,10 @@ UrlHandler::LoadResult SubsonicUrlHandler::StartLoading(const QUrl& url) {
if (service_->login_state() != SubsonicService::LoginState_Loggedin)
return LoadResult(url);
QUrlQuery id(url.query());
QUrl newurl = service_->BuildRequestUrl("stream");
QUrlQuery url_query(newurl.query());
url_query.addQueryItem("id", url.host());
url_query.addQueryItem("id", id.queryItemValue("id"));
newurl.setQuery(url_query);
return LoadResult(url, LoadResult::TrackAvailable, newurl);
}