From cf46f1a7c2b77da2843fe647b6a8000204340a71 Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Tue, 6 Aug 2019 13:11:01 +0200
Subject: [PATCH] Subsonic API: fixed regression on media retrieval entrypoints

---
 src/api/subsonic/SubsonicResource.cpp | 4 ++--
 src/database/Session.cpp              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/subsonic/SubsonicResource.cpp b/src/api/subsonic/SubsonicResource.cpp
index 436e6699..629fefe2 100644
--- a/src/api/subsonic/SubsonicResource.cpp
+++ b/src/api/subsonic/SubsonicResource.cpp
@@ -1837,8 +1837,8 @@ static std::map<std::string, RequestEntryPointInfo> requestEntryPoints
 using MediaRetrievalHandlerFunc = std::function<MediaRetrievalResult(RequestContext&, Wt::Http::ResponseContinuation*)>;
 static std::map<std::string, MediaRetrievalHandlerFunc> mediaRetrievalHandlers
 {
-	{"/rest/stream",		handleStream},
-	{"/rest/getCoverArt",	handleGetCoverArt},
+	{"stream",		handleStream},
+	{"getCoverArt",		handleGetCoverArt},
 };
 
 void
diff --git a/src/database/Session.cpp b/src/database/Session.cpp
index cff23723..69c857fe 100644
--- a/src/database/Session.cpp
+++ b/src/database/Session.cpp
@@ -100,7 +100,7 @@ Session::doDatabaseMigrationIfNeeded()
 	{
 		default:
 			LMS_LOG(DB, ERROR) << "Database version " << version << " cannot be handled using migration";
-			throw LmsException {outdatedMsg};
+			throw LmsException { LMS_DATABASE_VERSION > version  ? outdatedMsg : "Server binary outdated, please upgrade it to handle this database"};
 	}
 
 	VersionInfo::get(*this).modify()->setVersion(LMS_DATABASE_VERSION);