Add Subsonic support (#180)

src/settings/settingsdialog.cpp

@@ -68,6 +68,9 @@
 #ifdef HAVE_MOODBAR
 #  include "moodbarsettingspage.h"
 #endif
+#ifdef HAVE_SUBSONIC
+#  include "subsonicsettingspage.h"
+#endif
 
 #include "ui_settingsdialog.h"
 
@@ -140,12 +143,15 @@ SettingsDialog::SettingsDialog(Application *app, QWidget *parent)
   AddPage(Page_Moodbar, new MoodbarSettingsPage(this), iface);
 #endif
 
-#if defined(HAVE_TIDAL)
+#if defined(HAVE_TIDAL) || defined(HAVE_SUBSONIC)
   QTreeWidgetItem *streaming = AddCategory(tr("Streaming"));
 #endif
 #ifdef HAVE_TIDAL
   AddPage(Page_Tidal, new TidalSettingsPage(this), streaming);
 #endif
+#ifdef HAVE_SUBSONIC
+  AddPage(Page_Subsonic, new SubsonicSettingsPage(this), streaming);
+#endif
 
   // List box
   connect(ui_->list, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), SLOT(CurrentItemChanged(QTreeWidgetItem*)));

src/settings/settingsdialog.h

@@ -83,6 +83,7 @@ class SettingsDialog : public QDialog {
     Page_Proxy,
     Page_Scrobbler,
     Page_Tidal,
+    Page_Subsonic,
     Page_Moodbar,
   };
 

src/settings/subsonicsettingspage.cpp

@@ -0,0 +1,132 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2019, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <QObject>
+#include <QString>
+#include <QSettings>
+#include <QMessageBox>
+#include <QEvent>
+
+#include "subsonicsettingspage.h"
+#include "ui_subsonicsettingspage.h"
+#include "core/application.h"
+#include "core/iconloader.h"
+#include "internet/internetservices.h"
+#include "subsonic/subsonicservice.h"
+
+const char *SubsonicSettingsPage::kSettingsGroup = "Subsonic";
+
+SubsonicSettingsPage::SubsonicSettingsPage(SettingsDialog *parent)
+    : SettingsPage(parent),
+      ui_(new Ui::SubsonicSettingsPage),
+      service_(dialog()->app()->internet_services()->Service<SubsonicService>()) {
+
+  ui_->setupUi(this);
+  setWindowIcon(IconLoader::Load("subsonic"));
+
+  connect(ui_->button_test, SIGNAL(clicked()), SLOT(TestClicked()));
+
+  connect(this, SIGNAL(Test(QString, int, QString, QString)), service_, SLOT(SendPing(QString, int, QString, QString)));
+
+  connect(service_, SIGNAL(TestFailure(QString)), SLOT(TestFailure(QString)));
+  connect(service_, SIGNAL(TestSuccess()), SLOT(TestSuccess()));
+
+  dialog()->installEventFilter(this);
+
+}
+
+SubsonicSettingsPage::~SubsonicSettingsPage() { delete ui_; }
+
+void SubsonicSettingsPage::Load() {
+
+  QSettings s;
+
+  s.beginGroup(kSettingsGroup);
+  ui_->enable->setChecked(s.value("enabled", false).toBool());
+  ui_->hostname->setText(s.value("hostname").toString());
+  ui_->port->setText(QString::number(s.value("port", 4040).toInt()));
+  ui_->username->setText(s.value("username").toString());
+  QByteArray password = s.value("password").toByteArray();
+  if (password.isEmpty()) ui_->password->clear();
+  else ui_->password->setText(QString::fromUtf8(QByteArray::fromBase64(password)));
+  ui_->checkbox_verify_certificate->setChecked(s.value("verifycertificate", false).toBool());
+  ui_->checkbox_cache_album_covers->setChecked(s.value("cachealbumcovers", true).toBool());
+  s.endGroup();
+
+}
+
+void SubsonicSettingsPage::Save() {
+
+  QSettings s;
+  s.beginGroup(kSettingsGroup);
+  s.setValue("enabled", ui_->enable->isChecked());
+  s.setValue("hostname", ui_->hostname->text());
+  s.setValue("port", ui_->port->text().toInt());
+  s.setValue("username", ui_->username->text());
+  s.setValue("password", QString::fromUtf8(ui_->password->text().toUtf8().toBase64()));
+  s.setValue("verifycertificate", ui_->checkbox_verify_certificate->isChecked());
+  s.setValue("cachealbumcovers", ui_->checkbox_cache_album_covers->isChecked());
+  s.endGroup();
+
+  service_->ReloadSettings();
+
+}
+
+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."));
+    return;
+  }
+
+  emit Test(ui_->hostname->text(), ui_->port->text().toInt(), ui_->username->text(), ui_->password->text());
+  ui_->button_test->setEnabled(false);
+
+}
+
+bool SubsonicSettingsPage::eventFilter(QObject *object, QEvent *event) {
+
+  if (object == dialog() && event->type() == QEvent::Enter) {
+    ui_->button_test->setEnabled(true);
+    return false;
+  }
+
+  return SettingsPage::eventFilter(object, event);
+
+}
+
+void SubsonicSettingsPage::TestSuccess() {
+
+  if (!this->isVisible()) return;
+  ui_->button_test->setEnabled(true);
+
+  QMessageBox::information(this, tr("Test successful!"), tr("Test successful!"));
+
+}
+
+void SubsonicSettingsPage::TestFailure(QString failure_reason) {
+
+  if (!this->isVisible()) return;
+  ui_->button_test->setEnabled(true);
+
+  QMessageBox::warning(this, tr("Test failed!"), failure_reason);
+
+}

