Added missing fr translations + added missing unit tests

approot/messages.xml

@@ -44,7 +44,7 @@
 <message id="Lms.Error.user-not-found">User not found</message>
 
 <!--Administration-->
-<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Music libraries</message>
+<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Libraries</message>
 <message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Scan settings</message>
 <message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
 <message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Users</message>
@@ -63,7 +63,7 @@
 <message id="Lms.Admin.MediaLibrary.path-must-be-existing-directory">Path must be an existing directory</message>
 <message id="Lms.Admin.MediaLibrary.root-path">Root directory</message>
 
-<message id="Lms.Admin.Database.add-library">Add library</message>
+<!--Scan settings-->
 <message id="Lms.Admin.Database.daily">Daily</message>
 <message id="Lms.Admin.Database.extra-tags-to-scan">Extra tags to scan (use <kbd>;</kbd> as separator)</message>
 <message id="Lms.Admin.Database.hourly">Hourly</message>
@@ -81,6 +81,7 @@
 <message id="Lms.Admin.Database.update-start-time">Update start time</message>
 <message id="Lms.Admin.Database.weekly">Weekly</message>
 
+<!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">Cannot get track duration</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">Cannot parse file</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">Cannot read file</message>

approot/messages_fr.xml

@@ -15,7 +15,6 @@
 <message id="Lms.loading">Chargement...</message>
 <message id="Lms.login">Login</message>
 <message id="Lms.logout"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> Quitter</message>
-<message id="Lms.not-a-directory">N'est pas un répertoire</message>
 <message id="Lms.ok">Ok</message>
 <message id="Lms.password">Mot de passe</message>
 <message id="Lms.password-bad-login-combination">Mauvaise combinaison login / mot de passe</message>
@@ -28,6 +27,7 @@
 <message id="Lms.passwords-dont-match">Les mots de passe ne correspondent pas</message>
 <message id="Lms.quit-other-session">Une autre session a été ouverte. Reouvrir celle-ci ?</message>
 <message id="Lms.save">Sauvegarder</message>
+<message id="Lms.settings-saved">Paramètres sauvegardés!</message>
 <message id="Lms.track-count">
 	<plural case="0">{1} piste</plural>
 	<plural case="1">{1} pistes</plural>
@@ -44,19 +44,36 @@
 <message id="Lms.Error.user-not-found">L'utilisateur n'existe pas</message>
 
 <!--Administration-->
+<message id="Lms.Admin.menu-media-libraries"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Bibliothèques</message>
+<message id="Lms.Admin.menu-scan-settings"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> Paramètres du scan</message>
+<message id="Lms.Admin.menu-scanner"><i class="fa fa-fw fa-wrench" aria-hidden="true"></i> Scanner</message>
+<message id="Lms.Admin.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utilisateurs</message>
+
+<!--MediaLibraries-->
+<message id="Lms.Admin.MediaLibraries.media-libraries">Bibliothèques musicales</message>
+<message id="Lms.Admin.MediaLibrary.create-library">Créer une bibliothèque</message>
+<message id="Lms.Admin.MediaLibrary.del-library-confirm">Supprimer la bibliothèque?</message>
+<message id="Lms.Admin.MediaLibrary.edit-library">Editer la bibliothèque</message>
+<message id="Lms.Admin.MediaLibrary.library-created">Bibliothèque créée !</message>
+<message id="Lms.Admin.MediaLibrary.library-deleted">Bibilothèque supprimée !</message>
+<message id="Lms.Admin.MediaLibrary.name">Nom de la bibliothèque</message>
+<message id="Lms.Admin.MediaLibrary.name-already-exists">Ce nom de bibliothèque existe déjà</message>
+<message id="Lms.Admin.MediaLibrary.path-must-be-absolute">Le chemin doit être absolu</message>
+<message id="Lms.Admin.MediaLibrary.path-must-not-overlap">Le chemin ne doit pas recouvrir celui d'une autre bibliothèque</message>
+<message id="Lms.Admin.MediaLibrary.path-must-be-existing-directory">Le chemin doit référencer un répertoire existant</message>
+<message id="Lms.Admin.MediaLibrary.root-path">Répertoire racine</message>
+
+<!--Scan settings-->
 <message id="Lms.Admin.Database.daily">Tous les jours</message>
