dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use single url setting instead for subsonic, check http code

Browse Source
This commit is contained in:
Jonas Kvinge
2019-06-18 01:22:03 +02:00
parent 2c8cde4d91
commit 1d67b623e0
9 changed files with 42 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/subsonic/subsonicservice.cpp
View File

@@ -105,9 +105,7 @@ void SubsonicService::ReloadSettings() {
QSettings s;
s.beginGroup(SubsonicSettingsPage::kSettingsGroup);
scheme_ = s.value("scheme", "https").toString();
hostname_ = s.value("hostname").toString();
port_ = s.value("port", 443).toInt();
server_url_ = s.value("url").toUrl();
username_ = s.value("username").toString();
QByteArray password = s.value("password").toByteArray();
if (password.isEmpty()) password_.clear();
@@ -125,10 +123,10 @@ QString SubsonicService::CoverCacheDir() {
}
void SubsonicService::SendPing() {
SendPing(hostname_, port_, username_, password_);
SendPing(server_url_, username_, password_);
}
void SubsonicService::SendPing(const QString &hostname, const int port, const QString &username, const QString &password) {
void SubsonicService::SendPing(QUrl url, const QString &username, const QString &password) {
const ParamList params = ParamList() << Param("c", kClientName)
<< Param("v", kApiVersion)
@@ -142,17 +140,12 @@ void SubsonicService::SendPing(const QString &hostname, const int port, const QS
url_query.addQueryItem(encoded_param.first, encoded_param.second);
}
QUrl url;
if (scheme_.isEmpty()) url.setScheme("https");
else url.setScheme(scheme_);
url.setHost(hostname);
url.setPort(port);
url.setPath("/rest/ping.view");
url.setQuery(url_query);
QNetworkRequest req(url);
if (!verify_certificate_) {
if (url.scheme() == "https" && !verify_certificate_) {
QSslConfiguration sslconfig = QSslConfiguration::defaultConfiguration();
sslconfig.setPeerVerifyMode(QSslSocket::VerifyNone);
req.setSslConfiguration(sslconfig);
@@ -205,6 +198,12 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply) {
}
}
int http_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (http_code != 200) {
PingError(QString("Received HTTP code %1").arg(http_code));
return;
}
QByteArray data(reply->readAll());
QJsonParseError json_error;
@@ -288,8 +287,8 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply) {
void SubsonicService::CheckConfiguration() {
if (hostname_.isEmpty()) {
emit TestComplete(false, "Missing Subsonic hostname.");
if (server_url_.isEmpty()) {
emit TestComplete(false, "Missing Subsonic server url.");
return;
}
if (username_.isEmpty()) {