From faca3a499aee78be97247f1327b2b4856970acb1 Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Fri, 2 Aug 2019 15:39:00 +0200
Subject: [PATCH] minor cleanup

---
 src/api/subsonic/SubsonicResource.cpp | 7 ++++---
 src/database/Cluster.cpp              | 6 +++---
 src/database/Cluster.hpp              | 8 ++++----
 src/database/Session.cpp              | 1 +
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/api/subsonic/SubsonicResource.cpp b/src/api/subsonic/SubsonicResource.cpp
index f9dc3061..42be4104 100644
--- a/src/api/subsonic/SubsonicResource.cpp
+++ b/src/api/subsonic/SubsonicResource.cpp
@@ -1024,10 +1024,10 @@ handleGetGenresRequest(RequestContext& context)
 
 	auto transaction {context.dbSession.createSharedTransaction()};
 
-	auto clusterType {ClusterType::getByName(context.dbSession, genreClusterName)};
+	const ClusterType::pointer clusterType {ClusterType::getByName(context.dbSession, genreClusterName)};
 	if (clusterType)
 	{
-		auto clusters {clusterType->getClusters()};
+		const auto clusters {clusterType->getClusters()};
 
 		for (const Cluster::pointer& cluster : clusters)
 			genresNode.addArrayChild("genre", clusterToResponseNode(cluster));
@@ -1759,6 +1759,7 @@ static std::map<std::string, RequestEntryPointInfo> requestEntryPoints
 	{"/rest/getUser.view",			{handleGetUserRequest,			false}},
 	{"/rest/getUsers.view",			{handleGetUsersRequest,			true}},
 	{"/rest/ping.view",			{handlePingRequest,			false}},
+	{"/rest/savePlayQueue.view",		{handleNotImplementedRequest,		false}},
 	{"/rest/scrobble.view",			{handleNotImplementedRequest,		false}},
 	{"/rest/search2.view",			{handleSearch2Request,			false}},
 	{"/rest/search3.view",			{handleSearch3Request,			false}},
@@ -1784,7 +1785,7 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
 
 	const std::size_t requestId {curRequestId++};
 
-	LMS_LOG(API_SUBSONIC, DEBUG) << "Handling request " << requestId << " '" << request.path() << "', params = " << parameterMapToDebugString(request.getParameterMap());
+	LMS_LOG(API_SUBSONIC, DEBUG) << "Handling request " << requestId << " '" << request.path() << "', continuation = " << (request.continuation() ? "true" : "false") << ", params = " << parameterMapToDebugString(request.getParameterMap());
 
 	const Wt::Http::ParameterMap& parameters {request.getParameterMap()};
 
diff --git a/src/database/Cluster.cpp b/src/database/Cluster.cpp
index 6f196496..f07bd778 100644
--- a/src/database/Cluster.cpp
+++ b/src/database/Cluster.cpp
@@ -139,7 +139,7 @@ ClusterType::getAllOrphans(Session& session)
 
 
 ClusterType::pointer
-ClusterType::getByName(Session& session, std::string name)
+ClusterType::getByName(Session& session, const std::string& name)
 {
 	session.checkSharedLocked();
 
@@ -165,7 +165,7 @@ ClusterType::getAll(Session& session)
 }
 
 ClusterType::pointer
-ClusterType::create(Session& session, std::string name)
+ClusterType::create(Session& session, const std::string& name)
 {
 	session.checkUniqueLocked();
 
@@ -176,7 +176,7 @@ ClusterType::create(Session& session, std::string name)
 }
 
 Cluster::pointer
-ClusterType::getCluster(std::string name) const
+ClusterType::getCluster(const std::string& name) const
 {
 	assert(self());
 	assert(IdIsValid(self()->id()));
diff --git a/src/database/Cluster.hpp b/src/database/Cluster.hpp
index 162ff4c6..109e49d0 100644
--- a/src/database/Cluster.hpp
+++ b/src/database/Cluster.hpp
@@ -91,17 +91,17 @@ class ClusterType : public Wt::Dbo::Dbo<ClusterType>
 		ClusterType(std::string name);
 
 		static std::vector<pointer> getAllOrphans(Session& session);
-		static pointer getByName(Session& session, std::string name);
+		static pointer getByName(Session& session, const std::string& name);
 		static pointer getById(Session& session, IdType id);
 		static std::vector<pointer> getAll(Session& session);
 
-		static pointer create(Session& session, std::string name);
-		static void remove(Session& session, std::string name);
+		static pointer create(Session& session, const std::string& name);
+		static void remove(Session& session, const std::string& name);
 
 		// Accessors
 		const std::string& getName(void) const { return _name; }
 		std::vector<Cluster::pointer> getClusters() const;
-		Cluster::pointer getCluster(std::string name) const;
+		Cluster::pointer getCluster(const std::string& name) const;
 
 		template<class Action>
 		void persist(Action& a)
diff --git a/src/database/Session.cpp b/src/database/Session.cpp
index 93ead53e..cff23723 100644
--- a/src/database/Session.cpp
+++ b/src/database/Session.cpp
@@ -213,6 +213,7 @@ Session::prepareTables()
 		_session.execute("CREATE INDEX IF NOT EXISTS artist_sort_name_nocase_idx ON artist(sort_name COLLATE NOCASE)");
 		_session.execute("CREATE INDEX IF NOT EXISTS artist_mbid_idx ON artist(mbid)");
 		_session.execute("CREATE INDEX IF NOT EXISTS auth_token_user_idx ON auth_token(user_id)");
+		_session.execute("CREATE INDEX IF NOT EXISTS auth_token_expiry_idx ON auth_token(expiry)");
 		_session.execute("CREATE INDEX IF NOT EXISTS auth_token_value_idx ON auth_token(value)");
 		_session.execute("CREATE INDEX IF NOT EXISTS cluster_name_idx ON cluster(name)");
 		_session.execute("CREATE INDEX IF NOT EXISTS cluster_cluster_type_idx ON cluster(cluster_type_id)");