-<message id="Lms.Admin.Database.database">Collection de musiques</message>
 <message id="Lms.Admin.Database.extra-tags-to-scan">Tags supplémentaires à scanner (utiliser <kbd>;</kbd> comme séparateur)</message>
 <message id="Lms.Admin.Database.hourly">Toutes les heures</message>
 <message id="Lms.Admin.Database.immediate-scan">Scanner maintenant !</message>
 <message id="Lms.Admin.Database.monthly">Tous les mois</message>
-<message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Collection de musiques</message>
 <message id="Lms.Admin.Database.never">Jamais</message>
-<message id="Lms.Admin.Database.path">Dossier racine des fichiers de musique</message>
+<message id="Lms.Admin.Database.scan-aborted">Scan interrompu !</message>
 <message id="Lms.Admin.Database.scan-complete">Scan terminé : {1} fichiers, {2} ajouts, {3} mises à jour, {4} suppressions, {5} duplicatas, {6} erreurs</message>
 <message id="Lms.Admin.Database.scan-launched">Scan lancé !</message>
 <message id="Lms.Admin.Database.scan-settings">Options </message>
-<message id="Lms.Admin.Database.settings-saved">Nouveaux paramètres sauvegardés !</message>
 <message id="Lms.Admin.Database.similarity-engine-type">Moteur de similarité</message>
 <message id="Lms.Admin.Database.similarity-engine-type.clusters">Basé sur les tags</message>
 <message id="Lms.Admin.Database.similarity-engine-type.none">Aucun</message>
@@ -64,6 +81,7 @@
 <message id="Lms.Admin.Database.update-start-time">Heure de départ de la mise à jour</message>
 <message id="Lms.Admin.Database.weekly">Toutes les semaines</message>
 
+<!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">Impossible de récupérer la durée de la piste</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">Impossible d'analyser le fichier</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">Impossible de lire le fichier</message>
@@ -98,7 +116,6 @@
 <message id="Lms.Admin.Users.del-user-confirm">Supprimer l'utilisateur ?</message>
 <message id="Lms.Admin.Users.demo">Demo</message>
 <message id="Lms.Admin.Users.users">Utilisateurs</message>
-<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utilisateurs</message>
 
 <!--User-->
 <message id="Lms.Admin.User.demo-account">Compte de démonstration</message>

approot/messages_it.xml

@@ -15,8 +15,7 @@
 <message id="Lms.loading">Caricamento...</message>
 <message id="Lms.login">Login</message>
 <message id="Lms.logout"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> Logout</message>
-<message id="Lms.not-a-directory">Non è una directory</message>
-
+<message id="Lms.ok">Ok</message>
 <message id="Lms.password">Password</message>
 <message id="Lms.password-bad-login-combination">Errata combinazione di Login / Password </message>
 <message id="Lms.password-client-throttled">Superati i tentativi di accesso, riprova più tardi</message>
@@ -32,6 +31,7 @@
 
 
 
+
 <message id="Lms.user">Utente</message>
 
 <!--Errors-->
@@ -44,20 +44,36 @@
 <message id="Lms.Error.user-not-found">Utente non trovato</message>
 
 <!--Administration-->
+
+
+
+
+
+<!--MediaLibraries-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--Scan settings-->
 <message id="Lms.Admin.Database.daily">Giornaliera</message>
-<message id="Lms.Admin.Database.database">Raccolta musicale</message>
 
 <message id="Lms.Admin.Database.hourly">Ogni ora</message>
 <message id="Lms.Admin.Database.immediate-scan">Scansiona ora!</message>
 <message id="Lms.Admin.Database.monthly">Mensile</message>
