Merge branch 'develop' for release v3.45.1

Dockerfile-release

@@ -78,7 +78,7 @@ RUN \
 	make distclean
 
 # WT
-ARG	WT_VERSION=4.10.0
+ARG	WT_VERSION=4.10.2
 RUN \
 	DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \
 	curl -sLO https://github.com/emweb/wt/archive/${WT_VERSION}.tar.gz && \

src/libs/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_subdirectory(av)
+add_subdirectory(database)
 add_subdirectory(image)
 add_subdirectory(metadata)
 add_subdirectory(services)

src/libs/services/database/impl/Artist.cpp → 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 "services/database/Artist.hpp"
+#include "database/Artist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "services/database/Cluster.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/User.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "utils/ILogger.hpp"
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/services/database/impl/AuthToken.cpp → src/libs/database/impl/AuthToken.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "services/database/AuthToken.hpp"
+#include "database/AuthToken.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "StringViewTraits.hpp"
 #include "IdTypeTraits.hpp"
 

src/libs/services/database/impl/Cluster.cpp → src/libs/database/impl/Cluster.cpp

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

src/libs/services/database/impl/Db.cpp → src/libs/database/impl/Db.cpp

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

src/libs/services/database/impl/IdTypeTraits.hpp → src/libs/database/impl/IdTypeTraits.hpp

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

src/libs/services/database/impl/Listen.cpp → src/libs/database/impl/Listen.cpp

@@ -17,10 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "services/database/Listen.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/User.hpp"
+#include "database/Listen.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "IdTypeTraits.hpp"
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
@@ -249,29 +249,31 @@ namespace Database
         return Utils::execQuery<TrackId>(query, range);
     }
 
-    std::size_t Listen::getCount(Session& session, UserId userId, ScrobblingBackend backend, TrackId trackId)
+    std::size_t Listen::getCount(Session& session, UserId userId, TrackId trackId)
     {
         session.checkReadTransaction();
 
         return session.getDboSession().query<int>("SELECT COUNT(*) from listen l")
+            .join("user u ON u.id = l.user_id")
             .where("l.track_id = ?").bind(trackId)
             .where("l.user_id = ?").bind(userId)
-            .where("l.backend = ?").bind(backend)
+            .where("l.backend = u.scrobbling_backend")
             .resultValue();
     }
 