src/settings/subsonicsettingspage.h

@@ -0,0 +1,60 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2019, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef SUBSONICSETTINGSPAGE_H
+#define SUBSONICSETTINGSPAGE_H
+
+#include <QObject>
+#include <QString>
+#include <QEvent>
+
+#include "settings/settingspage.h"
+
+class SubsonicService;
+class Ui_SubsonicSettingsPage;
+
+class SubsonicSettingsPage : public SettingsPage {
+  Q_OBJECT
+
+ public:
+  explicit SubsonicSettingsPage(SettingsDialog* parent = nullptr);
+  ~SubsonicSettingsPage();
+
+  static const char *kSettingsGroup;
+
+  void Load();
+  void Save();
+
+  bool eventFilter(QObject *object, QEvent *event);
+
+ signals:
+  void Test();
+  void Test(const QString &hostname, const int port, const QString &username, const QString &password);
+
+ private slots:
+  void TestClicked();
+  void TestSuccess();
+  void TestFailure(QString failure_reason);
+
+ private:
+  Ui_SubsonicSettingsPage* ui_;
+  SubsonicService *service_;
+};
+
+#endif  // SUBSONICSETTINGSPAGE_H

src/settings/subsonicsettingspage.ui

@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SubsonicSettingsPage</class>
+ <widget class="QWidget" name="SubsonicSettingsPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>715</width>
+    <height>836</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Subsonic</string>
+  </property>
+  <layout class="QVBoxLayout" name="layout_subsonicsettingspage">
+   <item>
+    <widget class="QCheckBox" name="enable">
+     <property name="text">
+      <string>Enable</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line_1">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="server_group">
+     <property name="title">
+      <string>Server</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="layout_server">
+        <item>
+         <widget class="QLabel" name="label_server_url">
+          <property name="text">
+           <string>Hostname</string>
+          </property>
+         </widget>
+        </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>
+        </item>
+        <item>
+         <spacer name="spacer_server">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="credential_group">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Authentication</string>
+     </property>
+     <layout class="QFormLayout" name="layout_credential_group">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_username">
+        <property name="text">
+         <string>Username</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLineEdit" name="username"/>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_password">
+        <property name="text">
+         <string>Password</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="password">
+        <property name="echoMode">
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="button_test">
+     <property name="text">
+      <string>Test</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupbox_preferences">
+     <property name="title">
+      <string>Preferences</string>
+     </property>
+     <layout class="QFormLayout" name="layout_preferences"/>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="checkbox_verify_certificate">
+     <property name="text">
+      <string>Verify server certificate</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="checkbox_cache_album_covers">
+     <property name="text">
+      <string>Cache album covers</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="spacer_middle">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>30</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="layout_bottom">
+     <item>
+      <spacer name="spacer_bottom">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_subsonic">
+       <property name="minimumSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../../data/icons.qrc">:/icons/64x64/subsonic.png</pixmap>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>username</tabstop>
+  <tabstop>password</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../data/data.qrc"/>
+  <include location="../../data/icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>