Subsonic API: Added an option to only list album artists. fixes #27

src/libs/database/CMakeLists.txt

@@ -11,6 +11,7 @@ add_library(lmsdatabase SHARED
 	impl/Session.cpp
 	impl/SessionPool.cpp
 	impl/SqlQuery.cpp
+	impl/SubsonicSettings.cpp
 	impl/Track.cpp
 	impl/TrackBookmark.cpp
 	impl/User.cpp

src/libs/database/impl/Session.cpp

@@ -31,6 +31,7 @@
 #include "database/Db.hpp"
 #include "database/Release.hpp"
 #include "database/ScanSettings.hpp"
+#include "database/SubsonicSettings.hpp"
 #include "database/Track.hpp"
 #include "database/TrackBookmark.hpp"
 #include "database/TrackArtistLink.hpp"
@@ -40,7 +41,7 @@
 
 namespace Database {
 
-#define LMS_DATABASE_VERSION	18
+#define LMS_DATABASE_VERSION	19
 
 using Version = std::size_t;
 
@@ -206,6 +207,16 @@ CREATE TABLE "release_backup" (
 			// Just increment the scan version of the settings to make the next scheduled scan rescan everything
 			ScanSettings::get(*this).modify()->incScanVersion();
 		}
+		else if (version == 18)
+		{
+			_session.execute(R"(
+CREATE TABLE IF NOT EXISTS "subsonic_settings" (
+  "id" integer primary key autoincrement,
+  "version" integer not null,
+  "api_enabled" boolean not null,
+  "artist_list_mode" integer not null
+))");
+		}
 		else
 		{
 			LMS_LOG(DB, ERROR) << "Database version " << version << " cannot be handled using migration";
@@ -228,6 +239,7 @@ Session::Session(Db& db)
 	_session.mapClass<ClusterType>("cluster_type");
 	_session.mapClass<Release>("release");
 	_session.mapClass<ScanSettings>("scan_settings");
+	_session.mapClass<SubsonicSettings>("subsonic_settings");
 	_session.mapClass<Track>("track");
 	_session.mapClass<TrackBookmark>("track_bookmark");
 	_session.mapClass<TrackArtistLink>("track_artist_link");
@@ -353,6 +365,7 @@ Session::prepareTables()
 		auto uniqueTransaction {createUniqueTransaction()};
 
 		ScanSettings::init(*this);
+		SubsonicSettings::init(*this);
 	}
 }
 

src/libs/database/impl/SubsonicSettings.cpp

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2020 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "database/SubsonicSettings.hpp"
+
+#include "database/Session.hpp"
+
+namespace Database {
+
+void
+SubsonicSettings::init(Session& session)
+{
+	session.checkUniqueLocked();
+
+	pointer settings {get(session)};
+	if (settings)
+		return;
+
+	settings = session.getDboSession().add(std::make_unique<SubsonicSettings>());
+}
+
+SubsonicSettings::pointer
+SubsonicSettings::get(Session& session)
+{
+	session.checkSharedLocked();
+
+	return session.getDboSession().find<SubsonicSettings>();
+}
+
+
+} // ns Database
+

src/libs/database/include/database/SubsonicSettings.hpp

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS 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.
+ *
+ * LMS 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 LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <Wt/Dbo/Dbo.h>
+
+namespace Database {
+
+class Session;
+
+class SubsonicSettings : public Wt::Dbo::Dbo<SubsonicSettings>
+{
+	public:
+		using pointer = Wt::Dbo::ptr<SubsonicSettings>;
+
+		enum class ArtistListMode
+		{
+			AllArtists,
+			ReleaseArtists,
+		};
+
+		static inline constexpr bool defaultSubsonicAPIEnabled {true};
+		static inline constexpr ArtistListMode defaultArtistListMode {ArtistListMode::AllArtists};
+
+		static void init(Session& session);
+
+		static pointer get(Session& session);
+
+
+		// Getters
+		bool		isAPIEnabled() const { return _isAPIEnabled; }
+		ArtistListMode	getArtistListMode() const { return _artistListMode; }
+
+		// Setters
+		void setAPIEnabled(bool enabled) { _isAPIEnabled = enabled; }
+		void setArtistListMode(ArtistListMode mode) {_artistListMode = mode; }
+
+		template<class Action>
+		void persist(Action& a)
+		{
+			Wt::Dbo::field(a, _isAPIEnabled,	"api_enabled");
+			Wt::Dbo::field(a, _artistListMode,	"artist_list_mode");
+		}
+
+	private:
+
+		bool		_isAPIEnabled {defaultSubsonicAPIEnabled};
+		ArtistListMode	_artistListMode {defaultArtistListMode};
+};
+
+} // namespace Database
+