owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the way services are handled

Browse Source
This commit is contained in:
emeric
2020-08-22 15:20:18 +02:00
parent 9fbbca97a4
commit bd7561af8e
23 changed files with 107 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/av/impl/AvTranscoder.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ static std::filesystem::path ffmpegPath;
void
Transcoder::init()
{
ffmpegPath = ServiceProvider<IConfig>::get()->getPath("ffmpeg-file", "/usr/bin/ffmpeg");
ffmpegPath = Service<IConfig>::get()->getPath("ffmpeg-file", "/usr/bin/ffmpeg");
if (!std::filesystem::exists(ffmpegPath))
throw LmsException {"File '" + ffmpegPath.string() + "' does not exist!"};
}
src/libs/recommendation/impl/features/FeaturesClassifierCache.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ namespace Recommendation {
static
std::filesystem::path getCacheDirectory()
{
return ServiceProvider<IConfig>::get()->getPath("working-dir") / "cache" / "features";
return Service<IConfig>::get()->getPath("working-dir") / "cache" / "features";
}
static std::filesystem::path getCacheNetworkFilePath()
@@ -237,7 +237,7 @@ FeaturesClassifierCache::read()
void
FeaturesClassifierCache::write() const
{
std::filesystem::create_directories(ServiceProvider<IConfig>::get()->getPath("working-dir") / "cache" / "features");
std::filesystem::create_directories(Service<IConfig>::get()->getPath("working-dir") / "cache" / "features");
if (!networkToCacheFile(_network, getCacheNetworkFilePath())
|| !objectPositionToCacheFile(_trackPositions, getCacheTrackPositionsFilePath()))
src/libs/scanner/impl/AcousticBrainzUtils.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ getJsonData(const UUID& mbid)
{
static const std::string defaultAPIURL = "https://acousticbrainz.org/api/v1/";
const std::string url {ServiceProvider<IConfig>::get()->getString("acousticbrainz-api-url", defaultAPIURL) + std::string {mbid.getAsString()} + "/low-level"};
const std::string url {Service<IConfig>::get()->getString("acousticbrainz-api-url", defaultAPIURL) + std::string {mbid.getAsString()} + "/low-level"};
boost::asio::io_service ioService;
src/libs/subsonic/impl/Scan.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ namespace API::Subsonic::Scan
{
Response::Node statusResponse;
const IMediaScanner::Status scanStatus {ServiceProvider<IMediaScanner>::get()->getStatus()};
const IMediaScanner::Status scanStatus {Service<IMediaScanner>::get()->getStatus()};
statusResponse.setAttribute("scanning", scanStatus.currentState == IMediaScanner::State::InProgress);
if (scanStatus.currentState == IMediaScanner::State::InProgress)
@@ -61,7 +61,7 @@ namespace API::Subsonic::Scan
Response
handleStartScan(RequestContext& context)
{
ServiceProvider<IMediaScanner>::get()->requestImmediateScan(false);
Service<IMediaScanner>::get()->requestImmediateScan(false);
Response response {Response::createOkResponse(context)};
response.addNode("scanStatus", createStatusResponseNode());
src/libs/subsonic/impl/SubsonicResource.cpp
+11 -11
View File
@@ -511,10 +511,10 @@ handleChangePassword(RequestContext& context)
std::string username {getMandatoryParameterAs<std::string>(context.parameters, "username")};
std::string password {decodePasswordIfNeeded(getMandatoryParameterAs<std::string>(context.parameters, "password"))};
if (!ServiceProvider<Auth::IPasswordService>::get()->evaluatePasswordStrength(username, password))
if (!Service<Auth::IPasswordService>::get()->evaluatePasswordStrength(username, password))
throw PasswordTooWeakGenericError {};
const User::PasswordHash hash {ServiceProvider<Auth::IPasswordService>::get()->hashPassword(password)};
const User::PasswordHash hash {Service<Auth::IPasswordService>::get()->hashPassword(password)};
auto transaction {context.dbSession.createUniqueTransaction()};
@@ -593,10 +593,10 @@ handleCreateUserRequest(RequestContext& context)
std::string password {decodePasswordIfNeeded(getMandatoryParameterAs<std::string>(context.parameters, "password"))};
// Just ignore all the other fields as we don't handle them
if (!ServiceProvider<Auth::IPasswordService>::get()->evaluatePasswordStrength(username, password))
if (!Service<Auth::IPasswordService>::get()->evaluatePasswordStrength(username, password))
throw PasswordTooWeakGenericError {};
const User::PasswordHash hash {ServiceProvider<Auth::IPasswordService>::get()->hashPassword(password)};
const User::PasswordHash hash {Service<Auth::IPasswordService>::get()->hashPassword(password)};
auto transaction {context.dbSession.createUniqueTransaction()};
@@ -878,7 +878,7 @@ handleGetArtistInfoRequestCommon(RequestContext& context, bool id3)
artistInfoNode.createChild("musicBrainzId").setValue(artistMBID->getAsString());
}
auto similarArtistsId {ServiceProvider<Recommendation::IEngine>::get()->getSimilarArtists(context.dbSession, id.value, count)};
auto similarArtistsId {Service<Recommendation::IEngine>::get()->getSimilarArtists(context.dbSession, id.value, count)};
{
auto transaction {context.dbSession.createSharedTransaction()};
@@ -1107,7 +1107,7 @@ handleGetSimilarSongsRequestCommon(RequestContext& context, bool id3)
// Optional params
std::size_t count {getParameterAs<std::size_t>(context.parameters, "count").value_or(50)};
auto similarArtistsId {ServiceProvider<Recommendation::IEngine>::get()->getSimilarArtists(context.dbSession, id.value, 5)};
auto similarArtistsId {Service<Recommendation::IEngine>::get()->getSimilarArtists(context.dbSession, id.value, 5)};
auto transaction {context.dbSession.createSharedTransaction()};
@@ -1552,10 +1552,10 @@ handleUpdateUserRequest(RequestContext& context)
if (password)
{
*password = decodePasswordIfNeeded(*password);
if (!ServiceProvider<Auth::IPasswordService>::get()->evaluatePasswordStrength(username, *password))
if (!Service<Auth::IPasswordService>::get()->evaluatePasswordStrength(username, *password))
throw PasswordTooWeakGenericError {};
hash = ServiceProvider<Auth::IPasswordService>::get()->hashPassword(*password);
hash = Service<Auth::IPasswordService>::get()->hashPassword(*password);
}
auto transaction {context.dbSession.createUniqueTransaction()};
@@ -1746,10 +1746,10 @@ handleGetCoverArt(RequestContext& context, const Wt::Http::Request& /*request*/,
switch (id.type)
{
case Id::Type::Track:
data = ServiceProvider<CoverArt::IGrabber>::get()->getFromTrack(context.dbSession, id.value, CoverArt::Format::JPEG, size);
data = Service<CoverArt::IGrabber>::get()->getFromTrack(context.dbSession, id.value, CoverArt::Format::JPEG, size);
break;
case Id::Type::Release:
data = ServiceProvider<CoverArt::IGrabber>::get()->getFromRelease(context.dbSession, id.value, CoverArt::Format::JPEG, size);
data = Service<CoverArt::IGrabber>::get()->getFromRelease(context.dbSession, id.value, CoverArt::Format::JPEG, size);
break;
default:
throw BadParameterGenericError {"id"};
@@ -1909,7 +1909,7 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
SessionPool::ScopedSession dbSession {_sessionPool};
switch (ServiceProvider<Auth::IPasswordService>::get()->checkUserPassword(dbSession.get(),
switch (Service<Auth::IPasswordService>::get()->checkUserPassword(dbSession.get(),
boost::asio::ip::address::from_string(request.clientAddress()),
clientInfo.user, clientInfo.password))
{
src/libs/utils/include/utils/Logger.hpp
+1 -1
View File
@@ -82,5 +82,5 @@ class Logger
virtual void processLog(const Log& log) = 0;
};
#define LMS_LOG(module, severity) Log(ServiceProvider<Logger>::get(), Module::module, Severity::severity).getOstream()
#define LMS_LOG(module, severity) Log(Service<Logger>::get(), Module::module, Severity::severity).getOstream()
src/libs/utils/include/utils/Service.hpp
+22 -24
View File
@@ -19,46 +19,44 @@
#pragma once
#include <cassert>
#include <memory>
#include <type_traits>
template <typename Class>
class ServiceProvider
class Service
{
public:
template <class DerivedClass, class ...Args>
static
Class&
create(Args&&... args)
Service(std::unique_ptr<Class> service)
{
static_assert(std::is_base_of<Class, DerivedClass>::value);
assign(std::make_unique<DerivedClass>(std::forward<Args>(args)...));
return *get();
assign(std::move(service));
}
template <class ...Args>
static
Class&
create(Args&&... args)
~Service()
{
assign(std::make_unique<Class>(std::forward<Args>(args)...));
return *get();
clear();
}
static
Class&
assign(std::unique_ptr<Class> service)
{
_service = std::move(service);
return *get();
}
Service(const Service&) = delete;
Service(Service&&) = delete;
Service& operator=(const Service&) = delete;
Service& operator=(Service&&) = delete;
static void clear() { _service.reset(); }
Class* operator->() const
{
return Service<Class>::get();
}
static Class* get() { return _service.get(); }
private:
static Class& assign(std::unique_ptr<Class> service)
{
assert(!_service);
_service = std::move(service);
return *get();
}
static void clear() { _service.reset(); }
static inline std::unique_ptr<Class> _service;
};