Revert "Migrated database stuff"

This reverts commit c41cc77e21.

src/libs/CMakeLists.txt

@@ -1,5 +1,6 @@
 
 add_subdirectory(av)
+add_subdirectory(database)
 add_subdirectory(image)
 add_subdirectory(lmscore)
 add_subdirectory(metadata)

src/libs/database/CMakeLists.txt

@@ -0,0 +1,40 @@
+add_library(lmsdatabase SHARED
+	impl/Artist.cpp
+	impl/Cluster.cpp
+	impl/Db.cpp
+	impl/TrackArtistLink.cpp
+	impl/TrackFeatures.cpp
+	impl/TrackList.cpp
+	impl/Release.cpp
+	impl/ScanSettings.cpp
+	impl/Session.cpp
+	impl/SqlQuery.cpp
+	impl/Track.cpp
+	impl/TrackBookmark.cpp
+	impl/User.cpp
+	impl/Utils.cpp
+	)
+
+target_include_directories(lmsdatabase INTERFACE
+	include
+	)
+
+target_include_directories(lmsdatabase PRIVATE
+	include
+	)
+
+target_link_libraries(lmsdatabase PRIVATE
+	Wt::DboSqlite3
+	)
+
+target_link_libraries(lmsdatabase PUBLIC
+	lmsutils
+	std::filesystem
+	Wt::Dbo
+	)
+
+install(TARGETS lmsdatabase DESTINATION lib)
+
+if(BUILD_TESTING)
+	add_subdirectory(test)
+endif()

src/libs/database/impl/Artist.cpp

@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/database/impl/Cluster.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"
 

