From fe298e10d997fce59fa16c05fab5a90153e9c85a Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 17 Oct 2021 21:21:30 +0200 Subject: [PATCH] Another attempt: regroup lms services --- src/libs/CMakeLists.txt | 2 +- src/libs/lmscore/CMakeLists.txt | 28 ------------------- src/libs/services/CMakeLists.txt | 1 + src/libs/services/cover/CMakeLists.txt | 28 +++++++++++++++++++ .../cover}/impl/CoverService.cpp | 0 .../cover}/impl/CoverService.hpp | 2 +- .../include/services/cover}/ICoverService.hpp | 0 src/libs/subsonic/CMakeLists.txt | 2 +- src/libs/subsonic/impl/SubsonicResource.cpp | 2 +- src/lms/CMakeLists.txt | 2 +- src/lms/main.cpp | 2 +- src/lms/ui/LmsApplication.cpp | 2 +- src/lms/ui/resource/CoverResource.cpp | 2 +- src/tools/cover/CMakeLists.txt | 2 +- src/tools/cover/LmsCover.cpp | 2 +- 15 files changed, 39 insertions(+), 38 deletions(-) delete mode 100644 src/libs/lmscore/CMakeLists.txt create mode 100644 src/libs/services/CMakeLists.txt create mode 100644 src/libs/services/cover/CMakeLists.txt rename src/libs/{lmscore => services/cover}/impl/CoverService.cpp (100%) rename src/libs/{lmscore => services/cover}/impl/CoverService.hpp (98%) rename src/libs/{lmscore/include/lmscore/services => services/cover/include/services/cover}/ICoverService.hpp (100%) diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 728cc175..6f98e19a 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -3,11 +3,11 @@ add_subdirectory(auth) add_subdirectory(av) add_subdirectory(database) add_subdirectory(image) -add_subdirectory(lmscore) add_subdirectory(metadata) add_subdirectory(recommendation) add_subdirectory(scanner) add_subdirectory(scrobbling) +add_subdirectory(services) add_subdirectory(som) add_subdirectory(subsonic) add_subdirectory(utils) diff --git a/src/libs/lmscore/CMakeLists.txt b/src/libs/lmscore/CMakeLists.txt deleted file mode 100644 index 358df97a..00000000 --- a/src/libs/lmscore/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ - -add_library(lmscore SHARED - impl/CoverService.cpp - ) - -target_include_directories(lmscore INTERFACE - include - ) - -target_include_directories(lmscore PRIVATE - include - impl - ) - -target_link_libraries(lmscore PRIVATE - lmsav - lmsimage - ) - -target_link_libraries(lmscore PUBLIC - lmsdatabase - lmsimage - lmsutils - std::filesystem - ) - -install(TARGETS lmscore DESTINATION lib) - diff --git a/src/libs/services/CMakeLists.txt b/src/libs/services/CMakeLists.txt new file mode 100644 index 00000000..09e78dd4 --- /dev/null +++ b/src/libs/services/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(cover) diff --git a/src/libs/services/cover/CMakeLists.txt b/src/libs/services/cover/CMakeLists.txt new file mode 100644 index 00000000..41169c5d --- /dev/null +++ b/src/libs/services/cover/CMakeLists.txt @@ -0,0 +1,28 @@ + +add_library(lmsservice-cover SHARED + impl/CoverService.cpp + ) + +target_include_directories(lmsservice-cover INTERFACE + include + ) + +target_include_directories(lmsservice-cover PRIVATE + include + impl + ) + +target_link_libraries(lmsservice-cover PRIVATE + lmsav + lmsimage + ) + +target_link_libraries(lmsservice-cover PUBLIC + lmsdatabase + lmsimage + lmsutils + std::filesystem + ) + +install(TARGETS lmsservice-cover DESTINATION lib) + diff --git a/src/libs/lmscore/impl/CoverService.cpp b/src/libs/services/cover/impl/CoverService.cpp similarity index 100% rename from src/libs/lmscore/impl/CoverService.cpp rename to src/libs/services/cover/impl/CoverService.cpp diff --git a/src/libs/lmscore/impl/CoverService.hpp b/src/libs/services/cover/impl/CoverService.hpp similarity index 98% rename from src/libs/lmscore/impl/CoverService.hpp rename to src/libs/services/cover/impl/CoverService.hpp index a740673e..866ed8da 100644 --- a/src/libs/lmscore/impl/CoverService.hpp +++ b/src/libs/services/cover/impl/CoverService.hpp @@ -29,7 +29,7 @@ #include #include -#include "lmscore/services/ICoverService.hpp" +#include "services/cover/ICoverService.hpp" #include "image/IEncodedImage.hpp" #include "database/Types.hpp" diff --git a/src/libs/lmscore/include/lmscore/services/ICoverService.hpp b/src/libs/services/cover/include/services/cover/ICoverService.hpp similarity index 100% rename from src/libs/lmscore/include/lmscore/services/ICoverService.hpp rename to src/libs/services/cover/include/services/cover/ICoverService.hpp diff --git a/src/libs/subsonic/CMakeLists.txt b/src/libs/subsonic/CMakeLists.txt index aad488ca..d4f4b985 100644 --- a/src/libs/subsonic/CMakeLists.txt +++ b/src/libs/subsonic/CMakeLists.txt @@ -19,11 +19,11 @@ target_include_directories(lmssubsonic PRIVATE target_link_libraries(lmssubsonic PRIVATE lmsauth lmsav - lmscore lmsdatabase lmsrecommendation lmsscanner lmsscrobbling + lmsservice-cover lmsutils std::filesystem ) diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index 888eadf6..38f811b0 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -28,7 +28,6 @@ #include "auth/IPasswordService.hpp" #include "auth/IEnvService.hpp" -#include "lmscore/services/ICoverService.hpp" #include "database/Artist.hpp" #include "database/Cluster.hpp" #include "database/Db.hpp" @@ -40,6 +39,7 @@ #include "database/User.hpp" #include "recommendation/IEngine.hpp" #include "scrobbling/IScrobbling.hpp" +#include "services/cover/ICoverService.hpp" #include "utils/IConfig.hpp" #include "utils/Logger.hpp" #include "utils/Random.hpp" diff --git a/src/lms/CMakeLists.txt b/src/lms/CMakeLists.txt index beff7583..33dad4b1 100644 --- a/src/lms/CMakeLists.txt +++ b/src/lms/CMakeLists.txt @@ -51,11 +51,11 @@ target_include_directories(lms PRIVATE target_link_libraries(lms PRIVATE lmsav lmsauth - lmscore lmsdatabase lmsrecommendation lmsscanner lmsscrobbling + lmsservice-cover lmssubsonic lmsutils Wt::Wt diff --git a/src/lms/main.cpp b/src/lms/main.cpp index 2d6230cf..c30dd110 100644 --- a/src/lms/main.cpp +++ b/src/lms/main.cpp @@ -28,7 +28,7 @@ #include "auth/IAuthTokenService.hpp" #include "auth/IPasswordService.hpp" #include "auth/IEnvService.hpp" -#include "lmscore/services/ICoverService.hpp" +#include "services/cover/ICoverService.hpp" #include "database/Db.hpp" #include "database/Session.hpp" #include "scanner/IScanner.hpp" diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index 8eb688e2..e14207ca 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -30,7 +30,7 @@ #include "auth/IEnvService.hpp" #include "auth/IPasswordService.hpp" -#include "lmscore/services/ICoverService.hpp" +#include "services/cover/ICoverService.hpp" #include "database/Artist.hpp" #include "database/Cluster.hpp" #include "database/Db.hpp" diff --git a/src/lms/ui/resource/CoverResource.cpp b/src/lms/ui/resource/CoverResource.cpp index c13c5996..69ef9b19 100644 --- a/src/lms/ui/resource/CoverResource.cpp +++ b/src/lms/ui/resource/CoverResource.cpp @@ -22,7 +22,7 @@ #include #include -#include "lmscore/services/ICoverService.hpp" +#include "services/cover/ICoverService.hpp" #include "database/Track.hpp" #include "utils/Exception.hpp" #include "utils/Logger.hpp" diff --git a/src/tools/cover/CMakeLists.txt b/src/tools/cover/CMakeLists.txt index b695300f..b7131b97 100644 --- a/src/tools/cover/CMakeLists.txt +++ b/src/tools/cover/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable(lms-cover ) target_link_libraries(lms-cover PRIVATE - lmscore + lmsservice-cover Boost::program_options ) diff --git a/src/tools/cover/LmsCover.cpp b/src/tools/cover/LmsCover.cpp index d2a5e784..a533187f 100644 --- a/src/tools/cover/LmsCover.cpp +++ b/src/tools/cover/LmsCover.cpp @@ -24,11 +24,11 @@ #include -#include "lmscore/services/ICoverService.hpp" #include "database/Db.hpp" #include "database/Release.hpp" #include "database/Session.hpp" #include "database/Track.hpp" +#include "services/cover/ICoverService.hpp" #include "utils/IConfig.hpp" #include "utils/Logger.hpp" #include "utils/Service.hpp"