-    std::size_t Listen::getCount(Session& session, UserId userId, ScrobblingBackend backend, ReleaseId releaseId)
+    std::size_t Listen::getCount(Session& session, UserId userId, ReleaseId releaseId)
     {
         session.checkReadTransaction();
 
-        return session.getDboSession().query<int>("SELECT IFNULL(MIN(count_result), 0)"
+        return session.getDboSession().query<int>(
+            "SELECT IFNULL(MIN(count_result), 0)"
             " FROM ("
             " SELECT COUNT(l.track_id) AS count_result"
             " FROM track t"
-            " LEFT JOIN listen l ON t.id = l.track_id AND l.backend = ? AND l.user_id = ?"
+            " LEFT JOIN listen l ON t.id = l.track_id AND l.backend = (SELECT scrobbling_backend FROM user WHERE id = ?) AND l.user_id = ?"
             " WHERE t.release_id = ?"
             " GROUP BY t.id)")
-            .bind(backend)
+            .bind(userId)
             .bind(userId)
             .bind(releaseId)
             .resultValue();

src/libs/services/database/impl/Migration.cpp → src/libs/database/impl/Migration.cpp

@@ -21,10 +21,10 @@
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "services/database/Db.hpp"
-#include "services/database/ScanSettings.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Db.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/ILogger.hpp"
 

src/libs/services/database/impl/Release.cpp → src/libs/database/impl/Release.cpp

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

src/libs/services/database/impl/ScanSettings.cpp → src/libs/database/impl/ScanSettings.cpp

@@ -17,19 +17,29 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "services/database/ScanSettings.hpp"
+#include "database/ScanSettings.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "utils/Path.hpp"
 #include "utils/ILogger.hpp"
 #include "utils/String.hpp"
 
-#include "services/database/Cluster.hpp"
-#include "services/database/Session.hpp"
+#include "database/Cluster.hpp"
+#include "database/Session.hpp"
 
 namespace Database
 {
+    void ScanSettings::init(Session& session)
+    {
+        session.checkWriteTransaction();
+
+        if (pointer settings{ get(session) })
+            return;
+
+        session.getDboSession().add(std::make_unique<ScanSettings>());
+    }
+
     ScanSettings::pointer ScanSettings::get(Session& session)
     {
         session.checkReadTransaction();

src/libs/services/database/impl/Session.cpp → src/libs/database/impl/Session.cpp

@@ -17,30 +17,30 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "services/database/Session.hpp"
+#include "database/Session.hpp"
 
 #include <cassert>
 
 #include "utils/Exception.hpp"
 #include "utils/ILogger.hpp"
 
-#include "services/database/Artist.hpp"
-#include "services/database/AuthToken.hpp"
-#include "services/database/Cluster.hpp"
-#include "services/database/Db.hpp"
-#include "services/database/Listen.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/ScanSettings.hpp"
-#include "services/database/StarredArtist.hpp"
-#include "services/database/StarredRelease.hpp"
-#include "services/database/StarredTrack.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/TrackBookmark.hpp"
-#include "services/database/TrackArtistLink.hpp"
-#include "services/database/TrackList.hpp"
-#include "services/database/TrackFeatures.hpp"
-#include "services/database/TransactionChecker.hpp"
-#include "services/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/AuthToken.hpp"
+#include "database/Cluster.hpp"
+#include "database/Db.hpp"
+#include "database/Listen.hpp"
+#include "database/Release.hpp"
+#include "database/ScanSettings.hpp"
+#include "database/StarredArtist.hpp"
+#include "database/StarredRelease.hpp"
+#include "database/StarredTrack.hpp"
+#include "database/Track.hpp"
+#include "database/TrackBookmark.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/TrackList.hpp"
+#include "database/TrackFeatures.hpp"
+#include "database/TransactionChecker.hpp"
+#include "database/User.hpp"
 #include "EnumSetTraits.hpp"
 #include "Migration.hpp"
 
@@ -171,6 +171,12 @@ namespace Database
             _session.execute("CREATE INDEX IF NOT EXISTS starred_track_user_backend_idx ON starred_track(user_id,backend)");
             _session.execute("CREATE INDEX IF NOT EXISTS starred_track_track_user_backend_idx ON starred_track(track_id,user_id,backend)");
         }
+
+        // Singletons
+        {
+            auto uniqueTransaction{ createWriteTransaction() };
+            ScanSettings::init(*this);
+        }
     }
 
     void Session::analyze()

src/libs/services/database/impl/StarredArtist.cpp → src/libs/database/impl/StarredArtist.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "services/database/StarredArtist.hpp"
+#include "database/StarredArtist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "services/database/Artist.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "IdTypeTraits.hpp"
 #include "Utils.hpp"
 

src/libs/services/database/impl/StarredRelease.cpp → src/libs/database/impl/StarredRelease.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "services/database/StarredRelease.hpp"
+#include "database/StarredRelease.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "services/database/Release.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "IdTypeTraits.hpp"
 #include "Utils.hpp"
 

src/libs/services/database/impl/StarredTrack.cpp → src/libs/database/impl/StarredTrack.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "services/database/StarredTrack.hpp"
+#include "database/StarredTrack.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "services/database/Track.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Track.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "IdTypeTraits.hpp"
 #include "Utils.hpp"
 

src/libs/services/database/impl/Track.cpp → src/libs/database/impl/Track.cpp

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

src/libs/services/database/impl/TrackArtistLink.cpp → src/libs/database/impl/TrackArtistLink.cpp

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

src/libs/services/database/impl/TrackBookmark.cpp → src/libs/database/impl/TrackBookmark.cpp

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