Reworked the project layout

2014-10-10 20:41:34 +02:00
parent 92a176c899
commit 49ff050539
146 changed files with 156 additions and 162 deletions
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2013 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 <boost/thread.hpp>
+
+#include "logger/Logger.hpp"
+
+#include "DatabaseUpdateService.hpp"
+
+namespace Service {
+
+DatabaseUpdateService::DatabaseUpdateService(const Config& config)
+: _metadataParser(),
+ _databaseUpdater( config.dbPath, _metadataParser)
+{
+	_databaseUpdater.setAudioExtensions(config.audioExtensions);
+	_databaseUpdater.setVideoExtensions(config.videoExtensions);
+}
+
+void
+DatabaseUpdateService::start(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "DatabaseUpdateService, starting...";
+	_databaseUpdater.start();
+}
+
+void
+DatabaseUpdateService::stop(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "DatabaseUpdateService, stopping...";
+	_databaseUpdater.stop();
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "DatabaseUpdateService, stopped";
+}
+
+void
+DatabaseUpdateService::restart(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "DatabaseUpdateService, restart";
+	stop();
+	start();
+}
+
+} // namespace Service
+
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2013 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/>.
+ */
+
+#ifndef DB_UPDATE_SERVICE_HPP
+#define DB_UPDATE_SERVICE_HPP
+
+#include <boost/thread.hpp>
+#include <boost/asio/io_service.hpp>
+
+#include "metadata/AvFormat.hpp"
+#include "database-updater/DatabaseUpdater.hpp"
+
+#include "Service.hpp"
+
+namespace Service {
+
+class DatabaseUpdateService : public Service
+{
+	public:
+
+		typedef std::shared_ptr<DatabaseUpdateService>	pointer;
+
+		struct Config {
+			bool enable;
+			boost::filesystem::path dbPath;
+			std::vector<std::string>	audioExtensions;
+			std::vector<std::string>	videoExtensions;
+		};
+
+		DatabaseUpdateService(const Config& config);
+
+		// Service interface
+		void start(void);
+		void stop(void);
+		void restart(void);
+
+	private:
+
+		MetaData::AvFormat			_metadataParser;
+		DatabaseUpdater::Updater		_databaseUpdater;	// Todo use handler
+};
+
+} // namespace Service
+
+#endif
+
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2013 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 "logger/Logger.hpp"
+
+#include "RemoteServerService.hpp"
+
+namespace Service {
+
+RemoteServerService::RemoteServerService(const Config& config)
+: _server(boost::asio::ip::tcp::endpoint(config.address, config.port),
+	config.sslCertificatePath,
+	config.sslPrivateKeyPath,
+	config.sslTempDhPath,
+	config.dbPath)
+{
+}
+
+void
+RemoteServerService::start(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "RemoteServerService::start, starting...";
+	_server.start();
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "RemoteServerService::start, started!";
+}
+
+
+void
+RemoteServerService::stop(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "RemoteServerService::stop, stopping...";
+	_server.stop();
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "RemoteServerService::stop, stopped!";
+}
+
+void
+RemoteServerService::restart(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "RemoteServerService::restart, not implemented!";
+}
+
+} // namespace Service
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 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/>.
+ */
+
+#ifndef REMOTE_SERVER_SERVICE_HPP
+#define REMOTE_SERVER_SERVICE_HPP
+
+#include <boost/filesystem.hpp>
+#include <boost/asio/ip/address.hpp>
+
+#include "Service.hpp"
+
+#include "remote/server/Server.hpp"
+
+namespace Service {
+
+class RemoteServerService : public Service
+{
+	public:
+
+		struct Config {
+			bool				enable;
+			boost::asio::ip::address	address;
+			unsigned short			port;
+			boost::filesystem::path		sslCertificatePath;
+			boost::filesystem::path		sslPrivateKeyPath;
+			boost::filesystem::path		sslTempDhPath;
+			boost::filesystem::path		dbPath;
+		};
+
+		RemoteServerService(const Config& config);
+
+		void start(void);
+		void stop(void);
+		void restart(void);
+
+	private:
+
+		Remote::Server::Server	_server;
+};
+
+} // namespace Service
+
+#endif
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2013 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/>.
+ */
+
+#ifndef SERVICE_HPP
+#define SERVICE_HPP
+
+#include <boost/thread.hpp>
+#include <memory>
+#include <set>
+
+namespace Service {
+
+// Interface class wrapper for running services
+class Service
+{
+	public:
+
+		typedef std::shared_ptr<Service>	pointer;
+
+		Service(const Service&) = delete;
+		Service& operator=(const Service&) = delete;
+
+		Service() {}
+		virtual ~Service() {}
+
+		virtual void start(void) = 0;
+		virtual void stop(void) = 0;
+		virtual void restart(void) = 0;
+
+};
+
+} // namespace Service
+
+#endif
+
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2013 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 "logger/Logger.hpp"
+
+#include <boost/foreach.hpp>
+#include <boost/bind.hpp>
+
+#include "ServiceManager.hpp"
+
+namespace Service {
+
+ServiceManager&
+ServiceManager::instance()
+{
+	static ServiceManager instance;
+	return instance;
+}
+
+ServiceManager::ServiceManager()
+: _signalSet(_ioService)
+{
+	_signalSet.add(SIGINT);
+	_signalSet.add(SIGTERM);
+#if defined(SIGQUIT)
+	_signalSet.add(SIGQUIT);
+#endif // defined(SIGQUIT)
+
+	_signalSet.add(SIGHUP);
+
+	// Excplicitely ignore SIGCHLD to avoid zombies
+	// when avconv child processes are being killed
+	if (::signal(SIGCHLD, SIG_IGN) == SIG_ERR)
+		throw std::runtime_error("ServiceManager::ServiceManager, signal failed!");
+}
+
+ServiceManager::~ServiceManager()
+{
+	LMS_LOG(MOD_SERVICE, SEV_NOTICE) << "Stopping services...";
+	stopServices();
+}
+
+void
+ServiceManager::run()
+{
+
+	asyncWaitSignals();
+
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "ServiceManager: waiting for events...";
+	try {
+		// Wait for events
+		_ioService.run();
+	}
+	catch( std::exception& e )
+	{
+		LMS_LOG(MOD_SERVICE, SEV_ERROR) << "ServiceManager: exception in ioService::run: " << e.what();
+	}
+
+	// Stopping services
+	stopServices();
+
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "ServiceManager: run complete !";
+}
+
+void
+ServiceManager::asyncWaitSignals(void)
+{
+	_signalSet.async_wait(boost::bind(&ServiceManager::handleSignal,
+				this,
+				boost::asio::placeholders::error,
+				boost::asio::placeholders::signal_number));
+}
+
+void
+ServiceManager::startService(Service::pointer service)
+{
+	_services.insert(service);
+	service->start();
+}
+
+void
+ServiceManager::stopService(Service::pointer service)
+{
+	_services.erase(service);
+	service->stop();
+}
+
+void
+ServiceManager::stopServices(void)
+{
+	BOOST_FOREACH(Service::pointer service, _services)
+		service->stop();
+}
+
+
+void
+ServiceManager::restartServices(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_NOTICE) << "Restarting services...";
+	BOOST_FOREACH(Service::pointer service, _services)
+		service->restart();
+}
+
+void
+ServiceManager::handleSignal(boost::system::error_code /*ec*/, int signo)
+{
+	LMS_LOG(MOD_SERVICE, SEV_INFO) << "Received signal " << signo;
+
+	switch (signo)
+	{
+		case SIGINT:
+		case SIGTERM:
+		case SIGQUIT:
+			stopServices();
+
+			// Do not listen for signals, this will make the ioservice.run return
+			break;
+		case SIGHUP:
+			restartServices();
+
+			asyncWaitSignals();
+			break;
+		default:
+			LMS_LOG(MOD_SERVICE, SEV_NOTICE) << "Unhandled signal " << signo;
+	}
+}
+
+} // namespace Service
+
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2013 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/>.
+ */
+
+#ifndef SERVICE_CONTROLER_HPP
+#define SERVICE_CONTROLER_HPP
+
+#include <boost/asio.hpp>
+#include <set>
+
+#include "Service.hpp"
+
+namespace Service {
+
+// Start/Stop/Reload Services
+class ServiceManager
+{
+	public:
+
+		static ServiceManager& instance();
+		~ServiceManager();
+
+		void stopService(Service::pointer service);
+		void startService(Service::pointer service);
+
+		void stopAllServices();
+
+		// Return in case of failure/stop by user
+		void run();
+
+		template <class T> typename T::pointer getService();
+
+		boost::mutex&	mutex() { return _mutex;}
+
+	private:
+
+		ServiceManager();
+		ServiceManager(ServiceManager const&);	// Don't Implement
+		void operator=(ServiceManager const&);	// Don't implement
+
+		void restartServices(void);
+		void stopServices(void);
+
+		void asyncWaitSignals(void);
+
+		void handleSignal(boost::system::error_code error, int signo);
+
+		boost::mutex	_mutex;
+
+		boost::asio::io_service	_ioService;
+
+		// Listen for interesting signals
+		boost::asio::signal_set	_signalSet;
+
+		std::set<Service::pointer>	_services;
+};
+
+
+template <class T> typename T::pointer
+ServiceManager::getService()
+{
+	std::set<Service::pointer>::iterator it;
+	for (std::set<Service::pointer>::iterator it = _services.begin(); it != _services.end(); ++it)
+	{
+		if (typeid(*(*it)) == typeid(T)) {
+			return std::dynamic_pointer_cast<T>(*it);
+		}
+	}
+	return std::shared_ptr<T>();
+}
+
+} // namespace Service
+
+#endif
+
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2013 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 "logger/Logger.hpp"
+
+#include "UserInterfaceService.hpp"
+#include "ui/LmsApplication.hpp"
+
+namespace Service {
+
+UserInterfaceService::UserInterfaceService( boost::filesystem::path runAppPath, const Config& config)
+: _server(runAppPath.string())
+{
+	std::vector<std::string> args;
+
+	args.push_back(runAppPath.string());
+	args.push_back("--docroot=" + config.docRootPath.string());
+	args.push_back("--approot=" + config.appRootPath.string());
+	{
+		std::ostringstream oss; oss << config.httpsPort;
+		args.push_back("--https-port=" + oss.str());
+	}
+	args.push_back("--https-address=" + config.httpsAddress.to_string());
+	args.push_back("--ssl-certificate=" + config.sslCertificatePath.string());
+	args.push_back("--ssl-private-key=" + config.sslPrivateKeyPath.string());
+	args.push_back("--ssl-tmp-dh=" + config.sslTempDhPath.string());
+
+	// Construct argc/argv
+	int argc = args.size();
+	const char* argv[args.size()];
+	for (int i = 0; i < argc; ++i)
+		argv[i] = args[i].c_str();
+
+	for(int i = 0; i < argc; ++i)
+	{
+		LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "i = " << i << ", arg = '" << argv[i] << "'";
+	}
+
+	_server.setServerConfiguration (argc, const_cast<char**>(argv));
+
+	// bind entry point
+	_server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, _1, config.dbPath));
+
+}
+
+void
+UserInterfaceService::start(void)
+{
+	_server.start();
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "UserInterfaceService::start -> Service started...";
+}
+
+void
+UserInterfaceService::stop(void)
+{
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "UserInterfaceService::stop -> stopping...";
+	_server.stop();
+	LMS_LOG(MOD_SERVICE, SEV_DEBUG) << "UserInterfaceService::stop -> stopped!";
+}
+
+void
+UserInterfaceService::restart(void)
+{
+
+}
+
+} // namespace Service
+
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2013 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/>.
+ */
+
+#ifndef WEB_SERVER_SERVICE_HPP
+#define WEB_SERVER_SERVICE_HPP
+
+#include <boost/filesystem.hpp>
+#include <boost/asio/ip/address.hpp>
+
+#include <Wt/WServer>
+
+#include "Service.hpp"
+
+namespace Service {
+
+class UserInterfaceService : public Service
+{
+	public:
+
+		struct Config {
+			bool 			enable;
+			boost::filesystem::path docRootPath;
+			boost::filesystem::path appRootPath;
+			unsigned short		httpsPort;
+			boost::asio::ip::address	httpsAddress;
+			boost::filesystem::path sslCertificatePath;
+			boost::filesystem::path sslPrivateKeyPath;
+			boost::filesystem::path sslTempDhPath;
+			boost::filesystem::path dbPath;
+		};
+
+		UserInterfaceService(boost::filesystem::path runAppPath,
+					const Config& config);
+
+		void start(void);
+		void stop(void);
+		void restart(void);
+
+	private:
+
+		Wt::WServer	_server;
+
+};
+
+} //namespace Service
+
+#endif
+