-<message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> Raccolta musicale</message>
 <message id="Lms.Admin.Database.never">Mai</message>
-<message id="Lms.Admin.Database.path">Cartella dei file multimediali</message>
 
 <message id="Lms.Admin.Database.scan-complete">Scansione completata: {1} file totali, {2} aggiunti, {3} aggiornati, {4} eliminati, {5} duplicati, {6} errati</message>
 <message id="Lms.Admin.Database.scan-launched">Scansione avviata!</message>
-<message id="Lms.Admin.Database.scan-settings">Impostazioni scansione</message>
-<message id="Lms.Admin.Database.settings-saved">Impostazioni salvate!</message>
+
 
 
 
@@ -65,6 +81,7 @@
 <message id="Lms.Admin.Database.update-start-time">Orario di aggiornamento</message>
 <message id="Lms.Admin.Database.weekly">Settimanale</message>
 
+<!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">Non sono stato in grado di determinare la durata della traccia</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">Non in grado di analizzare il file</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">Non in grado di leggere il file</message>
@@ -99,7 +116,6 @@
 <message id="Lms.Admin.Users.del-user-confirm">Elimina l'utente ?</message>
 <message id="Lms.Admin.Users.demo">Demo</message>
 <message id="Lms.Admin.Users.users">Utenti</message>
-<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> Utenti</message>
 
 <!--User-->
 <message id="Lms.Admin.User.demo-account">Account demo</message>

approot/messages_zh.xml

@@ -15,7 +15,6 @@
 <message id="Lms.loading">加载中...</message>
 <message id="Lms.login">登陆</message>
 <message id="Lms.logout"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> 注销</message>
-<message id="Lms.not-a-directory">不是一个目录</message>
 
 <message id="Lms.password">密码</message>
 <message id="Lms.password-bad-login-combination">用户名或密码无效</message>
@@ -32,6 +31,7 @@
 
 
 
+
 <message id="Lms.user">用户</message>
 
 <!--Errors-->
@@ -44,19 +44,36 @@
 <message id="Lms.Error.user-not-found">用户未找到</message>
 
 <!--Administration-->
+
+
+
+
+
+<!--MediaLibraries-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--Scan settings-->
 <message id="Lms.Admin.Database.daily">每日</message>
-<message id="Lms.Admin.Database.database">音乐收藏</message>
 
 <message id="Lms.Admin.Database.hourly">每小时</message>
 <message id="Lms.Admin.Database.immediate-scan">立即扫描！</message>
 <message id="Lms.Admin.Database.monthly">每月</message>
-<message id="Lms.Admin.Database.menu-database"><i class="fa fa-fw fa-database" aria-hidden="true"></i> 音乐收藏</message>
 <message id="Lms.Admin.Database.never">从不</message>
-<message id="Lms.Admin.Database.path">媒体根目录</message>
+
 <message id="Lms.Admin.Database.scan-complete">扫描完成：总文件 {1}，添加文件 {2}，更新文件 {3}，删除文件 {4}，重复文件 {5}，错误文件 {6}</message>
 <message id="Lms.Admin.Database.scan-launched">扫描已完成！</message>
 <message id="Lms.Admin.Database.scan-settings">扫描选项</message>
-<message id="Lms.Admin.Database.settings-saved">新设置已保存！</message>
 
 
 
@@ -64,6 +81,7 @@
 <message id="Lms.Admin.Database.update-start-time">更新开始时间</message>
 <message id="Lms.Admin.Database.weekly">每周</message>
 
+<!--Scanner Controller-->
 <message id="Lms.Admin.ScannerController.bad-duration">无法获得音轨时间</message>
 <message id="Lms.Admin.ScannerController.cannot-parse-file">无法解析文件</message>
 <message id="Lms.Admin.ScannerController.cannot-read-file">无法读取文件</message>
