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/settings/subsonicsettingspage.cpp
View File

@@ -44,16 +44,13 @@ SubsonicSettingsPage::SubsonicSettingsPage(SettingsDialog *parent)
connect(ui_->button_test, SIGNAL(clicked()), SLOT(TestClicked()));
connect(this, SIGNAL(Test(QString, int, QString, QString)), service_, SLOT(SendPing(QString, int, QString, QString)));
connect(this, SIGNAL(Test(QUrl, const QString&, const QString&)), service_, SLOT(SendPing(QUrl, const QString&, const QString&)));
connect(service_, SIGNAL(TestFailure(QString)), SLOT(TestFailure(QString)));
connect(service_, SIGNAL(TestSuccess()), SLOT(TestSuccess()));
dialog()->installEventFilter(this);
ui_->scheme->addItem("HTTP", "http");
ui_->scheme->addItem("HTTPS", "https");
}
SubsonicSettingsPage::~SubsonicSettingsPage() { delete ui_; }
@@ -64,9 +61,7 @@ void SubsonicSettingsPage::Load() {
s.beginGroup(kSettingsGroup);
ui_->enable->setChecked(s.value("enabled", false).toBool());
dialog()->ComboBoxLoadFromSettings(s, ui_->scheme, "scheme", "https");
ui_->hostname->setText(s.value("hostname").toString());
ui_->port->setText(QString::number(s.value("port", 4040).toInt()));
ui_->url->setText(s.value("url").toString());
ui_->username->setText(s.value("username").toString());
QByteArray password = s.value("password").toByteArray();
if (password.isEmpty()) ui_->password->clear();
@@ -82,9 +77,7 @@ void SubsonicSettingsPage::Save() {
QSettings s;
s.beginGroup(kSettingsGroup);
s.setValue("enabled", ui_->enable->isChecked());
s.setValue("scheme", ui_->scheme->itemData(ui_->scheme->currentIndex()));
s.setValue("hostname", ui_->hostname->text());
s.setValue("port", ui_->port->text().toInt());
s.setValue("url", QUrl(ui_->url->text()));
s.setValue("username", ui_->username->text());
s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64()));
s.setValue("verifycertificate", ui_->checkbox_verify_certificate->isChecked());
@@ -97,12 +90,18 @@ void SubsonicSettingsPage::Save() {
void SubsonicSettingsPage::TestClicked() {
if (ui_->hostname->text().isEmpty() || ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) {
QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing hostname, username or password."));
if (ui_->url->text().isEmpty() || ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) {
QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing url, username or password."));
return;
}
emit Test(ui_->hostname->text(), ui_->port->text().toInt(), ui_->username->text(), ui_->password->text());
QUrl url(ui_->url->text());
if (!url.isValid()) {
QMessageBox::critical(this, tr("Configuration incorrect"), tr("URL is invalid."));
return;
}
emit Test(url, ui_->username->text(), ui_->password->text());
ui_->button_test->setEnabled(false);
}

2
src/settings/subsonicsettingspage.h
View File

@@ -45,7 +45,7 @@ class SubsonicSettingsPage : public SettingsPage {
signals:
void Test();
void Test(const QString &hostname, const int port, const QString &username, const QString &password);
void Test(QUrl url, const QString &username, const QString &password);
private slots:
void TestClicked();

24
src/settings/subsonicsettingspage.ui
View File

@@ -31,33 +31,13 @@
<item>
<widget class="QGroupBox" name="server_group">
<property name="title">
<string>Server</string>
<string>Server URL</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="layout_server">
<item>
<widget class="QComboBox" name="scheme"/>
</item>
<item>
<widget class="QLineEdit" name="hostname"/>
</item>
<item>
<widget class="QLabel" name="label_port">
<property name="text">
<string>Port</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="port">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
<widget class="QLineEdit" name="url"/>
</item>
<item>
<spacer name="spacer_server">