src/libs/database/impl/Db.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
 
 #include <Wt/Dbo/FixedSqlConnectionPool.h>
 #include <Wt/Dbo/backend/Sqlite3.h>
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {

src/libs/database/impl/Release.cpp

@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"

src/libs/database/impl/ScanSettings.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
@@ -25,8 +25,8 @@
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
 
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 
 namespace {
 

src/libs/database/impl/Session.cpp

@@ -17,22 +17,27 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
+
+#include <map>
+#include <mutex>
+#include <thread>
+#include <string_view>
 
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackBookmark.hpp"
+#include "database/TrackBookmark.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
+#include "database/TrackFeatures.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 namespace Database
 {

src/libs/database/impl/Track.cpp

@@ -17,17 +17,17 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
+#include "database/TrackFeatures.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 #include "SqlQuery.hpp"

src/libs/database/impl/TrackArtistLink.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/TrackArtistLink.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 
 #include "Traits.hpp"
 

src/libs/database/impl/TrackBookmark.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/TrackBookmark.hpp"
+#include "database/TrackBookmark.hpp"
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "Traits.hpp"
 
 namespace Database {

src/libs/database/impl/TrackFeatures.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/TrackFeatures.hpp"
+#include "database/TrackFeatures.hpp"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {

src/libs/database/impl/TrackList.cpp

@@ -16,18 +16,18 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
 
 #include <cassert>
 
 #include "utils/Logger.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"

src/libs/database/impl/Traits.hpp

@@ -22,7 +22,7 @@
 #include <type_traits>
 #include <Wt/Dbo/StdSqlTraits.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Wt::Dbo
 {

src/libs/database/impl/User.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
 #include "utils/Logger.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"

src/libs/database/include/database/Artist.hpp

@@ -27,7 +27,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 

src/libs/database/include/database/Cluster.hpp

@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 

src/libs/database/include/database/Release.hpp

@@ -25,7 +25,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database

src/libs/database/include/database/ScanSettings.hpp

@@ -25,7 +25,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 

src/libs/database/include/database/Track.hpp

@@ -34,7 +34,7 @@
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 

src/libs/database/include/database/TrackArtistLink.hpp

@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/EnumSet.hpp"
 
 namespace Database

src/libs/database/include/database/TrackBookmark.hpp

@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 

src/libs/database/include/database/TrackFeatures.hpp

@@ -26,7 +26,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 

src/libs/database/include/database/TrackList.hpp

@@ -21,12 +21,13 @@
 
 #include <optional>
 #include <string>
+#include <set>
 #include <vector>
 
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database {
 

src/libs/database/include/database/User.hpp

@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database {

src/libs/database/test/CMakeLists.txt

@@ -8,7 +8,7 @@ add_executable(test-database
 	)
 
 target_link_libraries(test-database PRIVATE
-	lmscore
+	lmsdatabase
 	GTest::GTest
 	)
 

src/libs/database/test/Common.hpp

@@ -24,17 +24,17 @@
 
 #include <gtest/gtest.h>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackBookmark.hpp"
+#include "database/TrackBookmark.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 template <typename T>
 class ScopedEntity

src/libs/lmscore/CMakeLists.txt

@@ -7,20 +7,6 @@ add_library(lmscore SHARED
 	impl/auth/PasswordServiceBase.cpp
 	impl/auth/http-headers/HttpHeadersEnvService.cpp
 	impl/auth/internal/InternalPasswordService.cpp
-	impl/database/Artist.cpp
-	impl/database/Cluster.cpp
-	impl/database/Db.cpp
-	impl/database/TrackArtistLink.cpp
-	impl/database/TrackFeatures.cpp
-	impl/database/TrackList.cpp
-	impl/database/Release.cpp
-	impl/database/ScanSettings.cpp
-	impl/database/Session.cpp
-	impl/database/SqlQuery.cpp
-	impl/database/Track.cpp
-	impl/database/TrackBookmark.cpp
-	impl/database/User.cpp
-	impl/database/Utils.cpp
 	impl/cover/CoverService.cpp
 	)
 
@@ -35,7 +21,6 @@ target_include_directories(lmscore PRIVATE
 
 target_link_libraries(lmscore PRIVATE
 	lmsav
-	Wt::DboSqlite3
 	)
 
 target_link_libraries(lmscore PUBLIC
@@ -44,7 +29,6 @@ target_link_libraries(lmscore PUBLIC
 	lmsutils
 	std::filesystem
 	Wt::Wt
-	Wt::Dbo
 	)
 
 if (USE_PAM)
@@ -57,6 +41,3 @@ endif (USE_PAM)
 
 install(TARGETS lmscore DESTINATION lib)
 
-if(BUILD_TESTING)
-	add_subdirectory(test)
-endif()

src/libs/lmscore/impl/auth/AuthServiceBase.cpp

@@ -19,9 +19,9 @@
 
 #include "AuthServiceBase.hpp"
 
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth

src/libs/lmscore/impl/auth/AuthServiceBase.hpp

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string_view>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {

src/libs/lmscore/impl/auth/AuthTokenService.cpp

@@ -24,8 +24,8 @@
 #include <Wt/WRandom.h>
 
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/lmscore/impl/auth/PasswordServiceBase.cpp

@@ -28,8 +28,8 @@
 #endif // LMS_SUPPORT_PAM
 
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp

@@ -22,8 +22,8 @@
 
 #include "lmscore/auth/IAuthTokenService.hpp"
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp

@@ -22,7 +22,7 @@
 #include <Wt/Auth/HashFunction.h>
 #include <Wt/Auth/PasswordStrengthValidator.h>
 
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "auth/PasswordServiceBase.hpp"
 #include "auth/LoginThrottler.hpp"
 

src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp

@@ -27,6 +27,7 @@
 #include <security/pam_appl.h>
 
 #include "lmscore/auth/Types.hpp"
+#include "database/Session.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth

src/libs/lmscore/impl/cover/CoverService.cpp

@@ -21,10 +21,10 @@
 
 #include "av/IAudioFile.hpp"
 
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 
 #include "image/Exception.hpp"
 #include "image/IRawImage.hpp"

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

@@ -31,7 +31,7 @@
 
 #include "lmscore/cover/ICoverService.hpp"
 #include "image/IEncodedImage.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {

src/libs/lmscore/include/lmscore/auth/IAuthTokenService.hpp

@@ -27,7 +27,7 @@
 #include <boost/asio/ip/address.hpp>
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {

src/libs/lmscore/include/lmscore/auth/IEnvService.hpp

@@ -20,8 +20,9 @@
 #pragma once
 
 #include <optional>
+#include <string>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {

src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp

@@ -26,7 +26,7 @@
 #include <Wt/Dbo/ptr.h>
 
 #include "lmscore/auth/Types.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {

src/libs/lmscore/include/lmscore/auth/Types.hpp

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/Exception.hpp"
 
 namespace Auth

src/libs/lmscore/include/lmscore/cover/ICoverService.hpp

@@ -22,7 +22,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "image/IEncodedImage.hpp"
 
 namespace Database

src/libs/lmscore/test/CMakeLists.txt

@@ -1,3 +0,0 @@
-
-add_subdirectory(database)
-

src/libs/recommendation/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(lmsrecommendation PRIVATE
 	)
 
 target_link_libraries(lmsrecommendation PRIVATE
-	lmscore
+	lmsdatabase
 	lmssom
 	std::filesystem
 	)

src/libs/recommendation/impl/Engine.cpp

@@ -25,9 +25,9 @@
 #include "ClustersEngineCreator.hpp"
 #include "FeaturesEngineCreator.hpp"
 
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/recommendation/impl/clusters/ClustersEngine.cpp

@@ -19,13 +19,13 @@
 
 #include "ClustersEngine.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
 
 namespace Recommendation {
 

src/libs/recommendation/impl/features/FeaturesEngine.cpp

@@ -21,14 +21,14 @@
 
 #include <numeric>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
+#include "database/TrackFeatures.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
 #include "som/DataNormalizer.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"

src/libs/recommendation/impl/features/FeaturesEngineCache.hpp

@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "som/Network.hpp"
 
 namespace Recommendation {

src/libs/recommendation/include/recommendation/IEngine.hpp

@@ -21,8 +21,8 @@
 
 #include <functional>
 #include <memory>
-
+#include <string_view>
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/EnumSet.hpp"
 
 namespace Database

src/libs/scanner/CMakeLists.txt

@@ -14,7 +14,7 @@ target_include_directories(lmsscanner PRIVATE
 	)
 
 target_link_libraries(lmsscanner PRIVATE
-	lmscore
+	lmsdatabase
 	lmsmetadata
 	lmsrecommendation
 	lmsutils

src/libs/scanner/impl/Scanner.cpp

@@ -24,13 +24,13 @@
 
 #include <Wt/WLocalDateTime.h>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackArtistLink.hpp"
+#include "database/TrackArtistLink.hpp"
-#include "lmscore/database/TrackFeatures.hpp"
+#include "database/TrackFeatures.hpp"
 #include "metadata/TagLibParser.hpp"
 #include "recommendation/IEngine.hpp"
 #include "utils/Exception.hpp"

src/libs/scanner/impl/Scanner.hpp

@@ -30,9 +30,9 @@
 
 #include <boost/asio/system_timer.hpp>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "metadata/IParser.hpp"
 #include "scanner/IScanner.hpp"
 #include "utils/Path.hpp"

src/libs/scanner/include/scanner/ScannerStats.hpp

@@ -24,7 +24,7 @@
 #include <filesystem>
 #include <vector>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Scanner {
 

src/libs/scrobbling/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(lmsscrobbling PRIVATE
 	)
 
 target_link_libraries(lmsscrobbling PRIVATE
-	lmscore
+	lmsutils
 	)
 
 target_link_libraries(lmsscrobbling PUBLIC

src/libs/scrobbling/impl/Scrobbling.cpp

@@ -19,13 +19,13 @@
 
 #include "Scrobbling.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 #include "internal/InternalScrobbler.hpp"
 #include "listenbrainz/ListenBrainzScrobbler.hpp"

src/libs/scrobbling/impl/internal/InternalScrobbler.cpp

@@ -19,11 +19,11 @@
 
 #include "InternalScrobbler.hpp"
 
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Scrobbling

src/libs/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp

@@ -24,13 +24,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"
 #include "utils/Logger.hpp"

src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp

@@ -25,13 +25,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "scrobbling/Exception.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"

src/libs/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp

@@ -26,7 +26,7 @@
 #include <boost/asio/steady_timer.hpp>
 #include <Wt/Dbo/Dbo.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "scrobbling/Listen.hpp"
 
 namespace Database

src/libs/scrobbling/impl/listenbrainz/Utils.cpp

@@ -21,9 +21,9 @@
 
 #include <string_view>
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 static constexpr std::string_view historyTracklistName {"__scrobbler_listenbrainz_history__"};
 

src/libs/scrobbling/impl/listenbrainz/Utils.hpp

@@ -22,7 +22,7 @@
 #include <Wt/Dbo/ptr.h>
 #include "utils/UUID.hpp"
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {

src/libs/scrobbling/include/scrobbling/IScrobbling.hpp

@@ -29,7 +29,7 @@
 #include <Wt/WDateTime.h>
 
 #include "scrobbling/Listen.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Database
 {

src/libs/scrobbling/include/scrobbling/Listen.hpp

@@ -21,7 +21,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace Scrobbling
 {

src/libs/subsonic/impl/ParameterParsing.hpp

@@ -20,7 +20,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/String.hpp"
 #include "SubsonicResponse.hpp"
 

src/libs/subsonic/impl/RequestContext.hpp

@@ -23,7 +23,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "ProtocolVersion.hpp"
 

src/libs/subsonic/impl/Stream.cpp

@@ -22,9 +22,9 @@
 #include "av/TranscodeParameters.hpp"
 #include "av/TranscodeResourceHandlerCreator.hpp"
 #include "av/Types.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/IResourceHandler.hpp"
 #include "utils/Logger.hpp"
 #include "utils/FileResourceHandlerCreator.hpp"

src/libs/subsonic/impl/SubsonicId.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/String.hpp"
 
 namespace API::Subsonic

src/libs/subsonic/impl/SubsonicResource.cpp

@@ -29,15 +29,15 @@
 #include "lmscore/auth/IPasswordService.hpp"
 #include "lmscore/auth/IEnvService.hpp"
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackBookmark.hpp"
+#include "database/TrackBookmark.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "recommendation/IEngine.hpp"
 #include "scrobbling/IScrobbling.hpp"
 #include "utils/IConfig.hpp"

src/libs/subsonic/impl/SubsonicResource.hpp

@@ -24,7 +24,7 @@
 #include <Wt/WResource.h>
 #include <Wt/Http/Response.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "RequestContext.hpp"
 

src/lms/main.cpp

@@ -29,8 +29,8 @@
 #include "lmscore/auth/IPasswordService.hpp"
 #include "lmscore/auth/IEnvService.hpp"
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "scanner/IScanner.hpp"
 #include "recommendation/IEngine.hpp"
 #include "subsonic/SubsonicResource.hpp"

src/lms/ui/Auth.cpp

@@ -30,8 +30,8 @@
 
 #include "lmscore/auth/IAuthTokenService.hpp"
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 

src/lms/ui/Auth.hpp

@@ -21,18 +21,19 @@
 
 #include <Wt/WTemplateFormView.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
-namespace UserInterface
+namespace UserInterface {
+
+std::optional<Database::UserId>
+processAuthToken(const Wt::WEnvironment& env);
+
+class Auth : public Wt::WTemplateFormView
 {
-	std::optional<Database::UserId>
+	public:
-	processAuthToken(const Wt::WEnvironment& env);
+		Auth();
 
-	class Auth : public Wt::WTemplateFormView
+		Wt::Signal<Database::UserId> userLoggedIn;
-	{
+};
-		public:
-			Auth();
 
-			Wt::Signal<Database::UserId> userLoggedIn;
-	};
 } // namespace UserInterface

src/lms/ui/LmsApplication.cpp

@@ -31,12 +31,12 @@
 #include "lmscore/auth/IEnvService.hpp"
 #include "lmscore/auth/IPasswordService.hpp"
 #include "lmscore/cover/ICoverService.hpp"
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Db.hpp"
+#include "database/Db.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "scrobbling/IScrobbling.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/LmsApplicationException.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "utils/Exception.hpp"
 
 namespace UserInterface {

src/lms/ui/LmsApplicationManager.hpp

@@ -25,7 +25,7 @@
 
 #include <Wt/WSignal.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface
 {

src/lms/ui/LmsTheme.hpp

@@ -24,7 +24,7 @@
 #include <Wt/WBootstrapTheme.h>
 #include <Wt/WLinkedCssStyleSheet.h>
 
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 namespace UserInterface {
 

src/lms/ui/MediaPlayer.cpp

@@ -25,13 +25,13 @@
 
 #include "utils/Logger.hpp"
 
-#include "lmscore/database/Artist.hpp"
+#include "database/Artist.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 
 #include "resource/CoverResource.hpp"
 #include "resource/AudioTranscodeResource.hpp"

src/lms/ui/MediaPlayer.hpp

@@ -27,7 +27,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface {
 

src/lms/ui/PlayQueue.cpp

@@ -22,12 +22,12 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/Release.hpp"
+#include "database/Release.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
-#include "lmscore/database/TrackList.hpp"
+#include "database/TrackList.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "recommendation/IEngine.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"

src/lms/ui/PlayQueue.hpp

@@ -25,7 +25,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Similarity

src/lms/ui/PlayQueueAction.hpp

@@ -22,7 +22,7 @@
 #include <vector>
 #include <Wt/WSignal.h>
 
-#include "lmscore/database/Types.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface
 {

src/lms/ui/SettingsView.cpp

@@ -35,7 +35,7 @@
 #include "common/ValueStringModel.hpp"
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/admin/DatabaseSettingsView.cpp

@@ -26,9 +26,9 @@
 #include <Wt/WString.h>
 #include <Wt/WTemplateFormView.h>
 
-#include "lmscore/database/Cluster.hpp"
+#include "database/Cluster.hpp"
-#include "lmscore/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "scanner/IScanner.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/admin/InitWizardView.cpp

@@ -25,8 +25,8 @@
 #include <Wt/WPushButton.h>
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/admin/ScannerController.cpp

@@ -28,8 +28,8 @@
 #include <Wt/WResource.h>
 #include <Wt/WSplitButton.h>
 
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
-#include "lmscore/database/Track.hpp"
+#include "database/Track.hpp"
 #include "scanner/IScanner.hpp"
 #include "utils/Service.hpp"
 #include "LmsApplication.hpp"

src/lms/ui/admin/UserView.cpp

@@ -28,8 +28,8 @@
 #include <Wt/WFormModel.h>
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"

src/lms/ui/admin/UsersView.cpp

@@ -24,8 +24,8 @@
 #include <Wt/WTemplate.h>
 
 #include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/database/User.hpp"
+#include "database/User.hpp"
-#include "lmscore/database/Session.hpp"
+#include "database/Session.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"