@@ -98,7 +116,6 @@
 <message id="Lms.Admin.Users.del-user-confirm">删除用户？</message>
 <message id="Lms.Admin.Users.demo">演示</message>
 <message id="Lms.Admin.Users.users">用户</message>
-<message id="Lms.Admin.Users.menu-users"><i class="fa fa-fw fa-users" aria-hidden="true"></i> 用户</message>
 
 <!--User-->
 <message id="Lms.Admin.User.demo-account">演示账号</message>

src/libs/database/impl/Listen.cpp

@@ -34,8 +34,10 @@ namespace Database
             auto query{ session.query<ArtistId>("SELECT a.id from artist a")
                             .join("track t ON t.id = t_a_l.track_id")
                             .join("track_artist_link t_a_l ON t_a_l.artist_id = a.id")
-                            .join("listen l ON l.track_id = t.id")
-                            .where("l.user_id = ?").bind(params.user) };
+                            .join("listen l ON l.track_id = t.id") };
+
+            if (params.user.isValid())
+                query.where("l.user_id = ?").bind(params.user);
 
             if (params.backend)
                 query.where("l.backend = ?").bind(*params.backend);
@@ -77,8 +79,10 @@ namespace Database
         {
             auto query{ session.query<ReleaseId>("SELECT r.id from release r")
                             .join("track t ON t.release_id = r.id")
-                            .join("listen l ON l.track_id = t.id")
-                            .where("l.user_id = ?").bind(params.user) };
+                            .join("listen l ON l.track_id = t.id") };
+
+            if (params.user.isValid())
+                query.where("l.user_id = ?").bind(params.user);
 
             if (params.backend)
                 query.where("l.backend = ?").bind(*params.backend);
@@ -119,8 +123,10 @@ namespace Database
         Wt::Dbo::Query<TrackId> createTracksQuery(Wt::Dbo::Session& session, const Listen::StatsFindParameters& params)
         {
             auto query{ session.query<TrackId>("SELECT t.id from track t")
-                        .join("listen l ON l.track_id = t.id")
-                        .where("l.user_id = ?").bind(params.user) };
+                        .join("listen l ON l.track_id = t.id") };
+
+            if (params.user.isValid())
+                query.where("l.user_id = ?").bind(params.user);
 
             if (params.backend)
                 query.where("l.backend = ?").bind(*params.backend);

src/libs/database/test/Listen.cpp

@@ -1045,6 +1045,45 @@ TEST_F(DatabaseFixture, Listen_getRecentArtists_cluster)
     }
 }
 
+
+TEST_F(DatabaseFixture, Listen_getRecentArtists_mediaLibrary)
+{
+    ScopedTrack track{ session, "MyTrack" };
+    ScopedUser user{ session, "MyUser" };
+    ScopedArtist artist{ session, "MyArtist" };
+    ScopedMediaLibrary library{ session };
+    ScopedMediaLibrary otherLibrary{ session };
+
+    {
+        auto transaction{ session.createWriteTransaction() };
+        TrackArtistLink::create(session, track.get(), artist.get(), TrackArtistLinkType::Artist);
+        track.get().modify()->setMediaLibrary(library.get());
+    }
+
+    const Wt::WDateTime dateTime{ Wt::WDate {2000, 1, 2}, Wt::WTime {12,0, 1} };
+    ScopedListen listen1{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime };
+
+    {
+        auto transaction{ session.createReadTransaction() };
+
+        Listen::ArtistStatsFindParameters params;
+        params.setMediaLibrary(library.getId());
+
+        auto artists{ Listen::getRecentArtists(session, params) };
+        ASSERT_EQ(artists.results.size(), 1);
+        EXPECT_EQ(artists.results[0], artist->getId());
+    }
+    {
+        auto transaction{ session.createReadTransaction() };
+
+        Listen::ArtistStatsFindParameters params;
+        params.setMediaLibrary(otherLibrary.getId());
+
+        auto artists{ Listen::getRecentArtists(session, params) };
+        EXPECT_EQ(artists.results.size(), 0);
+    }
+}
+
 TEST_F(DatabaseFixture, Listen_getRecentReleases)
 {
     ScopedTrack track{ session, "MyTrack" };
@@ -1096,7 +1135,6 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases)
     }
 }
 
