Subsonic API: added the getScanStatus and startScan commands. fixes #62

src/libs/subsonic/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 add_library(lmssubsonic SHARED
 	impl/ParameterParsing.cpp
+	impl/Scan.cpp
 	impl/Stream.cpp
 	impl/SubsonicId.cpp
 	impl/SubsonicResource.cpp
@@ -26,6 +27,7 @@ target_link_libraries(lmssubsonic PRIVATE
 
 target_link_libraries(lmssubsonic PUBLIC
 	lmsdatabase
+	lmsscanner
 	wt
 	)
 

src/libs/subsonic/impl/Scan.cpp

@@ -0,0 +1,65 @@
+/*
+ * 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 "Scan.hpp"
+
+#include "scanner/IMediaScanner.hpp"
+#include "utils/Service.hpp"
+
+namespace API::Subsonic::Scan
+{
+	using namespace Scanner;
+
+	static
+	Response::Node
+	createStatusResponseNode()
+	{
+		Response::Node statusResponse;
+
+		const IMediaScanner::Status scanStatus {ServiceProvider<IMediaScanner>::get()->getStatus()};
+
+		statusResponse.setAttribute("scanning", scanStatus.currentState == IMediaScanner::State::InProgress ? "true" : "false");
+		if (scanStatus.currentState == IMediaScanner::State::InProgress && scanStatus.inProgressScanStats)
+			statusResponse.setAttribute("count", std::to_string(scanStatus.inProgressScanStats->processedFiles));
+
+		return statusResponse;
+	}
+
+
+	Response
+	handleGetScanStatus(RequestContext&)
+	{
+		Response response {Response::createOkResponse()};
+		response.addNode("scanStatus", createStatusResponseNode());
+
+		return response;
+	}
+
+	Response
+	handleStartScan(RequestContext&)
+	{
+		ServiceProvider<IMediaScanner>::get()->requestImmediateScan();
+
+		Response response {Response::createOkResponse()};
+		response.addNode("scanStatus", createStatusResponseNode());
+
+		return response;
+	}
+}
+

src/libs/subsonic/impl/Scan.hpp

@@ -0,0 +1,30 @@
+/*
+ * 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 "RequestContext.hpp"
+#include "SubsonicResponse.hpp"
+
+namespace API::Subsonic::Scan
+{
+	Response handleGetScanStatus(RequestContext& context);
+	Response handleStartScan(RequestContext& context);
+}
+

src/libs/subsonic/impl/SubsonicResource.cpp

@@ -42,6 +42,7 @@
 #include "utils/Utils.hpp"
 #include "ParameterParsing.hpp"
 #include "RequestContext.hpp"
+#include "Scan.hpp"
 #include "Stream.hpp"
 #include "SubsonicResponse.hpp"
 
@@ -1860,8 +1861,8 @@ static std::unordered_map<std::string, RequestEntryPointInfo> requestEntryPoints
 	{"savePlayQueue",	{handleNotImplemented,			false}},
 
 	// Media library scanning
-	{"getScanStatus",	{handleNotImplemented,			true}},
-	{"startScan",		{handleNotImplemented,			true}},
+	{"getScanStatus",	{Scan::handleGetScanStatus,		true}},
+	{"startScan",		{Scan::handleStartScan,			true}},
 };
 
 using MediaRetrievalHandlerFunc = std::function<void(RequestContext&, const Wt::Http::Request&, Wt::Http::Response&)>;