Another attempt: regroup lms services

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)

src/libs/lmscore/CMakeLists.txt

@@ -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)
-

src/libs/services/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(cover)

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)
+

src/libs/services/cover/impl/CoverService.hpp

@@ -29,7 +29,7 @@
 #include <variant>
 #include <vector>
 
-#include "lmscore/services/ICoverService.hpp"
+#include "services/cover/ICoverService.hpp"
 #include "image/IEncodedImage.hpp"
 #include "database/Types.hpp"
 

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
 	)

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"

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

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"

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"

src/lms/ui/resource/CoverResource.cpp

@@ -22,7 +22,7 @@
 #include <Wt/WApplication.h>
 #include <Wt/Http/Response.h>
 
-#include "lmscore/services/ICoverService.hpp"
+#include "services/cover/ICoverService.hpp"
 #include "database/Track.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"

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
 	)
 

src/tools/cover/LmsCover.cpp

@@ -24,11 +24,11 @@
 
 #include <boost/program_options.hpp>
 
-#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"