-
 TEST_F(DatabaseFixture, Listen_getMostRecentRelease)
 {
     ScopedTrack track{ session, "MyTrack" };
@@ -1282,6 +1320,46 @@ TEST_F(DatabaseFixture, Listen_getRecentReleases_cluster)
     }
 }
 
+TEST_F(DatabaseFixture, Listen_getRecentReleases_mediaLibrary)
+{
+    ScopedTrack track{ session, "MyTrack" };
+    ScopedUser user{ session, "MyUser" };
+    ScopedRelease release{ session, "MyRelease" };
+    ScopedMediaLibrary library{ session };
+    ScopedMediaLibrary otherLibrary{ session };
+
+    {
+        auto transaction{ session.createWriteTransaction() };
+        track.get().modify()->setRelease(release.get());
+        track.get().modify()->setMediaLibrary(library.get());
+    }
+
+    const Wt::WDateTime dateTime{ Wt::WDate {2000, 1, 2}, Wt::WTime {12,0, 1} };
+    ScopedListen listen1{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime };
+
+    {
+        auto transaction{ session.createReadTransaction() };
+
+        Listen::StatsFindParameters params;
+        params.setMediaLibrary(library.getId());
+
+        auto releases{ Listen::getRecentReleases(session, params) };
+        EXPECT_EQ(releases.moreResults, false);
+        ASSERT_EQ(releases.results.size(), 1);
+        EXPECT_EQ(releases.results[0], release.getId());
+    }
+    {
+        auto transaction{ session.createReadTransaction() };
+
+        Listen::StatsFindParameters params;
+        params.setMediaLibrary(otherLibrary.getId());
+
+        auto releases{ Listen::getRecentReleases(session, params) };
+        EXPECT_EQ(releases.moreResults, false);
+        EXPECT_EQ(releases.results.size(), 0);
+    }
+}
+
 TEST_F(DatabaseFixture, Listen_getRecentTracks)
 {
     ScopedTrack track{ session, "MyTrack" };
@@ -1328,6 +1406,46 @@ TEST_F(DatabaseFixture, Listen_getRecentTracks)
     }
 }
 
+
+TEST_F(DatabaseFixture, Listen_getRecentTracks_mediaLibrary)
+{
+    ScopedTrack track{ session, "MyTrack" };
+    ScopedUser user{ session, "MyUser" };
+    ScopedMediaLibrary library{ session };
+    ScopedMediaLibrary otherLibrary{ session };
+
+    const Wt::WDateTime dateTime{ Wt::WDate {2000, 1, 2}, Wt::WTime {12,0, 1} };
+    ScopedListen listen1{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime };
+
+    {
+        auto transaction{ session.createWriteTransaction() };
+        track.get().modify()->setMediaLibrary(library.get());
+    }
+
+    {
+        auto transaction{ session.createReadTransaction() };
+
+        Listen::StatsFindParameters params;
+        params.setMediaLibrary(library.getId());
+
+        auto tracks{ Listen::getRecentTracks(session, params) };
+        EXPECT_EQ(tracks.moreResults, false);
+        ASSERT_EQ(tracks.results.size(), 1);
+        EXPECT_EQ(tracks.results[0], track.getId());
+    }
+
+    {
+        auto transaction{ session.createReadTransaction() };
+
+        Listen::StatsFindParameters params;
+        params.setMediaLibrary(otherLibrary.getId());
+
+        auto tracks{ Listen::getRecentTracks(session, params) };
+        EXPECT_EQ(tracks.moreResults, false);
+        EXPECT_EQ(tracks.results.size(), 0);
+    }
+}
+
 TEST_F(DatabaseFixture, Listen_getCount_track)
 {
     ScopedTrack track{ session, "MyTrack" };